From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.198 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793749533; b=Co4qln6JgUEdvwBVHHkW7XXDUiJ3QhHFHxj3X/xW3TtWrWuzUiplTJ1wF1xZPCUJrPRl 8Hrs4PkvEBXQfgwsP/UVB5rclqYvuNnQaF8JXecA9KpEiUQgUbV97IHcURD1jVsV2AmKA /lIbKNC9CcbwVJRDGoNGTRocPsK7qF4YG6HfpC2qgoJ2RYhQigCEghzfVf9VhUmjt1OB2 3aVnE+uCE+BGgUlLEoB4fOQeqOpfl8gQzyAMFaq/fm8W1ITLiZfFXQH9N2fT0eTv0tuZR iBwJJsGm21nCedg+cMr5JHc2WbGNxFkS4xzJCF6F0Pr9+a7A9Oup+tNhBlZJVOGJUtA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793749533; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Received:Date:In-Reply-To:Mime-Version: References:X-Mailer:Message-ID:Subject:From:To:Cc:Content-Type; bh=jgxath3DaewnC859JwTcZnpPJdToW6STPcBiaa1iIoQ=; b=UHByRrbYe3JxlQaYrgk7QcQsDYe/v22s8bpGBCDRXPoS/rRRWMq2/YU2DQoK01Cf5IRK 8tb2Bel1xQzJQPINU9sqPZYkmDwBiAKNngdLpZfIGb1V2qEY+d2h+WzWayOYaSjevRPCK kW2CKLK09KpvePcHDRMCV6wdXcE7pAtBT88Vm6L6isM87SYjZSABcUE8ps3mORjn4mFgF 95VSU8jK3PKU9G6LCbjbQ8zfy5J8MzzkjluR1+P1Wkp5aJfTWOTjep/6l4dDYZ4qJw1Jv 0J6OVnCjhH8/1lyL+vsXP7fx3U837a4cwvW3QqwZNiNihO5/4duu/EcEGnY6adpGpdQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=N1giGkl+; arc=none smtp.remote-ip=74.125.82.198 Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD48A606EE80 for ; Tue, 3 Nov 2026 23:45:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org BD48A606EE80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=N1giGkl+ Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-3698bd5392cso40466eec.1 for ; Tue, 03 Nov 2026 15:45:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1793749532; x=1794354332; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jgxath3DaewnC859JwTcZnpPJdToW6STPcBiaa1iIoQ=; b=N1giGkl+IVNogjAdFrIYIQH2o+zsKpzh5UGqYTY4ORTlvUE+n+ijpqTPrEY9CAUCn0 7LXl1ZcVY7jzJvetRnd8YWN6MXvPW9n/TG9oeBYbrI0WK0FlYt0yhBgsR8dNCIpsuRYn E6R6xo5Qf+gN1hoBsqdj5WiBiY1Vq5gy37A/ARv5EBqghbGDrJBMAgzipwsoahl/0VHl UAbKiI1awnssGKV++L/UV3FZAzIRkugJjmhJ+Q/KL5rWZst3kGrJoYaKFDqIoEd2Dxps r+p6SghxAFoNwcwzTntcyb2TYJjeMEu1DTSyDfUnSdSTBo3XNXF5TJizR1TNVaGAerXi gwHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793749532; x=1794354332; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jgxath3DaewnC859JwTcZnpPJdToW6STPcBiaa1iIoQ=; b=uWAI3U9Gh4WIKu3/AYfrTsMq7ACU1wYkHiTBnjBMIRW890/posorbiJ9Z0lJp/lf2a ra4ywMXQZ1w+Kz3L8/WWbzeqSsLAcBxie4E89TLFhPL5YgaNIXWzBzYwjOGelTbDFFpu oJWfrOMh/wTEdFp6B++oNy1lsrn0anc+4u0RnysNghVUqg2IzscW9HDqk3Cq8A3JS3pQ iRW7MOK3jvWIyCE3EtNmlZpZ1V5wf2Rt7BQoz5/64cX5xUMM+yG2a7Uk/F2BAumGfl+6 6spcTng+8O6RcCPnDEK4Iq4aLM1xlCwARpMPXsEiD6jDjtP8DuhU83IV2BdmM6Q7kPcT M+Cw== X-Gm-Message-State: APuU4Z+g0IXZ/Xe7zmYNBvfVBpCzGF7Vh2HgqnzQUxt9w6sjsNB2+zT9 az5YALkdim//kz02YCX8iMQQ4XEzkoCI4gzMUYFvKR+OTvDoXjdPPZII+5huR4Ie2pj1lA7xHKc dyfxzOU16aQ== X-Received: from dybvh12.prod.google.com ([2002:a05:7301:52cc:b0:369:f2ef:9f3d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:2ab4:b0:36c:a26f:83c4 with SMTP id 5a478bee46e88-36ca26f863cmr989923eec.13.1793749531311; Tue, 03 Nov 2026 15:45:31 -0800 (PST) Date: Tue, 3 Nov 2026 15:44:25 -0800 In-Reply-To: <20261103234502.1008382-1-irogers@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261103234502.1008382-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.385.gac671c819a-goog Message-ID: <20261103234502.1008382-10-irogers@google.com> Subject: [PATCH v1 09/41] perf header: Pass e_machine to strcmp_cpuid_str() From: Ian Rogers To: linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Namhyung Kim Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Jiri Olsa , Adrian Hunter , James Clark , Kan Liang , Dapeng Mi , Thomas Falcon , John Garry , Will Deacon , Leo Yan , Athira Rajeev , Thomas Richter , Ravi Bangoria , Sandipan Das , Ian Rogers Content-Type: text/plain; charset="UTF-8" The format of a CPUID depends on its architecture, but strcmp_cpuid_str() is only given the two CPUID strings and its architecture specific implementations assume the CPUIDs are for the architecture perf was built for. Pass the ELF machine of the CPUIDs' architecture to strcmp_cpuid_str() so that CPUIDs can be compared according to their architecture rather than the host's. The pmu-events tables pass their e_machine, comparisons with the host's CPUID pass EM_HOST and the arm64 CPUID matching test passes EM_AARCH64. The architecture specific implementations don't yet use the argument. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/tests/cpuid-match.c | 17 +++++++++-------- tools/perf/arch/arm64/util/header.c | 2 +- tools/perf/arch/x86/util/header.c | 2 +- tools/perf/arch/x86/util/pmu.c | 10 ++++++---- tools/perf/pmu-events/empty-pmu-events.c | 6 +++--- tools/perf/pmu-events/jevents.py | 6 +++--- tools/perf/util/expr.c | 3 ++- tools/perf/util/header.c | 3 ++- tools/perf/util/header.h | 6 +++++- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/tools/perf/arch/arm64/tests/cpuid-match.c b/tools/perf/arch/arm64/tests/cpuid-match.c index e8e3947cca18..b073ac33ea9b 100644 --- a/tools/perf/arch/arm64/tests/cpuid-match.c +++ b/tools/perf/arch/arm64/tests/cpuid-match.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include "arch-tests.h" #include "tests/tests.h" @@ -9,28 +10,28 @@ int test__cpuid_match(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { /* midr with no leading zeros matches */ - if (strcmp_cpuid_str("0x410fd0c0", "0x00000000410fd0c0")) + if (strcmp_cpuid_str(EM_AARCH64, "0x410fd0c0", "0x00000000410fd0c0")) return -1; /* Upper case matches */ - if (strcmp_cpuid_str("0x410fd0c0", "0x00000000410FD0C0")) + if (strcmp_cpuid_str(EM_AARCH64, "0x410fd0c0", "0x00000000410FD0C0")) return -1; /* r0p0 = r0p0 matches */ - if (strcmp_cpuid_str("0x00000000410fd480", "0x00000000410fd480")) + if (strcmp_cpuid_str(EM_AARCH64, "0x00000000410fd480", "0x00000000410fd480")) return -1; /* r0p1 > r0p0 matches */ - if (strcmp_cpuid_str("0x00000000410fd480", "0x00000000410fd481")) + if (strcmp_cpuid_str(EM_AARCH64, "0x00000000410fd480", "0x00000000410fd481")) return -1; /* r1p0 > r0p0 matches*/ - if (strcmp_cpuid_str("0x00000000410fd480", "0x00000000411fd480")) + if (strcmp_cpuid_str(EM_AARCH64, "0x00000000410fd480", "0x00000000411fd480")) return -1; /* r0p0 < r0p1 doesn't match */ - if (!strcmp_cpuid_str("0x00000000410fd481", "0x00000000410fd480")) + if (!strcmp_cpuid_str(EM_AARCH64, "0x00000000410fd481", "0x00000000410fd480")) return -1; /* r0p0 < r1p0 doesn't match */ - if (!strcmp_cpuid_str("0x00000000411fd480", "0x00000000410fd480")) + if (!strcmp_cpuid_str(EM_AARCH64, "0x00000000411fd480", "0x00000000410fd480")) return -1; /* Different CPU doesn't match */ - if (!strcmp_cpuid_str("0x00000000410fd4c0", "0x00000000430f0af0")) + if (!strcmp_cpuid_str(EM_AARCH64, "0x00000000410fd4c0", "0x00000000430f0af0")) return -1; return 0; diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/util/header.c index 95e71c4f6c78..ee28add836b5 100644 --- a/tools/perf/arch/arm64/util/header.c +++ b/tools/perf/arch/arm64/util/header.c @@ -87,7 +87,7 @@ char *get_cpuid_str(struct perf_cpu cpu) * * Return 1 if the CPU type is different or the version of idstr is lower. */ -int strcmp_cpuid_str(const char *mapcpuid, const char *idstr) +int strcmp_cpuid_str(uint16_t e_machine __maybe_unused, const char *mapcpuid, const char *idstr) { u64 map_id = strtoull(mapcpuid, NULL, 16); char map_id_variant = FIELD_GET(MIDR_VARIANT_MASK, map_id); diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c index 412977f8aa83..b65856f3b846 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c @@ -91,7 +91,7 @@ static bool is_full_cpuid(const char *id) return false; } -int strcmp_cpuid_str(const char *mapcpuid, const char *id) +int strcmp_cpuid_str(uint16_t e_machine __maybe_unused, const char *mapcpuid, const char *id) { regex_t re; regmatch_t pmatch[1]; diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index fd4491fda117..37269154e5e7 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -22,6 +22,7 @@ #include "util/debug.h" #include "util/env.h" #include "util/header.h" +#include "dwarf-regs.h" #define GENUINE_INTEL_SPR "GenuineIntel-6-8F" #define GENUINE_INTEL_EMR "GenuineIntel-6-CF" @@ -41,7 +42,8 @@ static void init_snc_support(void) char *cpuid = get_cpuid_str((struct perf_cpu){0}); for (size_t i = 0; i < ARRAY_SIZE(supported_cpuids); i++) { - cached_snc_supported = cpuid && strcmp_cpuid_str(supported_cpuids[i], cpuid) == 0; + cached_snc_supported = cpuid && + strcmp_cpuid_str(EM_HOST, supported_cpuids[i], cpuid) == 0; if (cached_snc_supported) break; } @@ -173,11 +175,11 @@ static void init_snc_map(void) case 2: cpuid = get_cpuid_str((struct perf_cpu){ 0 }); if (cpuid) { - if (strcmp_cpuid_str(GENUINE_INTEL_SPR, cpuid) == 0 || - strcmp_cpuid_str(GENUINE_INTEL_EMR, cpuid) == 0) { + if (strcmp_cpuid_str(EM_HOST, GENUINE_INTEL_SPR, cpuid) == 0 || + strcmp_cpuid_str(EM_HOST, GENUINE_INTEL_EMR, cpuid) == 0) { cached_imc_snc_map = spr_emr_snc2_map; cached_imc_snc_map_len = ARRAY_SIZE(spr_emr_snc2_map); - } else if (strcmp_cpuid_str(GENUINE_INTEL_GNR, cpuid) == 0) { + } else if (strcmp_cpuid_str(EM_HOST, GENUINE_INTEL_GNR, cpuid) == 0) { cached_imc_snc_map = gnr_snc2_map; cached_imc_snc_map_len = ARRAY_SIZE(gnr_snc2_map); } diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c index eba5446520c4..872c6ca6e817 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -5831,7 +5831,7 @@ static const struct pmu_events_map *map_for_cpu(struct perf_cpu cpu) } if (pmu_events_map__e_machine_matches(map, EM_HOST) && - !strcmp_cpuid_str(map->cpuid, cpuid)) + !strcmp_cpuid_str(map->e_machine, map->cpuid, cpuid)) break; } free(last_map_search.cpuid); @@ -5933,7 +5933,7 @@ const struct pmu_events_table *find_core_events_table(uint16_t e_machine, const tables->arch; tables++) { if (pmu_events_map__e_machine_matches(tables, e_machine) && - !strcmp_cpuid_str(tables->cpuid, cpuid)) + !strcmp_cpuid_str(tables->e_machine, tables->cpuid, cpuid)) return &tables->event_table; } return NULL; @@ -5945,7 +5945,7 @@ const struct pmu_metrics_table *find_core_metrics_table(uint16_t e_machine, cons tables->arch; tables++) { if (pmu_events_map__e_machine_matches(tables, e_machine) && - !strcmp_cpuid_str(tables->cpuid, cpuid)) + !strcmp_cpuid_str(tables->e_machine, tables->cpuid, cpuid)) return &tables->metric_table; } return NULL; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index fc3de5fbda27..802ae2ad4405 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1249,7 +1249,7 @@ static const struct pmu_events_map *map_for_cpu(struct perf_cpu cpu) \t\t\t} \t\t\tif (pmu_events_map__e_machine_matches(map, EM_HOST) && -\t\t\t !strcmp_cpuid_str(map->cpuid, cpuid)) +\t\t\t !strcmp_cpuid_str(map->e_machine, map->cpuid, cpuid)) \t\t\t\tbreak; \t\t} \t\tfree(last_map_search.cpuid); @@ -1351,7 +1351,7 @@ const struct pmu_events_table *find_core_events_table(uint16_t e_machine, const \t tables->arch; \t tables++) { \t\tif (pmu_events_map__e_machine_matches(tables, e_machine) && -\t\t !strcmp_cpuid_str(tables->cpuid, cpuid)) +\t\t !strcmp_cpuid_str(tables->e_machine, tables->cpuid, cpuid)) \t\t\treturn &tables->event_table; \t} \treturn NULL; @@ -1363,7 +1363,7 @@ const struct pmu_metrics_table *find_core_metrics_table(uint16_t e_machine, cons \t tables->arch; \t tables++) { \t\tif (pmu_events_map__e_machine_matches(tables, e_machine) && -\t\t !strcmp_cpuid_str(tables->cpuid, cpuid)) +\t\t !strcmp_cpuid_str(tables->e_machine, tables->cpuid, cpuid)) \t\t\treturn &tables->metric_table; \t} \treturn NULL; diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index f1164c4666b1..09ced31ef59e 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -14,6 +14,7 @@ #include #include "util/hashmap.h" #include "util/header.h" +#include "dwarf-regs.h" #include "util/pmu.h" #include #include @@ -485,7 +486,7 @@ double expr__strcmp_cpuid_str(const struct expr_parse_ctx *ctx __maybe_unused, if (!cpuid) return NAN; - ret = !strcmp_cpuid_str(test_id, cpuid); + ret = !strcmp_cpuid_str(EM_HOST, test_id, cpuid); free(cpuid); return ret; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 2c686095fe67..38525b17f26d 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -964,7 +964,8 @@ char *get_cpuid_allow_env_override(struct perf_cpu cpu) * cpuid string generated on this platform. * Otherwise return non-zero. */ -int __weak strcmp_cpuid_str(const char *mapcpuid, const char *cpuid) +int __weak strcmp_cpuid_str(uint16_t e_machine __maybe_unused, const char *mapcpuid, + const char *cpuid) { regex_t re; regmatch_t pmatch[1]; diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 765037762758..d30fb30a0c92 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -219,7 +219,11 @@ char *get_cpuid_str(struct perf_cpu cpu); char *get_cpuid_allow_env_override(struct perf_cpu cpu); -int strcmp_cpuid_str(const char *s1, const char *s2); +/* + * Compare a CPUID from a pmu-events mapfile.csv, @mapcpuid, with @cpuid for + * the architecture with ELF machine @e_machine. Returns 0 on a match. + */ +int strcmp_cpuid_str(uint16_t e_machine, const char *mapcpuid, const char *cpuid); struct cpu_domain_map **build_cpu_domain_map(u32 *schedstat_version, u32 *max_sched_domains, u32 nr); -- 2.56.0.385.gac671c819a-goog