Re: [PATCH 1/2] perf script: Fix perf script -F +metric

[Andi Kleen <ak@linux.intel.com>]

> This works, however there seems to be yet another issue on
> perf-tools-next branch that breaks script metrics.
> 
> 617824a7f0f73 (perf parse-events: Prefer sysfs/JSON hardware
> events over legacy, 2024-04-15) changes event priority so on
> my host "instructions" have type PERF_TYPE_RAW instead of
> PERF_TYPE_HARDWARE.

FWIW I don't see this on my build on Intel, even with that commit.

> This results in evsel__stat_type no longer recognizing these as
> STAT_INSTRUCTIONS.

I guess we could just fix evsel__stat_type to handle that case

Does this patch work?

perf: Workaround event priority problems
    
When instructions is not of HARDWARE types anymore, but raw,
which breaks the shadow stat metrics detection for IPC.
    
Reported-by: Artem Savkov <asavkov@redhat.com>
Fixes: 617824a7f0f73 (perf parse-events: Prefer sysfs/JSON hardware
Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index 3466aa952442..87a503e47ff0 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -97,9 +97,11 @@ static enum stat_type evsel__stat_type(const struct evsel *evsel)
 
 	if (evsel__is_clock(evsel))
 		return STAT_NSECS;
-	else if (evsel__match(evsel, HARDWARE, HW_CPU_CYCLES))
+	else if (evsel__match(evsel, HARDWARE, HW_CPU_CYCLES) ||
+			!strcmp(evsel__name((struct evsel *)evsel), "cycles"))
 		return STAT_CYCLES;
-	else if (evsel__match(evsel, HARDWARE, HW_INSTRUCTIONS))
+	else if (evsel__match(evsel, HARDWARE, HW_INSTRUCTIONS) ||
+			!strcmp(evsel__name((struct evsel *)evsel), "instructions"))
 		return STAT_INSTRUCTIONS;
 	else if (evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_FRONTEND))
 		return STAT_STALLED_CYCLES_FRONT;