From nobody Fri Feb 27 22:08:48 2026 X-Original-To: dev-commits-src-main@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 4fN2Xc1nBFz6TPsv for ; Fri, 27 Feb 2026 22:08:48 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN2Xc0bZ6z3lTs for ; Fri, 27 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230128; 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=hKAqqFRGof7OrLBLZbzyydUSlZA39LpQPEhgoQGBxxk=; b=iRMss9orQ4AOukL4/w/r25NBL07SzhPA8rkYcd/WWRX//xanVLDYu9Bwy1mjepH4FOHJJK wVUbkBUdZsn5mprGMLlbnjgSSrPNRj39n+5yllSJ4bL936JqYPVDLqcVNqsWarlRoa+6h7 MkrQ+FKD+q5r4MMOsh7vLJzdXjcGmo1/VoA8UwrVnUuqYa/YPrBibCkGYnfTmWWryJ1eFj DyXujDxNtWGUY0pceYrXjshL+TC2IoVbpSAT9xZkAVe0kEq31X0deElag7Lm3Z3HhaVvwi c0dbkJvhbU+LbQz9Fy81Yv5Cw4KO/lrtrhOzf3ChAH9IceM670/MZH2unxtsvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772230128; a=rsa-sha256; cv=none; b=tohVGrMBuDGJwHROZaKB5zrVG7mugyavd413wrYe3sjXBZJ9rMIQNVhQoryEsy2xojy0/m 9zn4CSdlmUptKeV7kzXC0cAYOgjvz+0Jw/v4BLDYtNFm+2JtTA1AaR/EVzU3p1doqFFhO7 HpTx2+xm6hTjyJKBKtXgzZ2XHpupv0DgLtrll29/cQ7lXvXUXohDmMJyBG4cPVGKSOIZhA dfJGxgeWvZAeVLjVjZ6d8yIP/iCc5MpPanpwgM8bJvjwaKAt3q6I3IeWWiLfoo82iVARiQ PQWqbxTUutq1TC5fhoPVVpOFJ2bBcT0Fwn8N1Q5p2GWD006uWMsK3SyDKZCZmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230128; 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=hKAqqFRGof7OrLBLZbzyydUSlZA39LpQPEhgoQGBxxk=; b=Cl1dW9WZ47Lf60PKhUS0BHw0YbusKs5fWjenyHRxebuRTIlOhNhAERkwDuFLVhIKbUwiIn WG+ug/NI5KE6xVE7tH2Ebv5LDJWGvAp3C/5usiK3obwpa2MtL5U0Bg+VlrGbHc+kwRn4o7 dfVHp+4A4hDXi/viKzUYZIsBiCttTW6rQXUXS5vHR6w1DjM4kd8TZILGzwJMj4jNlq5GsP vfDHvSs676qmXZDOEJ5jWgVNf1RoVkNaRlIbkBuiEyxmcnkr+MpHkYl2lU+nGAQPqMctLi KE8LkZFGUPY2Ysl792ETLtCfRAIf/HWU2vqS7K94kWpWn9IIEGxlsWDCj+D4zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fN2Xc0BCvzcc4 for ; Fri, 27 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3423b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 22:08:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: 3ce3e896acf6 - main - libpmc: Update event definitions for AMD Zen List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ce3e896acf6cd504514ee44fc3aedcdc48a199c Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 22:08:48 +0000 Message-Id: <69a215f0.3423b.3bc7cd10@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3ce3e896acf6cd504514ee44fc3aedcdc48a199c commit 3ce3e896acf6cd504514ee44fc3aedcdc48a199c Author: Ali Mashtizadeh AuthorDate: 2026-02-24 15:36:03 +0000 Commit: Warner Losh CommitDate: 2026-02-27 21:26:34 +0000 libpmc: Update event definitions for AMD Zen The pmu event definitions for AMD Zen 5 was updated since it was imported into the tree. As a bonus I also updated the recommended json counters for Zen 1-3 even though we do not use that file yet. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2048 --- lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json | 3 ++- lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json | 3 ++- lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json | 3 ++- lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json b/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json index bf5083c1c260..4d28177325a0 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json @@ -169,8 +169,9 @@ }, { "MetricName": "nps1_die_to_dram", - "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die) (may need --metric-no-group)", + "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die)", "MetricExpr": "dram_channel_data_controller_0 + dram_channel_data_controller_1 + dram_channel_data_controller_2 + dram_channel_data_controller_3 + dram_channel_data_controller_4 + dram_channel_data_controller_5 + dram_channel_data_controller_6 + dram_channel_data_controller_7", + "MetricConstraint": "NO_GROUP_EVENTS", "MetricGroup": "data_fabric", "PerPkg": "1", "ScaleUnit": "6.1e-5MiB" diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json b/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json index a71694a043ba..60e19456d4c8 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json @@ -169,8 +169,9 @@ }, { "MetricName": "nps1_die_to_dram", - "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die) (may need --metric-no-group)", + "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die)", "MetricExpr": "dram_channel_data_controller_0 + dram_channel_data_controller_1 + dram_channel_data_controller_2 + dram_channel_data_controller_3 + dram_channel_data_controller_4 + dram_channel_data_controller_5 + dram_channel_data_controller_6 + dram_channel_data_controller_7", + "MetricConstraint": "NO_GROUP_EVENTS", "MetricGroup": "data_fabric", "PerPkg": "1", "ScaleUnit": "6.1e-5MiB" diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json b/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json index 988cf68ae825..3e9e1781812e 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json @@ -205,10 +205,11 @@ }, { "MetricName": "nps1_die_to_dram", - "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die) (may need --metric-no-group)", + "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die)", "MetricExpr": "dram_channel_data_controller_0 + dram_channel_data_controller_1 + dram_channel_data_controller_2 + dram_channel_data_controller_3 + dram_channel_data_controller_4 + dram_channel_data_controller_5 + dram_channel_data_controller_6 + dram_channel_data_controller_7", "MetricGroup": "data_fabric", "PerPkg": "1", + "MetricConstraint": "NO_GROUP_EVENTS", "ScaleUnit": "6.1e-5MiB" } ] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json b/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json index ff6627a77805..06bbaea15925 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json @@ -70,19 +70,19 @@ "EventName": "ls_mab_alloc.load_store_allocations", "EventCode": "0x41", "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", - "UMask": "0x3f" + "UMask": "0x07" }, { "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", "EventCode": "0x41", "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", - "UMask": "0x40" + "UMask": "0x08" }, { "EventName": "ls_mab_alloc.all_allocations", "EventCode": "0x41", "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", - "UMask": "0x7f" + "UMask": "0x0f" }, { "EventName": "ls_dmnd_fills_from_sys.local_l2",