From nobody Mon Jul 04 18:09:20 2022 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 855DB1C3F027; Mon, 4 Jul 2022 18:09:21 +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 4LcDN05fJ4z4kDb; Mon, 4 Jul 2022 18:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAbl819/x5YZ4qq8QlGpmqVX2GIzqvflvPm7cWQzoxg=; b=Kml1T2a7Y42IDy5EYebHnZGKS+Nwelx1+vww4DhWw6EsQkQbTY0b/9aP9lzKaDkv2Hzw0R 6poc00707rSKYnuJ68aeclKMjUSo2Ua8Nb7t9Ypgo5BVOcQkJQNoz8TQkMiD2gR16x8umD K3VN4OuHnbCoqz1CGLiIMrgMLaOlVvDifGRgtZpM4zU29syinyWtqVcRPcKq+1CwlQoBFM wLIrJrJ2tKBGXzBPwZQRcYQKcZPPFnaBWZS4oaZO2b/wQ1J/j7Oy9UYI7gGuwc/2igiQos 4iV/5gL4SOntp37bZ9L7Hz38AZ3u6n+GdG2yauK5l0UFF/anHjI0cbVWAUPK7A== 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 8118C15E3D; Mon, 4 Jul 2022 18:09:20 +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 264I9KjN064355; Mon, 4 Jul 2022 18:09:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I9KYL064354; Mon, 4 Jul 2022 18:09:20 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:20 GMT Message-Id: <202207041809.264I9KYL064354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: b120f6d62572 - stable/13 - libpmc: Disable hardcoding of Intel fixed counters. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b120f6d625723a2f412c11199050399ed1356b4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jAbl819/x5YZ4qq8QlGpmqVX2GIzqvflvPm7cWQzoxg=; b=ndCiNPG2ON+MXfzIkF9gkNCIv7WgIEToIJsCh4vWPNehbOUZQ2Nu8G+T0z0f6gYxSWSO1i hf0iI472s5aAC6Onn8CNooym1aRmrTmLyCvS7MJde5kUpLW5ux1aq4Fs5omcBvwQDZWhl9 iRcyMpbhh3SusOd9v/iy4Heg1Z0So/hqyBaH2ySkxsyfZ4+Mmh99836P9ibGnNqFNW+xfx i0tQxhPXuCiltaCvrpnPZkzb6DGm3ERTnbdOxitYvVmwk5BMhHcNIYjRp4D5/ubePo2h0e WRBU9X0caQCkNyVqXX3Uexm+POe+c5Bl2w3cRsGZDjFi2TRj85TkaljwZMqVHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958160; a=rsa-sha256; cv=none; b=sPjat663MUgeIGR+6JvqKrLktXc5HM0FA2aBsOsc56QFmPKrYGn1WXMqHD0/hTPHgr+r4e RRtDdEMKxCvTYKobemtPQGU6OXvEpZLfac2JKTh6IVbKaeZ83LfylhftEV6LenlNdTN0K7 WSqsg5lnTCF0j7lGu0wZM8PPZGutrDpmURXG/U2yy1FfjHJMF0WMboA5h0i9mK/MPamiol Gwhf0iY0OKqlhK+O/J0JwwHGEwFEDX5lBSYp/USdfAJW/1kikea0GiKokz8yEznKGfOnhM neDDCc87ywlPnOWXb+RpP+lEUIDpCgW+I8Nl7xpULVEUeYViUNQu7h6N/cTyiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b120f6d625723a2f412c11199050399ed1356b4a commit b120f6d625723a2f412c11199050399ed1356b4a Author: Alexander Motin AuthorDate: 2022-05-30 23:58:40 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:09 +0000 libpmc: Disable hardcoding of Intel fixed counters. Intel json's now have pretty reasonable fixed counters representation via event=0 and umask. Hardcoded values create more confusion than fix. MFC after: 1 month (cherry picked from commit 73b7b181e691ebbe8a0e411fd60f5003b51dc75d) --- lib/libpmc/libpmc_pmu_util.c | 3 +-- lib/libpmc/pmu-events/jevents.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 363f93c591f8..44487924c7d6 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -521,8 +521,7 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, strcasestr(event_name, "uncore") != NULL) { pm->pm_class = PMC_CLASS_UCP; pm->pm_caps |= PMC_CAP_QUALIFIER; - } else if ((ped->ped_umask == -1) || - (ped->ped_event == 0x0 && ped->ped_umask == 0x3)) { + } else if (ped->ped_event == 0x0) { pm->pm_class = PMC_CLASS_IAF; } else { pm->pm_class = PMC_CLASS_IAP; diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index 5a296031451e..ff7d3b226932 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -480,12 +480,14 @@ static struct fixed { const char *name; const char *event; } fixed[] = { +#if 0 { "inst_retired.any", "event=0xc0,period=2000003" }, { "inst_retired.any_p", "event=0xc0,period=2000003" }, { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03,period=2000003" }, { "cpu_clk_unhalted.thread", "event=0x3c,period=2000003" }, { "cpu_clk_unhalted.core", "event=0x3c,period=2000003" }, { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1,period=2000003" }, +#endif { NULL, NULL}, };