From nobody Tue Nov 03 14:19:20 2026 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 4jJrL10f0Hz6yHWv for ; Tue, 03 Nov 2026 14:19: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJrL05Ym8z3NdS for ; Tue, 03 Nov 2026 14:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793715560; 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=XurJs2uSmnVWfilawRaGMW/WobGM0H2Jp8MzQGERLIE=; b=KLrMh+foY081tkjHMJgzh23IroEH9m+d+GLDX0mTQokNZK2Aw8PblNHbXYyEy4/swEMD0r OwV0Ic5t96BzckWTI2WCf9MrDvMkZL2pCRoKs0qT7Gz3qOCT85iPiwaXMd39a4vbvuBMhU cbAv5aEAo133l2sm0JMn8AEKJu8M4iVndeJURIzlFOQqcSREB9sfFpANyWVLtSCfAzZlOh U1EwqfdOYPYeMiBxQFWZdOZFyNQo2OWtTAc+USWCSCE6LCIfwvhW1zwpo6ZiwLR99QLFBE VVhEPYCbdVIUhkmB0eNW0BIOgZOXYJqktNlemNJ4r9v3f/+8X9xT4UTRGjZjbw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793715560; b=e20B4M/9nwDDDjVEjsoGzBOo92CIWsTZ3NXwPXwbHId5hfO2rOO0U+S2/k6mtmwnOkB5Xs PwWOfZAxlVbceVoswZK8GzMBciKKYNkol+qYjNub0Zb3m/HLnzQ2Pd8pQW+Ry6Yzv626xg scl4xX3KaZeT63jMuJFjFE2LFcF5QvYQjR/sGBqumWuDBePKN/9srkQOoS4hT123EVI+2z 2SSxUAzvgF5wKlG+WYJRK4J2fjdLdzLVvM+uYPELKwyAJ+Hp5dOg1l+FJdpIlNMGQTEYKo qYbXwwCHr+JjM4EQAj95ViDMsch/XAIM97hz6Sz7g/b9SzXKaOw7tK5SFv0Eig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793715560; 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=XurJs2uSmnVWfilawRaGMW/WobGM0H2Jp8MzQGERLIE=; b=Q46tL+H3793hNTGgO9+O2FpJq1/LdlRQWK503OxH+fEoi317oaRBeYczlm/rZXSl7Te/r9 7kdkjlqpZhfOFp0iYZ4YSC7MRfHAqcRKIfRO0VFNpSwlBjduXKzPCrwbIMYPG62dh9/FWz 69bM7/xVQfJeJGzxS+7TMigWScimVROliVwZrrz/NQbKE4gcnRw+Fw6Ke07e8nVSNvddJW Es7BU9yJNfkYkihdfdd4VmSDqtcqrvvSk9U0IkdkBYW3CK4HritDZrD60QdL7/qZIOQtdx z50mCeD53O39fWx8Zm5B1xM0Nv2tYG7UquKEzNK+ZhJ49A7cLYxCj5USnHgOJQ== 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 4jJrL052TxzKDh for ; Tue, 03 Nov 2026 14:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 14:19:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bojan Novk=?utf-8?Q?ovi=C4=87?= From: Mitchell Horne Subject: git: e7c7fed0e369 - stable/15 - libpmc/pmu-events: Add support for new json fields List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e7c7fed0e369a0415626572b592c9a1b0ffe4e62 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 14:19:20 +0000 Message-Id: <6ae9ed68.3d4cb.14fa3a73@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e7c7fed0e369a0415626572b592c9a1b0ffe4e62 commit e7c7fed0e369a0415626572b592c9a1b0ffe4e62 Author: Bojan Novković AuthorDate: 2026-03-21 14:37:44 +0000 Commit: Mitchell Horne CommitDate: 2026-11-03 14:18:51 +0000 libpmc/pmu-events: Add support for new json fields This change adds support for three new Intel fields to jevents.c: - MetricThreshold - MetricgroupNoGroup - DefaultMetricgroupName Reviewed by: ali_mashtizadeh.com, mhorne Differential Revision: https://reviews.freebsd.org/D56017 MFC after: 1 week (cherry picked from commit 6ad94d549eb2286d791abd5634400d8ef36d8259) --- lib/libpmc/pmu-events/jevents.c | 24 ++++++++++++++++++++++++ lib/libpmc/pmu-events/pmu-events.h | 3 +++ 2 files changed, 27 insertions(+) diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index b129b3706832..facec3361c70 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -71,8 +71,11 @@ struct json_event { char *perpkg; char *aggr_mode; char *metric_expr; + char *metric_threshold; char *metric_name; char *metric_group; + char *metric_group_nogroup; + char *default_metric_group; char *deprecated; char *metric_constraint; }; @@ -379,10 +382,16 @@ static int print_events_table_entry(void *data, struct json_event *je) fprintf(outfp, "\t.aggr_mode = \"%d\",\n", convert(je->aggr_mode)); if (je->metric_expr) fprintf(outfp, "\t.metric_expr = \"%s\",\n", je->metric_expr); + if (je->metric_threshold) + fprintf(outfp, "\t.metric_threshold = \"%s\",\n", je->metric_threshold); if (je->metric_name) fprintf(outfp, "\t.metric_name = \"%s\",\n", je->metric_name); if (je->metric_group) fprintf(outfp, "\t.metric_group = \"%s\",\n", je->metric_group); + if (je->metric_group_nogroup) + fprintf(outfp, "\t.metric_group_nogroup = \"%s\",\n", je->metric_group_nogroup); + if (je->default_metric_group) + fprintf(outfp, "\t.default_metric_group = \"%s\",\n", je->default_metric_group); if (je->deprecated) fprintf(outfp, "\t.deprecated = \"%s\",\n", je->deprecated); if (je->metric_constraint) @@ -404,8 +413,11 @@ struct event_struct { char *perpkg; char *aggr_mode; char *metric_expr; + char *metric_threshold; char *metric_name; char *metric_group; + char *metric_group_nogroup; + char *default_metric_group; char *deprecated; char *metric_constraint; }; @@ -434,8 +446,11 @@ struct event_struct { op(perpkg); \ op(aggr_mode); \ op(metric_expr); \ + op(metric_threshold); \ op(metric_name); \ op(metric_group); \ + op(metric_group_nogroup); \ + op(default_metric_group); \ op(deprecated); \ } while (0) @@ -711,10 +726,16 @@ static int json_events(const char *fn, addfield(map, &je.metric_name, "", "", val); } else if (json_streq(map, field, "MetricGroup")) { addfield(map, &je.metric_group, "", "", val); + } else if (json_streq(map, field, "MetricgroupNoGroup")) { + addfield(map, &je.metric_group_nogroup, "", "", val); + } else if (json_streq(map, field, "DefaultMetricgroupName")) { + addfield(map, &je.default_metric_group, "", "", val); } else if (json_streq(map, field, "MetricConstraint")) { addfield(map, &je.metric_constraint, "", "", val); } else if (json_streq(map, field, "MetricExpr")) { addfield(map, &je.metric_expr, "", "", val); + } else if (json_streq(map, field, "MetricThreshold")) { + addfield(map, &je.metric_threshold, "", "", val); } else if (json_streq(map, field, "ArchStdEvent")) { addfield(map, &arch_std, "", "", val); for (s = arch_std; *s; s++) @@ -866,8 +887,11 @@ free_strings: free(je.deprecated); free(je.unit); free(je.metric_expr); + free(je.metric_threshold); free(je.metric_name); free(je.metric_group); + free(je.metric_group_nogroup); + free(je.default_metric_group); free(je.metric_constraint); free(arch_std); diff --git a/lib/libpmc/pmu-events/pmu-events.h b/lib/libpmc/pmu-events/pmu-events.h index d9edbfba7ceb..1a158a5f16f2 100644 --- a/lib/libpmc/pmu-events/pmu-events.h +++ b/lib/libpmc/pmu-events/pmu-events.h @@ -24,8 +24,11 @@ struct pmu_event { const char *perpkg; const char *aggr_mode; const char *metric_expr; + const char *metric_threshold; const char *metric_name; const char *metric_group; + const char *metric_group_nogroup; + const char *default_metric_group; const char *deprecated; const char *metric_constraint; };