From nobody Wed Nov 04 17:54:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jKY3t45mLz6ycVk for ; Wed, 04 Nov 2026 17:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKY3t3SYlz543Z for ; Wed, 04 Nov 2026 17:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793814874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSUP31TwZzXXL3aejOblca4D8T7t25NPVHr8qQgS24c=; b=xRCl2qm/bvrziVZq2Dl4t60XDthlUXFouD8p9AGCDjOqmPgof5aAf/02d2gRnp/CxnX59p pGPF17mXXDROksbqPiOdIeUsmRq0ZkcrCcjUWmyAVIpnyW7L3iuJI8bIuJQYR2Dp9Suv2W V5LEO75j4+2TP3vIbziyRka/5H5rAJRjXbUaqaw7roQv0OoEbjnJUyp5AdgfAvtGbcyx35 2g3J0bm+sALLUWUaYjOLIpVgXzH6rgph3Y8N1tmNRPb7yn8yRWvVo1/y7zc+7WxIYX2Qid AGkjE8pPbHt4ULQVWx2Hp87sxJEjktWEV2ti0IK38Y/LPCzSrb8n1qaei7+pqw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793814874; b=AsV5I9eTjiX9wg5qrNsDXMOnGdGZDPVFDLgaFRhhGo8IcwWzQjlzo1PrO2nlkY5JrumyPO 1Qi42Kyrx90AjwW+ax3e38IznVwFUk+/wGDb0dGq32pr/Tu7K1rGkbTtRAmEz8XMD8di1a xGXTaqBcWKFTQFag7tlWHBPlFNWuR2iBQLlDifDsmiyh9dPLDwHB8BuPEuknNaz/O/L7iw 5ZxfYnNTT1ATNLZz9nwEPW2R1sGwhzLRnLznJ076SQ9QUbJMV5NFkx3yQ3ZB9IYTFNvINE qKfcDf+7I4VYds+qg4tiFnnQeMGPOXOy705BKEmraR6W+jFElUMW1ixm2c65mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793814874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSUP31TwZzXXL3aejOblca4D8T7t25NPVHr8qQgS24c=; b=rHW/pciS/xKmbhdLQTvtooNvwZ6WDonpY0u1sJNoMlHJj3FkSUuPAbo2DYsUYYX50FnPSI COiR/a+dw0tBenlLDdM3sHGRE6P9UJS00eVN6aLfTxy7HSv55HBIXYZdEQo9SuIgjPEXr4 5Sr6N/xmi8c1oHOYHpfDQSDIpdwgS45aus0kByclwJWbt5mpnJ3CmYeDzJ+LqLj1m/F0fD 6SzBIUGdVhLjBIMHK/U/rFeqbvrXZ4H+WD9jodkdjkEh6fCw6C5fJvbdREXnNeg0xOc/mZ UBVzWhT74m5112ryw4bkckouCRoNXzOveTcuT/yUi9oSsoZqG7Plvc97dSDnQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jKY3t36zgz1CfP for ; Wed, 04 Nov 2026 17:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30169 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 17:54:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mitchell Horne Subject: git: a01ea5156198 - main - libpmc: Map AMD Family 1Ah models 00h-0Fh to amdzen5 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a01ea5156198fd6ae284a0d84b957b978fa017eb Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 17:54:29 +0000 Message-Id: <6aeb7155.30169.4b06b2db@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a01ea5156198fd6ae284a0d84b957b978fa017eb commit a01ea5156198fd6ae284a0d84b957b978fa017eb Author: Osvaldo Janeri Filho AuthorDate: 2026-11-04 17:51:45 +0000 Commit: Mitchell Horne CommitDate: 2026-11-04 17:53:55 +0000 libpmc: Map AMD Family 1Ah models 00h-0Fh to amdzen5 178d0b5b8da7 adapted the Zen 5 pattern matching from Linux perf. However, Linux prints CPU models with a single digit when under 0xF (allowing |[[:xdigit:]] to match 0h-Fh), whereas hwpmc/libpmc formats model numbers with two leading hex digits (00h-0Fh). Fix the pattern to explicitly cover two-digit hex models in the 00h-0Fh range, and add a test case verifying table selection across Zen 5 and Zen 6 cpuid strings. Reviewed by: Ali Mashtizadeh Signed-off-by: Osvaldo Janeri Filho Fixes: 178d0b5b8da7 ("libpmc: Import AMD Zen 6 PMU events.") Sponsored by: Advanced Micro Devices, Inc. Differential Revision: https://reviews.freebsd.org/D60625 --- lib/libpmc/pmu-events/arch/x86/mapfile.csv | 2 +- tests/sys/pmc/Makefile | 1 + tests/sys/pmc/pmc_mapfile_test.c | 87 ++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/mapfile.csv b/lib/libpmc/pmu-events/arch/x86/mapfile.csv index 40e859b25f19..05480113bd1c 100644 --- a/lib/libpmc/pmu-events/arch/x86/mapfile.csv +++ b/lib/libpmc/pmu-events/arch/x86/mapfile.csv @@ -59,6 +59,6 @@ AuthenticAMD-23-[012][0-9A-F],v2,amdzen1,core AuthenticAMD-23-[[:xdigit:]]+,v1,amdzen2,core AuthenticAMD-25-[0245][[:xdigit:]],v1,amdzen3,core AuthenticAMD-25-[[:xdigit:]]+,v1,amdzen4,core -AuthenticAMD-26-[12467][[:xdigit:]],v1,amdzen5,core +AuthenticAMD-26-[012467][[:xdigit:]],v1,amdzen5,core AuthenticAMD-26-[[:xdigit:]]+,v1,amdzen6,core HygonGenuine-24-00,v2,amdzen1,core diff --git a/tests/sys/pmc/Makefile b/tests/sys/pmc/Makefile index d31103e11fb5..c44932483c9a 100644 --- a/tests/sys/pmc/Makefile +++ b/tests/sys/pmc/Makefile @@ -6,6 +6,7 @@ ATF_TESTS_C+= pmc_detach_test ATF_TESTS_C+= pmc_exec_test .if ${MACHINE_ARCH} == "amd64" ATF_TESTS_C+= pmc_exterr_test +ATF_TESTS_C+= pmc_mapfile_test .endif ATF_TESTS_C+= pmc_lifecycle_test ATF_TESTS_C+= pmc_log_test diff --git a/tests/sys/pmc/pmc_mapfile_test.c b/tests/sys/pmc/pmc_mapfile_test.c new file mode 100644 index 000000000000..91a9d6e84bf7 --- /dev/null +++ b/tests/sys/pmc/pmc_mapfile_test.c @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2026 Advanced Micro Devices, Inc. + * + * Author: Osvaldo Janeri Filho + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * libpmc picks its pmu-events table by matching kern.hwpmc.cpuid against + * mapfile.csv. hwpmc prints the model with two digits, so Turin (Family + * 1Ah, model 02h) is "AuthenticAMD-26-02-". For Zen 5 and Zen 6 + * cpuid strings, look up an event that only one of amdzen5 and amdzen6 has. + * No PMC hardware is needed. + */ + +#include + +#include +#include + +#define ZEN5_ONLY_EVENT "bp_l2_btb_correct" +#define ZEN6_ONLY_EVENT "bp_fe_redir.all" + +static const char *const zen5_cpuids[] = { + "AuthenticAMD-26-02-0", + "AuthenticAMD-26-0F-0", + "AuthenticAMD-26-11-0", + "AuthenticAMD-26-2F-0", + "AuthenticAMD-26-44-0", + "AuthenticAMD-26-70-0", + "AuthenticAMD-26-7F-0", +}; + +static const char *const zen6_cpuids[] = { + "AuthenticAMD-26-50-0", + "AuthenticAMD-26-80-0", + "AuthenticAMD-26-C0-0", + "AuthenticAMD-26-D8-0", + "AuthenticAMD-26-EF-0", +}; + +static void +check_table(const char *cpuid, const char *has, const char *lacks, + const char *table) +{ + ATF_CHECK_MSG(pmc_pmu_idx_get_by_event(cpuid, has) >= 0 && + pmc_pmu_idx_get_by_event(cpuid, lacks) < 0, + "%s does not select %s", cpuid, table); +} + +ATF_TC(zen5_models); +ATF_TC_HEAD(zen5_models, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Zen 5 cpuid strings, including models 00h-0Fh, select amdzen5"); +} +ATF_TC_BODY(zen5_models, tc) +{ + size_t i; + + for (i = 0; i < nitems(zen5_cpuids); i++) + check_table(zen5_cpuids[i], ZEN5_ONLY_EVENT, ZEN6_ONLY_EVENT, + "amdzen5"); +} + +ATF_TC(zen6_models); +ATF_TC_HEAD(zen6_models, tc) +{ + atf_tc_set_md_var(tc, "descr", "Zen 6 cpuid strings select amdzen6"); +} +ATF_TC_BODY(zen6_models, tc) +{ + size_t i; + + for (i = 0; i < nitems(zen6_cpuids); i++) + check_table(zen6_cpuids[i], ZEN6_ONLY_EVENT, ZEN5_ONLY_EVENT, + "amdzen6"); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, zen5_models); + ATF_TP_ADD_TC(tp, zen6_models); + + return (atf_no_error()); +}