iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/perf/arch/powerpc: Fix the CPU ID const char* value by adding 0x prefix

Browse Source 
Simple expression parser test fails in powerpc as below:

    4: Simple expression parser
    test child forked, pid 170385
    Using CPUID 004e2102
    division by zero
    syntax error
    syntax error
    FAILED tests/expr.c:65 parse test failed
    test child finished with -1
    Simple expression parser: FAILED!

This is observed after commit:
'commit 9d5da30e4a ("perf jevents: Add a new expression builtin strcmp_cpuid_str()")'

With this commit, a new expression builtin strcmp_cpuid_str
got added. This function takes an 'ID' type value, which is
a string. So expression parse for strcmp_cpuid_str expects
const char * as cpuid value type. In case of powerpc, CPU IDs
are numbers. Hence it doesn't get interpreted correctly by
bison parser. Example in case of power9, cpuid string returns
as: 004e2102

cpuid of string type is expected in two cases:
1. char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused);

   Testcase "tests/expr.c" uses "perf_pmu__getcpuid" which calls
   get_cpuid_str to get the cpuid string.

2. cpuid field in  :struct pmu_events_map

   struct pmu_events_map {
           const char *arch;
	   const char *cpuid;

   Here cpuid field is used in "perf_pmu__find_events_table"
   function as "strcmp_cpuid_str(map->cpuid, cpuid)". The
   value for cpuid field is picked from mapfile.csv.

Fix the mapfile.csv and get_cpuid_str function to prefix
cpuid with 0x so that it gets correctly interpreted by
the bison parser

Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Tested-by: Disha Goel<disgoel@linux.ibm.com>
Cc: kjain@linux.ibm.com
Cc: maddy@linux.ibm.com
Cc: disgoel@linux.vnet.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20231009050052.64935-1-atrajeev@linux.vnet.ibm.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Athira Rajeev
2023-10-09 10:30:52 +05:30
committed by Namhyung Kim
parent 78efa7b411
commit f6a66ff98a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/arch/powerpc/util/header.c
View File

@@ -34,7 +34,7 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
{ {
char *bufp; char *bufp;
if (asprintf(&bufp, "%.8lx", mfspr(SPRN_PVR)) < 0) if (asprintf(&bufp, "0x%.8lx", mfspr(SPRN_PVR)) < 0)
bufp = NULL; bufp = NULL;
return bufp; return bufp;

6
tools/perf/pmu-events/arch/powerpc/mapfile.csv
View File

@@ -13,6 +13,6 @@
# #
# Power8 entries # Power8 entries
004[bcd][[:xdigit:]]{4},1,power8,core 0x004[bcd][[:xdigit:]]{4},1,power8,core
004e[[:xdigit:]]{4},1,power9,core 0x004e[[:xdigit:]]{4},1,power9,core
0080[[:xdigit:]]{4},1,power10,core 0x0080[[:xdigit:]]{4},1,power10,core
1 # Format:
13 #
14 # Power8 entries
15 004[bcd][[:xdigit:]]{4},1,power8,core 0x004[bcd][[:xdigit:]]{4},1,power8,core
16 004e[[:xdigit:]]{4},1,power9,core 0x004e[[:xdigit:]]{4},1,power9,core
17 0080[[:xdigit:]]{4},1,power10,core 0x0080[[:xdigit:]]{4},1,power10,core
18