From nobody Fri Oct 15 15:26:14 2021 X-Original-To: dev-commits-src-branches@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 474B81816ED6; Fri, 15 Oct 2021 15:26:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HW98l3ZPBz3PNQ; Fri, 15 Oct 2021 15:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEEF6CFB; Fri, 15 Oct 2021 15:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19FFQE8B007364; Fri, 15 Oct 2021 15:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19FFQEPn007363; Fri, 15 Oct 2021 15:26:14 GMT (envelope-from git) Date: Fri, 15 Oct 2021 15:26:14 GMT Message-Id: <202110151526.19FFQEPn007363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3c01f7415067 - stable/13 - libpmc: add some AMD pmu counter aliases List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c01f7415067d8a4da0737eb74c2709f0d5afed8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3c01f7415067d8a4da0737eb74c2709f0d5afed8 commit 3c01f7415067d8a4da0737eb74c2709f0d5afed8 Author: Mitchell Horne AuthorDate: 2021-09-30 14:13:37 +0000 Commit: Mitchell Horne CommitDate: 2021-10-15 15:21:36 +0000 libpmc: add some AMD pmu counter aliases Make it mostly compatible with what's defined for Intel. Except where noted, these are defined for all of amdzen(1|2|3). Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32162 (cherry picked from commit a20c10893eb17e281f119d1b9b39c175dbf4d7bd) --- lib/libpmc/libpmc_pmu_util.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index b72f45e85a72..363f93c591f8 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -86,6 +86,19 @@ static struct pmu_alias pmu_intel_alias_table[] = { static struct pmu_alias pmu_amd_alias_table[] = { {"UNHALTED_CORE_CYCLES", "ls_not_halted_cyc"}, {"UNHALTED-CORE-CYCLES", "ls_not_halted_cyc"}, + {"LLC_MISSES", "l3_comb_clstr_state.request_miss"}, + {"LLC-MISSES", "l3_comb_clstr_state.request_miss"}, + {"LLC_REFERENCE", "l3_request_g1.caching_l3_cache_accesses"}, + {"LLC-REFERENCE", "l3_request_g1.caching_l3_cache_accesses"}, + {"BRANCH_INSTRUCTION_RETIRED", "ex_ret_brn"}, + {"BRANCH-INSTRUCTION-RETIRED", "ex_ret_brn"}, + {"BRANCH_MISSES_RETIRED", "ex_ret_brn_misp"}, + {"BRANCH-MISSES-RETIRED", "ex_ret_brn_misp"}, + {"unhalted-cycles", "ls_not_halted_cyc"}, + {"instructions", "ex_ret_instr",}, + {"branch-mispredicts", "ex_ret_brn_misp"}, + {"branches", "ex_ret_brn"}, + {"interrupts", "ls_int_taken"}, /* Not on amdzen1 */ {NULL, NULL}, };