From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A5D5C433EF for ; Wed, 11 May 2022 21:15:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348103AbiEKVPp (ORCPT ); Wed, 11 May 2022 17:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348065AbiEKVPf (ORCPT ); Wed, 11 May 2022 17:15:35 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF1692297DB for ; Wed, 11 May 2022 14:15:33 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id g129-20020a25db87000000b0064b0d671050so2953684ybf.6 for ; Wed, 11 May 2022 14:15:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=GOl/dDyiic3CHN6RpwyPiPKb1wU0VPhBRck28P7ZCHk=; b=kzk7n6/Ux8w6Q7p+lVKpurlLg4loE3fRbaAJQsK8SoczAzxQ+T4aTpgw9yoLRIoOKG RJG2I41HbbMYcGUQ5B7ScmXAOS/3coPyTDkaG48KYyz6NjdfeibUFsF74pfsnmzH1+lG gaqnEUIJxweJVYJ181xcSdFxcGpvAiM1ez3iRpTVtqArIE5IXHwuFvuT2miNv4ogIm22 +N6nb5jK9fXcXZ+FoFE4Y+fpsO/BbDpDIbgzN8cQsUblTXTVx6TbISDmSPdSYJzSr7h9 Ke8+2Vxr9HBI8+G+zAzJpodqLkGyEr6VJV7Kr6ngk8jGtE9hkf4rNUqtEvn56pza0c8O WVfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=GOl/dDyiic3CHN6RpwyPiPKb1wU0VPhBRck28P7ZCHk=; b=m5Y51IeqDw37MI4V6SGa6f545m4VotobR1oWqlBHBGM+Ae9S9nqXbI6ojoyqVvyKZx 8CUYP+SpIDSkOhfR0CyictNWvzcvDfLNOQ3PMEQkomo8U3FL/u+r+2iae44FP/8CgzrA oUCl6v9cknqose555nrTLXP3eet22WM2zE/vbL8GxFuzI1jRkX5WUaA1NVlGVdT8rrno rAveHNfMT3sv2uWWPgX91YgGnpVwq9bl9CJamWe8+06WFPaeeTAhTwMJrQG0t/GSJfDO 1CxFADYtcg/Pz4lvn7nxRVT1eCIta6K3nd1l4VG+e3rawpDsK5CQXvkr1mvtcghBmaKu 3a2g== X-Gm-Message-State: AOAM531GGgmZvBq8k8LtHO9NOfmyzvVA/3poF2EaH3j4EPZXwLoq256F xsAcwUtlNjrbCOq7WfANjN6wN23fmbsx X-Google-Smtp-Source: ABdhPJyoqro8S0Ed4YjfQ1udYJK0lU53Cjn5f7G/UpvgJpoCAse+sptoQwIh+xpmoPM5MGsChn3BDN8nIxe1 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:5993:294b:7b62:54cb]) (user=irogers job=sendgmr) by 2002:a81:578a:0:b0:2f8:ec0e:2205 with SMTP id l132-20020a81578a000000b002f8ec0e2205mr25750235ywb.408.1652303732927; Wed, 11 May 2022 14:15:32 -0700 (PDT) Date: Wed, 11 May 2022 14:15:20 -0700 In-Reply-To: <20220511211526.1021908-1-irogers@google.com> Message-Id: <20220511211526.1021908-2-irogers@google.com> Mime-Version: 1.0 References: <20220511211526.1021908-1-irogers@google.com> X-Mailer: git-send-email 2.36.0.512.ge40c2bad7a-goog Subject: [PATCH v2 1/7] perf jevents: Append PMU description later From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , John Garry , Kan Liang , Andi Kleen , Zhengjun Xing , Felix Fietkau , Qi Liu , Like Xu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Nick Forrington , Kajol Jain , James Clark , Andrew Kilroy , "Paul A . Clarke" , Will Deacon , Mathieu Poirier , ananth.narayan@amd.com, ravi.bangoria@amd.com, santosh.shukla@amd.com, sandipan.das@amd.com, Caleb Biggers , Perry Taylor , Kshipra Bopardikar Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Append the PMU information from "Unit" to the description later. This avoids a problem when "Unit" appears early in a json event and the information prepends the description rather than being the expected suffix. Update the pmu-events test so that expectations now match the improved output. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.c | 8 +++++--- tools/perf/tests/pmu-events.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 159d9eab6e79..e1f7c7afd435 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -652,9 +652,6 @@ static int json_events(const char *fn, for (s = je.pmu; *s; s++) *s = tolower(*s); } - addfield(map, &je.desc, ". ", "Unit: ", NULL); - addfield(map, &je.desc, "", je.pmu, NULL); - addfield(map, &je.desc, "", " ", NULL); } else if (json_streq(map, field, "Filter")) { addfield(map, &filter, "", "", val); } else if (json_streq(map, field, "ScaleUnit")) { @@ -697,6 +694,11 @@ static int json_events(const char *fn, addfield(map, &je.desc, " ", extra_desc, NULL); if (je.long_desc && extra_desc) addfield(map, &je.long_desc, " ", extra_desc, NULL); + if (je.pmu) { + addfield(map, &je.desc, ". ", "Unit: ", NULL); + addfield(map, &je.desc, "", je.pmu, NULL); + addfield(map, &je.desc, "", " ", NULL); + } if (filter) addfield(map, &event, ",", filter, NULL); if (msr != NULL) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 299a215eb54c..b74c6ef59e51 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -133,7 +133,7 @@ static const struct perf_pmu_test_event unc_cbo_xsnp_response_miss_eviction = { .event = { .name = "unc_cbo_xsnp_response.miss_eviction", .event = "umask=0x81,event=0x22", - .desc = "Unit: uncore_cbox A cross-core snoop resulted from L3 Eviction which misses in some processor core", + .desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core. Unit: uncore_cbox ", .topic = "uncore", .long_desc = "A cross-core snoop resulted from L3 Eviction which misses in some processor core", .pmu = "uncore_cbox", @@ -147,7 +147,7 @@ static const struct perf_pmu_test_event uncore_hyphen = { .event = { .name = "event-hyphen", .event = "umask=0x00,event=0xe0", - .desc = "Unit: uncore_cbox UNC_CBO_HYPHEN", + .desc = "UNC_CBO_HYPHEN. Unit: uncore_cbox ", .topic = "uncore", .long_desc = "UNC_CBO_HYPHEN", .pmu = "uncore_cbox", @@ -161,7 +161,7 @@ static const struct perf_pmu_test_event uncore_two_hyph = { .event = { .name = "event-two-hyph", .event = "umask=0x00,event=0xc0", - .desc = "Unit: uncore_cbox UNC_CBO_TWO_HYPH", + .desc = "UNC_CBO_TWO_HYPH. Unit: uncore_cbox ", .topic = "uncore", .long_desc = "UNC_CBO_TWO_HYPH", .pmu = "uncore_cbox", -- 2.36.0.512.ge40c2bad7a-goog