hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf jevents: Make build fail on JSON parse error 

Today, when a JSON file fails parsing the build continues, but there are
no json files built in, which is difficult to debug later.  Make the
build stop on a parse error instead.

v2: Add fixes from Sukadev. Now we handle architectures
    with no JSON events correctly. And fix some stale comments.

Committer note:

Tested by running the cross build container tests, that were all failing
for v1.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20170725001638.19990-1-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2017-07-24 17:16:38 -07:00 committed by Arnaldo Carvalho de Melo
parent a1a8bed32d
commit 3f056b6664
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/pmu-events/README
View File

@ -85,10 +85,6 @@ users to specify events by their name:
where 'pm_1plus_ppc_cmpl' is a Power8 PMU event. where 'pm_1plus_ppc_cmpl' is a Power8 PMU event.
In case of errors when processing files in the tools/perf/pmu-events/arch
directory, 'jevents' tries to create an empty mapping file to allow the perf
build to succeed even if the PMU event aliases cannot be used.
However some errors in processing may cause the perf build to fail. However some errors in processing may cause the perf build to fail.
Mapfile format Mapfile format

21
tools/perf/pmu-events/jevents.c
View File

@ -822,10 +822,6 @@ static int process_one_file(const char *fpath, const struct stat *sb,
* PMU event tables (see struct pmu_events_map). * PMU event tables (see struct pmu_events_map).
* *
* Write out the PMU events tables and the mapping table to pmu-event.c. * Write out the PMU events tables and the mapping table to pmu-event.c.
*
* If unable to process the JSON or arch files, create an empty mapping
* table so we can continue to build/use perf even if we cannot use the
* PMU event aliases.
*/ */
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -836,6 +832,7 @@ int main(int argc, char *argv[])
const char *arch; const char *arch;
const char *output_file; const char *output_file;
const char *start_dirname; const char *start_dirname;
struct stat stbuf;
prog = basename(argv[0]); prog = basename(argv[0]);
if (argc < 4) { if (argc < 4) {
@ -857,11 +854,17 @@ int main(int argc, char *argv[])
return 2; return 2;
} }
sprintf(ldirname, "%s/%s", start_dirname, arch);
/* If architecture does not have any event lists, bail out */
if (stat(ldirname, &stbuf) < 0) {
pr_info("%s: Arch %s has no PMU event lists\n", prog, arch);
goto empty_map;
}
/* Include pmu-events.h first */ /* Include pmu-events.h first */
fprintf(eventsfp, "#include \"../../pmu-events/pmu-events.h\"\n"); fprintf(eventsfp, "#include \"../../pmu-events/pmu-events.h\"\n");
sprintf(ldirname, "%s/%s", start_dirname, arch);
/* /*
* The mapfile allows multiple CPUids to point to the same JSON file, * The mapfile allows multiple CPUids to point to the same JSON file,
* so, not sure if there is a need for symlinks within the pmu-events * so, not sure if there is a need for symlinks within the pmu-events
@ -878,6 +881,9 @@ int main(int argc, char *argv[])
if (rc && verbose) { if (rc && verbose) {
pr_info("%s: Error walking file tree %s\n", prog, ldirname); pr_info("%s: Error walking file tree %s\n", prog, ldirname);
goto empty_map; goto empty_map;
} else if (rc < 0) {
/* Make build fail */
return 1;
} else if (rc) { } else if (rc) {
goto empty_map; goto empty_map;
} }
@ -892,7 +898,8 @@ int main(int argc, char *argv[])
if (process_mapfile(eventsfp, mapfile)) { if (process_mapfile(eventsfp, mapfile)) {
pr_info("%s: Error processing mapfile %s\n", prog, mapfile); pr_info("%s: Error processing mapfile %s\n", prog, mapfile);
goto empty_map; /* Make build fail */
return 1;
} }
return 0; return 0;