| Message ID | 20211230072030.302559-8-irogers@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Refactor perf cpumap | expand |
Em Wed, Dec 29, 2021 at 11:19:48PM -0800, Ian Rogers escreveu: > Avoid error prone cpu_map + idx variant. Remove now unused functions. At this point we need to remove the now unused perf_env__get_cpu(), and then deal with the fallout in the following patches that needlessly modify this unused function. Doing that now. - Arnaldo ⬢[acme@toolbox perf]$ git diff diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 6b985abaa2d22c58..40cb3518f27e2309 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1477,22 +1477,6 @@ static void perf_stat__exit_aggr_mode(void) stat_config.cpus_aggr_map = NULL; } -static inline int perf_env__get_cpu(void *data, struct perf_cpu_map *map, int idx) -{ - struct perf_env *env = data; - int cpu; - - if (idx > map->nr) - return -1; - - cpu = map->map[idx]; - - if (cpu >= env->nr_cpus_avail) - return -1; - - return cpu; -} - static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) { struct perf_env *env = data; > Reviewed-by: James Clark <james.clark@arm.com> > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/builtin-stat.c | 28 ++++------------------------ > tools/perf/util/cpumap.c | 12 ++++++------ > tools/perf/util/cpumap.h | 2 +- > 3 files changed, 11 insertions(+), 31 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 9791ae9b1a53..6b985abaa2d2 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1504,11 +1504,6 @@ static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_socket(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_socket_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) > { > struct perf_env *env = data; > @@ -1527,11 +1522,6 @@ static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_die_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) > { > struct perf_env *env = data; > @@ -1551,11 +1541,6 @@ static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_core_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) > { > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > @@ -1564,33 +1549,28 @@ static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) > return id; > } > > -static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx, void *data) > -{ > - return perf_env__get_node_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > -} > - > static int perf_env__build_socket_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **sockp) > { > - return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env); > + return cpu_map__build_map(cpus, sockp, perf_env__get_socket_aggr_by_cpu, env); > } > > static int perf_env__build_die_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **diep) > { > - return cpu_map__build_map(cpus, diep, perf_env__get_die, env); > + return cpu_map__build_map(cpus, diep, perf_env__get_die_aggr_by_cpu, env); > } > > static int perf_env__build_core_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **corep) > { > - return cpu_map__build_map(cpus, corep, perf_env__get_core, env); > + return cpu_map__build_map(cpus, corep, perf_env__get_core_aggr_by_cpu, env); > } > > static int perf_env__build_node_map(struct perf_env *env, struct perf_cpu_map *cpus, > struct cpu_aggr_map **nodep) > { > - return cpu_map__build_map(cpus, nodep, perf_env__get_node, env); > + return cpu_map__build_map(cpus, nodep, perf_env__get_node_aggr_by_cpu, env); > } > > static struct aggr_cpu_id perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused, > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index 49fba2c53822..feaf34b25efc 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -163,7 +163,7 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > } > > int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), > + struct aggr_cpu_id (*f)(int cpu, void *data), > void *data) > { > int nr = cpus->nr; > @@ -178,7 +178,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > c->nr = 0; > > for (cpu = 0; cpu < nr; cpu++) { > - s1 = f(cpus, cpu, data); > + s1 = f(cpu, data); > for (s2 = 0; s2 < c->nr; s2++) { > if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2])) > break; > @@ -290,22 +290,22 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) > { > - return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL); > + return cpu_map__build_map(cpus, sockp, cpu_map__get_socket_aggr_by_cpu, NULL); > } > > int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep) > { > - return cpu_map__build_map(cpus, diep, cpu_map__get_die, NULL); > + return cpu_map__build_map(cpus, diep, cpu_map__get_die_aggr_by_cpu, NULL); > } > > int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep) > { > - return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL); > + return cpu_map__build_map(cpus, corep, cpu_map__get_core_aggr_by_cpu, NULL); > } > > int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **numap) > { > - return cpu_map__build_map(cpus, numap, cpu_map__get_node, NULL); > + return cpu_map__build_map(cpus, numap, cpu_map__get_node_aggr_by_cpu, NULL); > } > > /* setup simple routines to easily access node numbers given a cpu number */ > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > index c62d67704425..9648816c4255 100644 > --- a/tools/perf/util/cpumap.h > +++ b/tools/perf/util/cpumap.h > @@ -63,7 +63,7 @@ int cpu__max_present_cpu(void); > int cpu__get_node(int cpu); > > int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), > + struct aggr_cpu_id (*f)(int cpu, void *data), > void *data); > > int cpu_map__cpu(struct perf_cpu_map *cpus, int idx); > -- > 2.34.1.448.ga2b2bfdf31-goog
Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Wed, Dec 29, 2021 at 11:19:48PM -0800, Ian Rogers escreveu: > > Avoid error prone cpu_map + idx variant. Remove now unused functions. > > At this point we need to remove the now unused perf_env__get_cpu(), and > then deal with the fallout in the following patches that needlessly > modify this unused function. > > Doing that now. Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the build containers, a better start now: [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz [perfbuilder@five ~]$ time dm 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) 3: alpine:3.5 - Arnaldo > ⬢[acme@toolbox perf]$ git diff > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 6b985abaa2d22c58..40cb3518f27e2309 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1477,22 +1477,6 @@ static void perf_stat__exit_aggr_mode(void) > stat_config.cpus_aggr_map = NULL; > } > > -static inline int perf_env__get_cpu(void *data, struct perf_cpu_map *map, int idx) > -{ > - struct perf_env *env = data; > - int cpu; > - > - if (idx > map->nr) > - return -1; > - > - cpu = map->map[idx]; > - > - if (cpu >= env->nr_cpus_avail) > - return -1; > - > - return cpu; > -} > - > static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) > { > struct perf_env *env = data; > > > Reviewed-by: James Clark <james.clark@arm.com> > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/builtin-stat.c | 28 ++++------------------------ > > tools/perf/util/cpumap.c | 12 ++++++------ > > tools/perf/util/cpumap.h | 2 +- > > 3 files changed, 11 insertions(+), 31 deletions(-) > > > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > > index 9791ae9b1a53..6b985abaa2d2 100644 > > --- a/tools/perf/builtin-stat.c > > +++ b/tools/perf/builtin-stat.c > > @@ -1504,11 +1504,6 @@ static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) > > return id; > > } > > > > -static struct aggr_cpu_id perf_env__get_socket(struct perf_cpu_map *map, int idx, void *data) > > -{ > > - return perf_env__get_socket_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > > -} > > - > > static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) > > { > > struct perf_env *env = data; > > @@ -1527,11 +1522,6 @@ static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) > > return id; > > } > > > > -static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, void *data) > > -{ > > - return perf_env__get_die_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > > -} > > - > > static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) > > { > > struct perf_env *env = data; > > @@ -1551,11 +1541,6 @@ static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) > > return id; > > } > > > > -static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, void *data) > > -{ > > - return perf_env__get_core_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > > -} > > - > > static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) > > { > > struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); > > @@ -1564,33 +1549,28 @@ static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) > > return id; > > } > > > > -static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx, void *data) > > -{ > > - return perf_env__get_node_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); > > -} > > - > > static int perf_env__build_socket_map(struct perf_env *env, struct perf_cpu_map *cpus, > > struct cpu_aggr_map **sockp) > > { > > - return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env); > > + return cpu_map__build_map(cpus, sockp, perf_env__get_socket_aggr_by_cpu, env); > > } > > > > static int perf_env__build_die_map(struct perf_env *env, struct perf_cpu_map *cpus, > > struct cpu_aggr_map **diep) > > { > > - return cpu_map__build_map(cpus, diep, perf_env__get_die, env); > > + return cpu_map__build_map(cpus, diep, perf_env__get_die_aggr_by_cpu, env); > > } > > > > static int perf_env__build_core_map(struct perf_env *env, struct perf_cpu_map *cpus, > > struct cpu_aggr_map **corep) > > { > > - return cpu_map__build_map(cpus, corep, perf_env__get_core, env); > > + return cpu_map__build_map(cpus, corep, perf_env__get_core_aggr_by_cpu, env); > > } > > > > static int perf_env__build_node_map(struct perf_env *env, struct perf_cpu_map *cpus, > > struct cpu_aggr_map **nodep) > > { > > - return cpu_map__build_map(cpus, nodep, perf_env__get_node, env); > > + return cpu_map__build_map(cpus, nodep, perf_env__get_node_aggr_by_cpu, env); > > } > > > > static struct aggr_cpu_id perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused, > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > > index 49fba2c53822..feaf34b25efc 100644 > > --- a/tools/perf/util/cpumap.c > > +++ b/tools/perf/util/cpumap.c > > @@ -163,7 +163,7 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > > } > > > > int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > > - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), > > + struct aggr_cpu_id (*f)(int cpu, void *data), > > void *data) > > { > > int nr = cpus->nr; > > @@ -178,7 +178,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > > c->nr = 0; > > > > for (cpu = 0; cpu < nr; cpu++) { > > - s1 = f(cpus, cpu, data); > > + s1 = f(cpu, data); > > for (s2 = 0; s2 < c->nr; s2++) { > > if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2])) > > break; > > @@ -290,22 +290,22 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da > > > > int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) > > { > > - return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL); > > + return cpu_map__build_map(cpus, sockp, cpu_map__get_socket_aggr_by_cpu, NULL); > > } > > > > int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep) > > { > > - return cpu_map__build_map(cpus, diep, cpu_map__get_die, NULL); > > + return cpu_map__build_map(cpus, diep, cpu_map__get_die_aggr_by_cpu, NULL); > > } > > > > int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep) > > { > > - return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL); > > + return cpu_map__build_map(cpus, corep, cpu_map__get_core_aggr_by_cpu, NULL); > > } > > > > int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **numap) > > { > > - return cpu_map__build_map(cpus, numap, cpu_map__get_node, NULL); > > + return cpu_map__build_map(cpus, numap, cpu_map__get_node_aggr_by_cpu, NULL); > > } > > > > /* setup simple routines to easily access node numbers given a cpu number */ > > diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h > > index c62d67704425..9648816c4255 100644 > > --- a/tools/perf/util/cpumap.h > > +++ b/tools/perf/util/cpumap.h > > @@ -63,7 +63,7 @@ int cpu__max_present_cpu(void); > > int cpu__get_node(int cpu); > > > > int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > > - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), > > + struct aggr_cpu_id (*f)(int cpu, void *data), > > void *data); > > > > int cpu_map__cpu(struct perf_cpu_map *cpus, int idx); > > -- > > 2.34.1.448.ga2b2bfdf31-goog > > -- > > - Arnaldo
Em Mon, Jan 10, 2022 at 06:03:04PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Wed, Dec 29, 2021 at 11:19:48PM -0800, Ian Rogers escreveu: > > > Avoid error prone cpu_map + idx variant. Remove now unused functions. > > > > At this point we need to remove the now unused perf_env__get_cpu(), and > > then deal with the fallout in the following patches that needlessly > > modify this unused function. > > > > Doing that now. > > Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the > build containers, a better start now: > > [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz > [perfbuilder@five ~]$ time dm > 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) > 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) > 3: alpine:3.5 > So far so good: [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz [perfbuilder@five ~]$ time dm 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) 3 54.98 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 , clang version 3.8.1 (tags/RELEASE_381/final) 4 57.69 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 , clang version 4.0.0 (tags/RELEASE_400/final) 5 63.62 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) 6 64.52 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) 7 66.54 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) 8 91.91 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) 9 104.93 alpine:3.11 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 9.0.0 (https://git.alpinelinux.org/aports f7f0d2c2b8bcd6a5843401a9a702029556492689) (based on LLVM 9.0.0) 10 107.97 alpine:3.12 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 10.0.0 (https://gitlab.alpinelinux.org/alpine/aports.git 7445adce501f8473efdb93b17b5eaf2f1445ed4c) 11 115.98 alpine:3.13 : Ok gcc (Alpine 10.2.1_pre1) 10.2.1 20201203 , Alpine clang version 10.0.1 12 101.73 alpine:3.14 : Ok gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424 , Alpine clang version 11.1.0 13 103.35 alpine:3.15 : Ok gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027 , Alpine clang version 12.0.1 14 104.43 alpine:edge : Ok gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128 , Alpine clang version 12.0.1 15 51.06 alt:p8 : Ok x86_64-alt-linux-gcc (GCC) 5.3.1 20151207 (ALT p8 5.3.1-alt3.M80P.1) , clang version 3.8.0 (tags/RELEASE_380/final) Building with: build_perf_gcc() { set -o xtrace make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" -C tools/perf O=/tmp/build/perf || exit 1 rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" NO_LIBELF=1 -C tools/perf O=/tmp/build/perf || exit 1 rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" NO_LIBBPF=1 -C tools/perf O=/tmp/build/perf || exit 1 if [ -d /usr/include/traceevent/ ] ; then make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" LIBTRACEEVENT_DYNAMIC=1 -C tools/perf O=/tmp/build/perf || exit 1 fi set +o xtrace } build_perf_clang() { set -o xtrace if [ ! $NO_BUILD_BPF_SKEL ] ; then rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf || exit 1 fi rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" -C tools/perf O=/tmp/build/perf CC=clang || exit 1 rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" NO_LIBELF=1 -C tools/perf O=/tmp/build/perf CC=clang || exit 1 rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" NO_LIBBPF=1 -C tools/perf O=/tmp/build/perf CC=clang || exit 1 rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" LIBCLANGLLVM=1 -C tools/perf O=/tmp/build/perf CC=clang || exit 1 rm -rf /tmp/build/perf ; mkdir /tmp/build/perf make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" LIBCLANGLLVM=1 -C tools/perf O=/tmp/build/perf || exit 1 if [ -d /usr/include/traceevent/ ] ; then make $EXTRA_MAKE_ARGS ARCH=$ARCH CROSS_COMPILE=$CROSS_COMPILE EXTRA_CFLAGS="$EXTRA_CFLAGS" LIBTRACEEVENT_DYNAMIC=1 -C tools/perf O=/tmp/build/perf || exit 1 fi set +o xtrace }
Em Mon, Jan 10, 2022 at 06:23:09PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Jan 10, 2022 at 06:03:04PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > > > At this point we need to remove the now unused perf_env__get_cpu(), and > > > then deal with the fallout in the following patches that needlessly > > > modify this unused function. > > > > > > Doing that now. > > > > Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the > > build containers, a better start now: > So far so good: perf test ok, just that one that is failing, but before this series as well: 89: perf all metricgroups test : FAILED! [acme@quaco perf]$ uname -a Linux quaco 5.15.7-200.fc35.x86_64 #1 SMP Wed Dec 8 19:00:47 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux [acme@quaco perf]$ git log --oneline -1 16ed0580fb4d64bd (HEAD -> perf/core, seventh/perf/core, five/perf/core, acme.korg/tmp.perf/perf_cpu) perf cpumap: Give CPUs their own type [acme@quaco perf]$ perf -v perf version 5.16.g16ed0580fb4d [acme@quaco perf]$ sudo su - [sudo] password for acme: [root@quaco ~]# perf -vv perf version 5.16.g16ed0580fb4d dwarf: [ on ] # HAVE_DWARF_SUPPORT dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT glibc: [ on ] # HAVE_GLIBC_SUPPORT syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT libbfd: [ on ] # HAVE_LIBBFD_SUPPORT libelf: [ on ] # HAVE_LIBELF_SUPPORT libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT libperl: [ on ] # HAVE_LIBPERL_SUPPORT libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT libslang: [ on ] # HAVE_SLANG_SUPPORT libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT zlib: [ on ] # HAVE_ZLIB_SUPPORT lzma: [ on ] # HAVE_LZMA_SUPPORT get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT bpf: [ on ] # HAVE_LIBBPF_SUPPORT aio: [ on ] # HAVE_AIO_SUPPORT zstd: [ on ] # HAVE_ZSTD_SUPPORT libpfm4: [ OFF ] # HAVE_LIBPFM [root@quaco ~]# perf test 1: vmlinux symtab matches kallsyms : Ok 2: Detect openat syscall event : Ok 3: Detect openat syscall event on all cpus : Ok 4: Read samples using the mmap interface : Ok 5: Test data source output : Ok 6: Parse event definition strings : Ok 7: Simple expression parser : Ok 8: PERF_RECORD_* events & perf_sample fields : Ok 9: Parse perf pmu format : Ok 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 11: DSO data read : Ok 12: DSO data cache : Ok 13: DSO data reopen : Ok 14: Roundtrip evsel->name : Ok 15: Parse sched tracepoints fields : Ok 16: syscalls:sys_enter_openat event fields : Ok 17: Setup struct perf_event_attr : Ok 18: Match and link multiple hists : Ok 19: 'import perf' in python : Ok 20: Breakpoint overflow signal handler : Ok 21: Breakpoint overflow sampling : Ok 22: Breakpoint accounting : Ok 23: Watchpoint : 23.1: Read Only Watchpoint : Skip (missing hardware support) 23.2: Write Only Watchpoint : Ok 23.3: Read / Write Watchpoint : Ok 23.4: Modify Watchpoint : Ok 24: Number of exit events of a simple workload : Ok 25: Software clock events period values : Ok 26: Object code reading : Ok 27: Sample parsing : Ok 28: Use a dummy software event to keep tracking : Ok 29: Parse with no sample_id_all bit set : Ok 30: Filter hist entries : Ok 31: Lookup mmap thread : Ok 32: Share thread maps : Ok 33: Sort output of hist entries : Ok 34: Cumulate child hist entries : Ok 35: Track with sched_switch : Ok 36: Filter fds with revents mask in a fdarray : Ok 37: Add fd to a fdarray, making it autogrow : Ok 38: kmod_path__parse : Ok 39: Thread map : Ok 40: LLVM search and compile : 40.1: Basic BPF llvm compile : Ok 40.2: kbuild searching : Ok 40.3: Compile source for BPF prologue generation : Ok 40.4: Compile source for BPF relocation : Ok 41: Session topology : Ok 42: BPF filter : 42.1: Basic BPF filtering : Ok 42.2: BPF pinning : Ok 42.3: BPF prologue generation : Ok 43: Synthesize thread map : Ok 44: Remove thread map : Ok 45: Synthesize cpu map : Ok 46: Synthesize stat config : Ok 47: Synthesize stat : Ok 48: Synthesize stat round : Ok 49: Synthesize attr update : Ok 50: Event times : Ok 51: Read backward ring buffer : Ok 52: Print cpu map : Ok 53: Merge cpu map : Ok 54: Probe SDT events : Ok 55: is_printable_array : Ok 56: Print bitmap : Ok 57: perf hooks : Ok 58: builtin clang support : 58.1: builtin clang compile C source to IR : Skip (not compiled in) 58.2: builtin clang compile C source to ELF object : Skip (not compiled in) 59: unit_number__scnprintf : Ok 60: mem2node : Ok 61: time utils : Ok 62: Test jit_write_elf : Ok 63: Test libpfm4 support : 63.1: test of individual --pfm-events : Skip (not compiled in) 63.2: test groups of --pfm-events : Skip (not compiled in) 64: Test api io : Ok 65: maps__merge_in : Ok 66: Demangle Java : Ok 67: Demangle OCaml : Ok 68: Parse and process metrics : Ok 69: PE file support : Ok 70: Event expansion for cgroups : Ok 71: Convert perf time to TSC : Ok 72: dlfilter C API : Ok 73: Sigtrap : Ok 74: x86 rdpmc : Ok 75: Test dwarf unwind : Ok 76: x86 instruction decoder - new instructions : Ok 77: Intel PT packet decoder : Ok 78: x86 bp modify : Ok 79: x86 Sample parsing : Ok 80: build id cache operations : Ok 81: daemon operations : Ok 82: perf pipe recording and injection test : Ok 83: Add vfs_getname probe to get syscall args filenames : Ok 84: probe libc's inet_pton & backtrace it with ping : Ok 85: Use vfs_getname probe to get syscall args filenames : Ok 86: Zstd perf.data compression/decompression : Ok 87: perf stat csv summary test : Ok 88: perf stat metrics (shadow stat) test : Ok 89: perf all metricgroups test : FAILED! 90: perf all metrics test : Ok 91: perf all PMU test : Ok 92: perf stat --bpf-counters test : Ok 93: Check Arm CoreSight trace data recording and synthesized samples: Skip 94: Check Arm SPE trace data recording and synthesized samples : Skip 95: Check open filename arg using perf trace + vfs_getname : Ok [root@quaco ~]# And the containers are ok so far: [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz [perfbuilder@five ~]$ time dm 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) 3 54.98 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 , clang version 3.8.1 (tags/RELEASE_381/final) 4 57.69 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 , clang version 4.0.0 (tags/RELEASE_400/final) 5 63.62 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) 6 64.52 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) 7 66.54 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) 8 91.91 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) 9 104.93 alpine:3.11 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 9.0.0 (https://git.alpinelinux.org/aports f7f0d2c2b8bcd6a5843401a9a702029556492689) (based on LLVM 9.0.0) 10 107.97 alpine:3.12 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 10.0.0 (https://gitlab.alpinelinux.org/alpine/aports.git 7445adce501f8473efdb93b17b5eaf2f1445ed4c) 11 115.98 alpine:3.13 : Ok gcc (Alpine 10.2.1_pre1) 10.2.1 20201203 , Alpine clang version 10.0.1 12 101.73 alpine:3.14 : Ok gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424 , Alpine clang version 11.1.0 13 103.35 alpine:3.15 : Ok gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027 , Alpine clang version 12.0.1 14 104.43 alpine:edge : Ok gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128 , Alpine clang version 12.0.1 15 51.06 alt:p8 : Ok x86_64-alt-linux-gcc (GCC) 5.3.1 20151207 (ALT p8 5.3.1-alt3.M80P.1) , clang version 3.8.0 (tags/RELEASE_380/final) 16 75.95 alt:p9 : Ok x86_64-alt-linux-gcc (GCC) 8.4.1 20200305 (ALT p9 8.4.1-alt0.p9.1) , clang version 10.0.0 17 75.26 alt:p10 : Ok x86_64-alt-linux-gcc (GCC) 10.3.1 20210703 (ALT Sisyphus 10.3.1-alt2) , clang version 11.0.1 18 74.85 alt:sisyphus : Ok x86_64-alt-linux-gcc (GCC) 11.2.1 20210911 (ALT Sisyphus 11.2.1-alt1) , ALT Linux Team clang version 12.0.1 19 52.87 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) , clang version 3.6.2 (tags/RELEASE_362/final) 20 85.98 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-13) , clang version 11.1.0 (Amazon Linux 2 11.1.0-1.amzn2.0.2) 21 79.77 archlinux:base : Ok gcc (GCC) 11.1.0 , clang version 13.0.0 22 83.56 centos:8 : Ok gcc (GCC) 8.4.1 20200928 (Red Hat 8.4.1-1) , clang version 11.0.1 (Red Hat 11.0.1-1.module_el8.4.0+966+2995ef20) 23 98.02 centos:stream : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-3) , clang version 12.0.1 (Red Hat 12.0.1-2.module_el8.6.0+937+1cafe22c) 24 27.67 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 11.2.1 20211228 releases/gcc-11.2.0-618-g3b2b18144c , clang version 11.1.0 25 65.92 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 , clang version 3.8.1-24 (tags/RELEASE_381/final) 26 62.20 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0 , clang version 7.0.1-8+deb10u2 (tags/RELEASE_701/final) 27: debian:11
On Mon, Jan 10, 2022 at 1:34 PM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Mon, Jan 10, 2022 at 06:23:09PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Mon, Jan 10, 2022 at 06:03:04PM -0300, Arnaldo Carvalho de Melo escreveu: > > > Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > At this point we need to remove the now unused perf_env__get_cpu(), and > > > > then deal with the fallout in the following patches that needlessly > > > > modify this unused function. > > > > > > > > Doing that now. > > > > > > Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the > > > build containers, a better start now: > > > So far so good: > > perf test ok, just that one that is failing, but before this series as > well: > > 89: perf all metricgroups test : FAILED! Could you add the verbose output? I suspect it is fixed by this: https://lore.kernel.org/lkml/20211223183948.3423989-1-irogers@google.com/ Thanks, Ian > [acme@quaco perf]$ uname -a > Linux quaco 5.15.7-200.fc35.x86_64 #1 SMP Wed Dec 8 19:00:47 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux > [acme@quaco perf]$ git log --oneline -1 > 16ed0580fb4d64bd (HEAD -> perf/core, seventh/perf/core, five/perf/core, acme.korg/tmp.perf/perf_cpu) perf cpumap: Give CPUs their own type > [acme@quaco perf]$ perf -v > perf version 5.16.g16ed0580fb4d > [acme@quaco perf]$ sudo su - > [sudo] password for acme: > [root@quaco ~]# perf -vv > perf version 5.16.g16ed0580fb4d > dwarf: [ on ] # HAVE_DWARF_SUPPORT > dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT > glibc: [ on ] # HAVE_GLIBC_SUPPORT > syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT > libbfd: [ on ] # HAVE_LIBBFD_SUPPORT > libelf: [ on ] # HAVE_LIBELF_SUPPORT > libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT > numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT > libperl: [ on ] # HAVE_LIBPERL_SUPPORT > libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT > libslang: [ on ] # HAVE_SLANG_SUPPORT > libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT > libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT > libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT > zlib: [ on ] # HAVE_ZLIB_SUPPORT > lzma: [ on ] # HAVE_LZMA_SUPPORT > get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT > bpf: [ on ] # HAVE_LIBBPF_SUPPORT > aio: [ on ] # HAVE_AIO_SUPPORT > zstd: [ on ] # HAVE_ZSTD_SUPPORT > libpfm4: [ OFF ] # HAVE_LIBPFM > [root@quaco ~]# perf test > 1: vmlinux symtab matches kallsyms : Ok > 2: Detect openat syscall event : Ok > 3: Detect openat syscall event on all cpus : Ok > 4: Read samples using the mmap interface : Ok > 5: Test data source output : Ok > 6: Parse event definition strings : Ok > 7: Simple expression parser : Ok > 8: PERF_RECORD_* events & perf_sample fields : Ok > 9: Parse perf pmu format : Ok > 10: PMU events : > 10.1: PMU event table sanity : Ok > 10.2: PMU event map aliases : Ok > 10.3: Parsing of PMU event table metrics : Ok > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > 11: DSO data read : Ok > 12: DSO data cache : Ok > 13: DSO data reopen : Ok > 14: Roundtrip evsel->name : Ok > 15: Parse sched tracepoints fields : Ok > 16: syscalls:sys_enter_openat event fields : Ok > 17: Setup struct perf_event_attr : Ok > 18: Match and link multiple hists : Ok > 19: 'import perf' in python : Ok > 20: Breakpoint overflow signal handler : Ok > 21: Breakpoint overflow sampling : Ok > 22: Breakpoint accounting : Ok > 23: Watchpoint : > 23.1: Read Only Watchpoint : Skip (missing hardware support) > 23.2: Write Only Watchpoint : Ok > 23.3: Read / Write Watchpoint : Ok > 23.4: Modify Watchpoint : Ok > 24: Number of exit events of a simple workload : Ok > 25: Software clock events period values : Ok > 26: Object code reading : Ok > 27: Sample parsing : Ok > 28: Use a dummy software event to keep tracking : Ok > 29: Parse with no sample_id_all bit set : Ok > 30: Filter hist entries : Ok > 31: Lookup mmap thread : Ok > 32: Share thread maps : Ok > 33: Sort output of hist entries : Ok > 34: Cumulate child hist entries : Ok > 35: Track with sched_switch : Ok > 36: Filter fds with revents mask in a fdarray : Ok > 37: Add fd to a fdarray, making it autogrow : Ok > 38: kmod_path__parse : Ok > 39: Thread map : Ok > 40: LLVM search and compile : > 40.1: Basic BPF llvm compile : Ok > 40.2: kbuild searching : Ok > 40.3: Compile source for BPF prologue generation : Ok > 40.4: Compile source for BPF relocation : Ok > 41: Session topology : Ok > 42: BPF filter : > 42.1: Basic BPF filtering : Ok > 42.2: BPF pinning : Ok > 42.3: BPF prologue generation : Ok > 43: Synthesize thread map : Ok > 44: Remove thread map : Ok > 45: Synthesize cpu map : Ok > 46: Synthesize stat config : Ok > 47: Synthesize stat : Ok > 48: Synthesize stat round : Ok > 49: Synthesize attr update : Ok > 50: Event times : Ok > 51: Read backward ring buffer : Ok > 52: Print cpu map : Ok > 53: Merge cpu map : Ok > 54: Probe SDT events : Ok > 55: is_printable_array : Ok > 56: Print bitmap : Ok > 57: perf hooks : Ok > 58: builtin clang support : > 58.1: builtin clang compile C source to IR : Skip (not compiled in) > 58.2: builtin clang compile C source to ELF object : Skip (not compiled in) > 59: unit_number__scnprintf : Ok > 60: mem2node : Ok > 61: time utils : Ok > 62: Test jit_write_elf : Ok > 63: Test libpfm4 support : > 63.1: test of individual --pfm-events : Skip (not compiled in) > 63.2: test groups of --pfm-events : Skip (not compiled in) > 64: Test api io : Ok > 65: maps__merge_in : Ok > 66: Demangle Java : Ok > 67: Demangle OCaml : Ok > 68: Parse and process metrics : Ok > 69: PE file support : Ok > 70: Event expansion for cgroups : Ok > 71: Convert perf time to TSC : Ok > 72: dlfilter C API : Ok > 73: Sigtrap : Ok > 74: x86 rdpmc : Ok > 75: Test dwarf unwind : Ok > 76: x86 instruction decoder - new instructions : Ok > 77: Intel PT packet decoder : Ok > 78: x86 bp modify : Ok > 79: x86 Sample parsing : Ok > 80: build id cache operations : Ok > 81: daemon operations : Ok > 82: perf pipe recording and injection test : Ok > 83: Add vfs_getname probe to get syscall args filenames : Ok > 84: probe libc's inet_pton & backtrace it with ping : Ok > 85: Use vfs_getname probe to get syscall args filenames : Ok > 86: Zstd perf.data compression/decompression : Ok > 87: perf stat csv summary test : Ok > 88: perf stat metrics (shadow stat) test : Ok > 89: perf all metricgroups test : FAILED! > 90: perf all metrics test : Ok > 91: perf all PMU test : Ok > 92: perf stat --bpf-counters test : Ok > 93: Check Arm CoreSight trace data recording and synthesized samples: Skip > 94: Check Arm SPE trace data recording and synthesized samples : Skip > 95: Check open filename arg using perf trace + vfs_getname : Ok > [root@quaco ~]# > > And the containers are ok so far: > > [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz > [perfbuilder@five ~]$ time dm > 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) > 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) > 3 54.98 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 , clang version 3.8.1 (tags/RELEASE_381/final) > 4 57.69 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 , clang version 4.0.0 (tags/RELEASE_400/final) > 5 63.62 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) > 6 64.52 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) > 7 66.54 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) > 8 91.91 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) > 9 104.93 alpine:3.11 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 9.0.0 (https://git.alpinelinux.org/aports f7f0d2c2b8bcd6a5843401a9a702029556492689) (based on LLVM 9.0.0) > 10 107.97 alpine:3.12 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 10.0.0 (https://gitlab.alpinelinux.org/alpine/aports.git 7445adce501f8473efdb93b17b5eaf2f1445ed4c) > 11 115.98 alpine:3.13 : Ok gcc (Alpine 10.2.1_pre1) 10.2.1 20201203 , Alpine clang version 10.0.1 > 12 101.73 alpine:3.14 : Ok gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424 , Alpine clang version 11.1.0 > 13 103.35 alpine:3.15 : Ok gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027 , Alpine clang version 12.0.1 > 14 104.43 alpine:edge : Ok gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128 , Alpine clang version 12.0.1 > 15 51.06 alt:p8 : Ok x86_64-alt-linux-gcc (GCC) 5.3.1 20151207 (ALT p8 5.3.1-alt3.M80P.1) , clang version 3.8.0 (tags/RELEASE_380/final) > 16 75.95 alt:p9 : Ok x86_64-alt-linux-gcc (GCC) 8.4.1 20200305 (ALT p9 8.4.1-alt0.p9.1) , clang version 10.0.0 > 17 75.26 alt:p10 : Ok x86_64-alt-linux-gcc (GCC) 10.3.1 20210703 (ALT Sisyphus 10.3.1-alt2) , clang version 11.0.1 > 18 74.85 alt:sisyphus : Ok x86_64-alt-linux-gcc (GCC) 11.2.1 20210911 (ALT Sisyphus 11.2.1-alt1) , ALT Linux Team clang version 12.0.1 > 19 52.87 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) , clang version 3.6.2 (tags/RELEASE_362/final) > 20 85.98 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-13) , clang version 11.1.0 (Amazon Linux 2 11.1.0-1.amzn2.0.2) > 21 79.77 archlinux:base : Ok gcc (GCC) 11.1.0 , clang version 13.0.0 > 22 83.56 centos:8 : Ok gcc (GCC) 8.4.1 20200928 (Red Hat 8.4.1-1) , clang version 11.0.1 (Red Hat 11.0.1-1.module_el8.4.0+966+2995ef20) > 23 98.02 centos:stream : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-3) , clang version 12.0.1 (Red Hat 12.0.1-2.module_el8.6.0+937+1cafe22c) > 24 27.67 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 11.2.1 20211228 releases/gcc-11.2.0-618-g3b2b18144c , clang version 11.1.0 > 25 65.92 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 , clang version 3.8.1-24 (tags/RELEASE_381/final) > 26 62.20 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0 , clang version 7.0.1-8+deb10u2 (tags/RELEASE_701/final) > 27: debian:11 >
Em Mon, Jan 10, 2022 at 02:29:58PM -0800, Ian Rogers escreveu: > On Mon, Jan 10, 2022 at 1:34 PM Arnaldo Carvalho de Melo > <acme@kernel.org> wrote: > > > > Em Mon, Jan 10, 2022 at 06:23:09PM -0300, Arnaldo Carvalho de Melo escreveu: > > > Em Mon, Jan 10, 2022 at 06:03:04PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > > At this point we need to remove the now unused perf_env__get_cpu(), and > > > > > then deal with the fallout in the following patches that needlessly > > > > > modify this unused function. > > > > > > > > > > Doing that now. > > > > > > > > Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the > > > > build containers, a better start now: > > > > > So far so good: > > > > perf test ok, just that one that is failing, but before this series as > > well: > > > > 89: perf all metricgroups test : FAILED! > > Could you add the verbose output? I suspect it is fixed by this: > https://lore.kernel.org/lkml/20211223183948.3423989-1-irogers@google.com/ I'll try it. BTW, here are the final tests, problems with arm 32 and 64-bit, I'll go thru them tomorrow, to fix in the cset the problem appears, so that we keep it bisectable, else you can get what I have in tmp.perf/perf_cpu, fix it and tomorrow I'll retest. 27 85.67 debian:11 : Ok gcc (Debian 10.2.1-6) 10.2.1 20210110 , Debian clang version 11.0.1-2 28 98.65 debian:experimental : Ok gcc (Debian 11.2.0-13) 11.2.0 , Debian clang version 13.0.0-9+b2 29 8.69 debian:experimental-x-arm64 : FAIL gcc version 11.2.0 (Debian 11.2.0-9) arch/arm64/util/pmu.c: In function 'pmu_events_map__find': arch/arm64/util/pmu.c:18:35: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') 18 | if (pmu->cpus->nr != cpu__max_cpu()) | ~~~~~~~~~~~~~ ^~ ~~~~~~~~~~~~~~ | | | | int struct perf_cpu make[5]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: util] Error 2 make[4]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: arm64] Error 2 make[3]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: arch] Error 2 30 19.15 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110 31 21.25 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 10.2.1-6) 10.2.1 20210110 32 22.45 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 11.2.0-9) 11.2.0 33 21.86 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) , clang version 3.5.0 (tags/RELEASE_350/final) 34 55.88 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) , clang version 3.7.0 (tags/RELEASE_370/final) 35 67.12 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) , clang version 3.8.1 (tags/RELEASE_381/final) 36 17.53 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 37 68.11 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1) , clang version 3.9.1 (tags/RELEASE_391/final) 38 80.15 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2) , clang version 4.0.1 (tags/RELEASE_401/final) 39 80.54 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6) , clang version 5.0.2 (tags/RELEASE_502/final) 40 91.48 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2) , clang version 6.0.1 (tags/RELEASE_601/final) 41 96.71 fedora:29 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2) , clang version 7.0.1 (Fedora 7.0.1-6.fc29) 42 100.71 fedora:30 : Ok gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) , clang version 8.0.0 (Fedora 8.0.0-3.fc30) 43 94.09 fedora:31 : Ok gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) , clang version 9.0.1 (Fedora 9.0.1-4.fc31) 44 87.49 fedora:32 : Ok gcc (GCC) 10.3.1 20210422 (Red Hat 10.3.1-1) , clang version 10.0.1 (Fedora 10.0.1-3.fc32) 45 85.99 fedora:33 : Ok gcc (GCC) 10.3.1 20210422 (Red Hat 10.3.1-1) , clang version 11.0.0 (Fedora 11.0.0-3.fc33) 46 88.89 fedora:34 : Ok gcc (GCC) 11.2.1 20210728 (Red Hat 11.2.1-1) , clang version 12.0.1 (Fedora 12.0.1-1.fc34) 47 19.84 fedora:34-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 48 17.93 fedora:34-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 49 91.33 fedora:35 : Ok gcc (GCC) 11.2.1 20211203 (Red Hat 11.2.1-7) , clang version 13.0.0 (Fedora 13.0.0-3.fc35) 50 99.83 fedora:rawhide : Ok gcc (GCC) 11.2.1 20211203 (Red Hat 11.2.1-7) , clang version 13.0.0 (Fedora 13.0.0-5.fc36) 51 79.16 gentoo-stage3:latest : Ok gcc (Gentoo 11.2.0 p1) 11.2.0 , clang version 13.0.0 52 68.81 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0 , clang version 3.9.1 (tags/RELEASE_391/final) 53 38.50 mageia:7 : FAIL clang version 8.0.0 (Mageia 8.0.0-1.mga7) yychar = yylex (&yylval, &yylloc, scanner); ^ #define yylex parse_events_lex ^ 1 error generated. make[3]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: util] Error 2 54 89.20 manjaro:base : Ok gcc (GCC) 11.1.0 , clang version 13.0.0 55 6.18 openmandriva:cooker : FAIL gcc version 11.2.0 20210728 (OpenMandriva) (GCC) In file included from builtin-bench.c:22: bench/bench.h:66:19: error: conflicting types for 'pthread_attr_setaffinity_np'; have 'int(pthread_attr_t *, size_t, cpu_set_t *)' {aka 'int(pthread_attr_t *, long unsigned int, cpu_set_t *)'} 66 | static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr __maybe_unused, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from bench/bench.h:64, from builtin-bench.c:22: /usr/include/pthread.h:394:12: note: previous declaration of 'pthread_attr_setaffinity_np' with type 'int(pthread_attr_t *, size_t, const cpu_set_t *)' {aka 'int(pthread_attr_t *, long unsigned int, const cpu_set_t *)'} 394 | extern int pthread_attr_setaffinity_np (pthread_attr_t *__attr, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ld: warning: -r and --gc-sections may not be used together, disabling --gc-sections ld: warning: -r and --icf may not be used together, disabling --icf ld: warning: -r and --gc-sections may not be used together, disabling --gc-sections ld: warning: -r and --icf may not be used together, disabling --icf ld: warning: -r and --gc-sections may not be used together, disabling --gc-sections ld: warning: -r and --icf may not be used together, disabling --icf 56 100.50 opensuse:15.0 : Ok gcc (SUSE Linux) 7.4.1 20190905 [gcc-7-branch revision 275407] , clang version 5.0.1 (tags/RELEASE_501/final 312548) 57 107.92 opensuse:15.1 : Ok gcc (SUSE Linux) 7.5.0 , clang version 7.0.1 (tags/RELEASE_701/final 349238) 58 102.71 opensuse:15.2 : Ok gcc (SUSE Linux) 7.5.0 , clang version 9.0.1 59 113.86 opensuse:15.3 : Ok gcc (SUSE Linux) 7.5.0 , clang version 11.0.1 60 114.75 opensuse:15.4 : Ok gcc (SUSE Linux) 7.5.0 , clang version 11.0.1 61 129.42 opensuse:tumbleweed : Ok gcc (SUSE Linux) 11.2.1 20211124 [revision 7510c23c1ec53aa4a62705f0384079661342ff7b] , clang version 13.0.0 62 94.32 oraclelinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4.0.1) , clang version 12.0.1 (Red Hat 12.0.1-4.0.1.module+el8.5.0+20428+2b4ecd47) 63 94.81 rockylinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module+el8.5.0+715+58f51d49) 64 71.11 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609 , clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final) 65 6.89 ubuntu:16.04-x-arm : FAIL gcc version 5.4.0 20160609 (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) arch/arm/util/cs-etm.c: In function 'cs_etm_set_option': arch/arm/util/cs-etm.c:206:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu(); i++) { ^ arch/arm/util/cs-etm.c:207:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (!perf_cpu_map__has(event_cpus, i) || ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c:208:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' !perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c: In function 'cs_etm_info_priv_size': arch/arm/util/cs-etm.c:525:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu(); i++) { ^ arch/arm/util/cs-etm.c:526:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (!perf_cpu_map__has(event_cpus, i) || ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c:527:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' !perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c:539:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu(); i++) { ^ arch/arm/util/cs-etm.c:540:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (!perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c: In function 'cs_etm_info_fill': arch/arm/util/cs-etm.c:725:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (perf_cpu_map__has(event_cpus, i) && ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c:726:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' !perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ arch/arm/util/cs-etm.c:746:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu() && offset < priv_size; i++) ^ arch/arm/util/cs-etm.c:747:34: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (perf_cpu_map__has(cpu_map, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^ /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed make[5]: *** [util] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm' failed make[4]: *** [arm] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed make[3]: *** [arch] Error 2 66 6.99 ubuntu:16.04-x-arm64 : FAIL gcc version 5.4.0 20160609 (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) arch/arm64/util/pmu.c: In function 'pmu_events_map__find': arch/arm64/util/pmu.c:18:21: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') if (pmu->cpus->nr != cpu__max_cpu()) ^ /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed make[5]: *** [util] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm64' failed make[4]: *** [arm64] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed make[3]: *** [arch] Error 2 67 18.54 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 68 19.04 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 69 18.93 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 70 19.04 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 71 76.32 ubuntu:18.04 : Ok gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 , clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final) 72 7.49 ubuntu:18.04-x-arm : FAIL gcc version 7.5.0 (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) arch/arm/util/cs-etm.c: In function 'cs_etm_set_option': arch/arm/util/cs-etm.c:206:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu(); i++) { ^ ~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:207:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (!perf_cpu_map__has(event_cpus, i) || ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:208:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' !perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c: In function 'cs_etm_info_priv_size': arch/arm/util/cs-etm.c:525:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu(); i++) { ^ ~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:526:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (!perf_cpu_map__has(event_cpus, i) || ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:527:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' !perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:539:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu(); i++) { ^ ~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:540:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (!perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c: In function 'cs_etm_info_fill': arch/arm/util/cs-etm.c:725:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (perf_cpu_map__has(event_cpus, i) && ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:726:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' !perf_cpu_map__has(online_cpus, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:746:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') for (i = 0; i < cpu__max_cpu() && offset < priv_size; i++) ^ ~~~~~~~~~~~~~~ arch/arm/util/cs-etm.c:747:34: error: incompatible type for argument 2 of 'perf_cpu_map__has' if (perf_cpu_map__has(cpu_map, i)) ^ In file included from arch/arm/util/../../../util/cpumap.h:8:0, from arch/arm/util/cs-etm.c:22: /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); ^~~~~~~~~~~~~~~~~ /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed make[5]: *** [util] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm' failed make[4]: *** [arm] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed make[3]: *** [arch] Error 2 73 7.49 ubuntu:18.04-x-arm64 : FAIL gcc version 7.5.0 (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) arch/arm64/util/pmu.c: In function 'pmu_events_map__find': arch/arm64/util/pmu.c:18:21: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') if (pmu->cpus->nr != cpu__max_cpu()) ~~~~~~~~~~~~~ ^~ ~~~~~~~~~~~~~~ /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed make[5]: *** [util] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm64' failed make[4]: *** [arm64] Error 2 /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed make[3]: *** [arch] Error 2 74 16.73 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 75 19.94 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 76 21.35 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 77 21.55 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 78 96.72 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 79 18.24 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 80 19.54 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 81 18.34 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 82 73.64 ubuntu:20.04 : FAIL clang version 10.0.0-4ubuntu1 83 22.06 ubuntu:20.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 84 73.74 ubuntu:20.10 : Ok gcc (Ubuntu 10.3.0-1ubuntu1~20.10) 10.3.0 , Ubuntu clang version 11.0.0-2 85 83.78 ubuntu:21.04 : Ok gcc (Ubuntu 10.3.0-1ubuntu1) 10.3.0 , Ubuntu clang version 12.0.0-3ubuntu1~21.04.2 86 86.88 ubuntu:21.10 : Ok gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0 , Ubuntu clang version 13.0.0-2 87 105.27 ubuntu:22.04 : Ok gcc (Ubuntu 11.2.0-13ubuntu1) 11.2.0 , Ubuntu clang version 13.0.0-9 BUILD_TARBALL_HEAD=16ed0580fb4d64bd59771ae7559dc307f04a0473 88 5613.66 real 95m27.836s user 1m24.038s sys 0m50.044s [perfbuilder@five ~]$ > Thanks, > Ian > > > [acme@quaco perf]$ uname -a > > Linux quaco 5.15.7-200.fc35.x86_64 #1 SMP Wed Dec 8 19:00:47 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux > > [acme@quaco perf]$ git log --oneline -1 > > 16ed0580fb4d64bd (HEAD -> perf/core, seventh/perf/core, five/perf/core, acme.korg/tmp.perf/perf_cpu) perf cpumap: Give CPUs their own type > > [acme@quaco perf]$ perf -v > > perf version 5.16.g16ed0580fb4d > > [acme@quaco perf]$ sudo su - > > [sudo] password for acme: > > [root@quaco ~]# perf -vv > > perf version 5.16.g16ed0580fb4d > > dwarf: [ on ] # HAVE_DWARF_SUPPORT > > dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT > > glibc: [ on ] # HAVE_GLIBC_SUPPORT > > syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT > > libbfd: [ on ] # HAVE_LIBBFD_SUPPORT > > libelf: [ on ] # HAVE_LIBELF_SUPPORT > > libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT > > numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT > > libperl: [ on ] # HAVE_LIBPERL_SUPPORT > > libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT > > libslang: [ on ] # HAVE_SLANG_SUPPORT > > libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT > > libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT > > libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT > > zlib: [ on ] # HAVE_ZLIB_SUPPORT > > lzma: [ on ] # HAVE_LZMA_SUPPORT > > get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT > > bpf: [ on ] # HAVE_LIBBPF_SUPPORT > > aio: [ on ] # HAVE_AIO_SUPPORT > > zstd: [ on ] # HAVE_ZSTD_SUPPORT > > libpfm4: [ OFF ] # HAVE_LIBPFM > > [root@quaco ~]# perf test > > 1: vmlinux symtab matches kallsyms : Ok > > 2: Detect openat syscall event : Ok > > 3: Detect openat syscall event on all cpus : Ok > > 4: Read samples using the mmap interface : Ok > > 5: Test data source output : Ok > > 6: Parse event definition strings : Ok > > 7: Simple expression parser : Ok > > 8: PERF_RECORD_* events & perf_sample fields : Ok > > 9: Parse perf pmu format : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > 11: DSO data read : Ok > > 12: DSO data cache : Ok > > 13: DSO data reopen : Ok > > 14: Roundtrip evsel->name : Ok > > 15: Parse sched tracepoints fields : Ok > > 16: syscalls:sys_enter_openat event fields : Ok > > 17: Setup struct perf_event_attr : Ok > > 18: Match and link multiple hists : Ok > > 19: 'import perf' in python : Ok > > 20: Breakpoint overflow signal handler : Ok > > 21: Breakpoint overflow sampling : Ok > > 22: Breakpoint accounting : Ok > > 23: Watchpoint : > > 23.1: Read Only Watchpoint : Skip (missing hardware support) > > 23.2: Write Only Watchpoint : Ok > > 23.3: Read / Write Watchpoint : Ok > > 23.4: Modify Watchpoint : Ok > > 24: Number of exit events of a simple workload : Ok > > 25: Software clock events period values : Ok > > 26: Object code reading : Ok > > 27: Sample parsing : Ok > > 28: Use a dummy software event to keep tracking : Ok > > 29: Parse with no sample_id_all bit set : Ok > > 30: Filter hist entries : Ok > > 31: Lookup mmap thread : Ok > > 32: Share thread maps : Ok > > 33: Sort output of hist entries : Ok > > 34: Cumulate child hist entries : Ok > > 35: Track with sched_switch : Ok > > 36: Filter fds with revents mask in a fdarray : Ok > > 37: Add fd to a fdarray, making it autogrow : Ok > > 38: kmod_path__parse : Ok > > 39: Thread map : Ok > > 40: LLVM search and compile : > > 40.1: Basic BPF llvm compile : Ok > > 40.2: kbuild searching : Ok > > 40.3: Compile source for BPF prologue generation : Ok > > 40.4: Compile source for BPF relocation : Ok > > 41: Session topology : Ok > > 42: BPF filter : > > 42.1: Basic BPF filtering : Ok > > 42.2: BPF pinning : Ok > > 42.3: BPF prologue generation : Ok > > 43: Synthesize thread map : Ok > > 44: Remove thread map : Ok > > 45: Synthesize cpu map : Ok > > 46: Synthesize stat config : Ok > > 47: Synthesize stat : Ok > > 48: Synthesize stat round : Ok > > 49: Synthesize attr update : Ok > > 50: Event times : Ok > > 51: Read backward ring buffer : Ok > > 52: Print cpu map : Ok > > 53: Merge cpu map : Ok > > 54: Probe SDT events : Ok > > 55: is_printable_array : Ok > > 56: Print bitmap : Ok > > 57: perf hooks : Ok > > 58: builtin clang support : > > 58.1: builtin clang compile C source to IR : Skip (not compiled in) > > 58.2: builtin clang compile C source to ELF object : Skip (not compiled in) > > 59: unit_number__scnprintf : Ok > > 60: mem2node : Ok > > 61: time utils : Ok > > 62: Test jit_write_elf : Ok > > 63: Test libpfm4 support : > > 63.1: test of individual --pfm-events : Skip (not compiled in) > > 63.2: test groups of --pfm-events : Skip (not compiled in) > > 64: Test api io : Ok > > 65: maps__merge_in : Ok > > 66: Demangle Java : Ok > > 67: Demangle OCaml : Ok > > 68: Parse and process metrics : Ok > > 69: PE file support : Ok > > 70: Event expansion for cgroups : Ok > > 71: Convert perf time to TSC : Ok > > 72: dlfilter C API : Ok > > 73: Sigtrap : Ok > > 74: x86 rdpmc : Ok > > 75: Test dwarf unwind : Ok > > 76: x86 instruction decoder - new instructions : Ok > > 77: Intel PT packet decoder : Ok > > 78: x86 bp modify : Ok > > 79: x86 Sample parsing : Ok > > 80: build id cache operations : Ok > > 81: daemon operations : Ok > > 82: perf pipe recording and injection test : Ok > > 83: Add vfs_getname probe to get syscall args filenames : Ok > > 84: probe libc's inet_pton & backtrace it with ping : Ok > > 85: Use vfs_getname probe to get syscall args filenames : Ok > > 86: Zstd perf.data compression/decompression : Ok > > 87: perf stat csv summary test : Ok > > 88: perf stat metrics (shadow stat) test : Ok > > 89: perf all metricgroups test : FAILED! > > 90: perf all metrics test : Ok > > 91: perf all PMU test : Ok > > 92: perf stat --bpf-counters test : Ok > > 93: Check Arm CoreSight trace data recording and synthesized samples: Skip > > 94: Check Arm SPE trace data recording and synthesized samples : Skip > > 95: Check open filename arg using perf trace + vfs_getname : Ok > > [root@quaco ~]# > > > > And the containers are ok so far: > > > > [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz > > [perfbuilder@five ~]$ time dm > > 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) > > 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) > > 3 54.98 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 , clang version 3.8.1 (tags/RELEASE_381/final) > > 4 57.69 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 , clang version 4.0.0 (tags/RELEASE_400/final) > > 5 63.62 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) > > 6 64.52 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) > > 7 66.54 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) > > 8 91.91 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) > > 9 104.93 alpine:3.11 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 9.0.0 (https://git.alpinelinux.org/aports f7f0d2c2b8bcd6a5843401a9a702029556492689) (based on LLVM 9.0.0) > > 10 107.97 alpine:3.12 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 10.0.0 (https://gitlab.alpinelinux.org/alpine/aports.git 7445adce501f8473efdb93b17b5eaf2f1445ed4c) > > 11 115.98 alpine:3.13 : Ok gcc (Alpine 10.2.1_pre1) 10.2.1 20201203 , Alpine clang version 10.0.1 > > 12 101.73 alpine:3.14 : Ok gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424 , Alpine clang version 11.1.0 > > 13 103.35 alpine:3.15 : Ok gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027 , Alpine clang version 12.0.1 > > 14 104.43 alpine:edge : Ok gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128 , Alpine clang version 12.0.1 > > 15 51.06 alt:p8 : Ok x86_64-alt-linux-gcc (GCC) 5.3.1 20151207 (ALT p8 5.3.1-alt3.M80P.1) , clang version 3.8.0 (tags/RELEASE_380/final) > > 16 75.95 alt:p9 : Ok x86_64-alt-linux-gcc (GCC) 8.4.1 20200305 (ALT p9 8.4.1-alt0.p9.1) , clang version 10.0.0 > > 17 75.26 alt:p10 : Ok x86_64-alt-linux-gcc (GCC) 10.3.1 20210703 (ALT Sisyphus 10.3.1-alt2) , clang version 11.0.1 > > 18 74.85 alt:sisyphus : Ok x86_64-alt-linux-gcc (GCC) 11.2.1 20210911 (ALT Sisyphus 11.2.1-alt1) , ALT Linux Team clang version 12.0.1 > > 19 52.87 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) , clang version 3.6.2 (tags/RELEASE_362/final) > > 20 85.98 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-13) , clang version 11.1.0 (Amazon Linux 2 11.1.0-1.amzn2.0.2) > > 21 79.77 archlinux:base : Ok gcc (GCC) 11.1.0 , clang version 13.0.0 > > 22 83.56 centos:8 : Ok gcc (GCC) 8.4.1 20200928 (Red Hat 8.4.1-1) , clang version 11.0.1 (Red Hat 11.0.1-1.module_el8.4.0+966+2995ef20) > > 23 98.02 centos:stream : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-3) , clang version 12.0.1 (Red Hat 12.0.1-2.module_el8.6.0+937+1cafe22c) > > 24 27.67 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 11.2.1 20211228 releases/gcc-11.2.0-618-g3b2b18144c , clang version 11.1.0 > > 25 65.92 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 , clang version 3.8.1-24 (tags/RELEASE_381/final) > > 26 62.20 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0 , clang version 7.0.1-8+deb10u2 (tags/RELEASE_701/final) > > 27: debian:11 > >
Em Mon, Jan 10, 2022 at 09:41:12PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Jan 10, 2022 at 02:29:58PM -0800, Ian Rogers escreveu: > > On Mon, Jan 10, 2022 at 1:34 PM Arnaldo Carvalho de Melo > > <acme@kernel.org> wrote: > > > > > > Em Mon, Jan 10, 2022 at 06:23:09PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > Em Mon, Jan 10, 2022 at 06:03:04PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > > Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > > > At this point we need to remove the now unused perf_env__get_cpu(), and > > > > > > then deal with the fallout in the following patches that needlessly > > > > > > modify this unused function. > > > > > > > > > > > > Doing that now. > > > > > > > > > > Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the > > > > > build containers, a better start now: > > > > > > > So far so good: > > > > > > perf test ok, just that one that is failing, but before this series as > > > well: > > > > > > 89: perf all metricgroups test : FAILED! > > > > Could you add the verbose output? I suspect it is fixed by this: > > https://lore.kernel.org/lkml/20211223183948.3423989-1-irogers@google.com/ > > I'll try it. Yeah, stops failing, will review and apply tomorrow. 80: build id cache operations : Ok 81: daemon operations : Ok 82: perf pipe recording and injection test : Ok 83: Add vfs_getname probe to get syscall args filenames : Ok 84: probe libc's inet_pton & backtrace it with ping : Ok 85: Use vfs_getname probe to get syscall args filenames : Ok 86: Zstd perf.data compression/decompression : Ok 87: perf stat csv summary test : Ok 88: perf stat metrics (shadow stat) test : Ok 89: perf all metricgroups test : Ok 90: perf all metrics test : Ok 91: perf all PMU test : Ok 92: perf stat --bpf-counters test : Ok 93: Check Arm CoreSight trace data recording and synthesized samples: Skip 94: Check Arm SPE trace data recording and synthesized samples : Skip 95: Check open filename arg using perf trace + vfs_getname : Ok [root@quaco ~]# > BTW, here are the final tests, problems with arm 32 and 64-bit, I'll go thru > them tomorrow, to fix in the cset the problem appears, so that we keep it > bisectable, else you can get what I have in tmp.perf/perf_cpu, fix it and > tomorrow I'll retest. > > 27 85.67 debian:11 : Ok gcc (Debian 10.2.1-6) 10.2.1 20210110 , Debian clang version 11.0.1-2 > 28 98.65 debian:experimental : Ok gcc (Debian 11.2.0-13) 11.2.0 , Debian clang version 13.0.0-9+b2 > 29 8.69 debian:experimental-x-arm64 : FAIL gcc version 11.2.0 (Debian 11.2.0-9) > arch/arm64/util/pmu.c: In function 'pmu_events_map__find': > arch/arm64/util/pmu.c:18:35: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') > 18 | if (pmu->cpus->nr != cpu__max_cpu()) > | ~~~~~~~~~~~~~ ^~ ~~~~~~~~~~~~~~ > | | | > | int struct perf_cpu > make[5]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: util] Error 2 > make[4]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: arm64] Error 2 > make[3]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: arch] Error 2 > 30 19.15 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110 > 31 21.25 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 10.2.1-6) 10.2.1 20210110 > 32 22.45 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 11.2.0-9) 11.2.0 > 33 21.86 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) , clang version 3.5.0 (tags/RELEASE_350/final) > 34 55.88 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) , clang version 3.7.0 (tags/RELEASE_370/final) > 35 67.12 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) , clang version 3.8.1 (tags/RELEASE_381/final) > 36 17.53 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 > 37 68.11 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1) , clang version 3.9.1 (tags/RELEASE_391/final) > 38 80.15 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2) , clang version 4.0.1 (tags/RELEASE_401/final) > 39 80.54 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6) , clang version 5.0.2 (tags/RELEASE_502/final) > 40 91.48 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2) , clang version 6.0.1 (tags/RELEASE_601/final) > 41 96.71 fedora:29 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2) , clang version 7.0.1 (Fedora 7.0.1-6.fc29) > 42 100.71 fedora:30 : Ok gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) , clang version 8.0.0 (Fedora 8.0.0-3.fc30) > 43 94.09 fedora:31 : Ok gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) , clang version 9.0.1 (Fedora 9.0.1-4.fc31) > 44 87.49 fedora:32 : Ok gcc (GCC) 10.3.1 20210422 (Red Hat 10.3.1-1) , clang version 10.0.1 (Fedora 10.0.1-3.fc32) > 45 85.99 fedora:33 : Ok gcc (GCC) 10.3.1 20210422 (Red Hat 10.3.1-1) , clang version 11.0.0 (Fedora 11.0.0-3.fc33) > 46 88.89 fedora:34 : Ok gcc (GCC) 11.2.1 20210728 (Red Hat 11.2.1-1) , clang version 12.0.1 (Fedora 12.0.1-1.fc34) > 47 19.84 fedora:34-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 > 48 17.93 fedora:34-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 > 49 91.33 fedora:35 : Ok gcc (GCC) 11.2.1 20211203 (Red Hat 11.2.1-7) , clang version 13.0.0 (Fedora 13.0.0-3.fc35) > 50 99.83 fedora:rawhide : Ok gcc (GCC) 11.2.1 20211203 (Red Hat 11.2.1-7) , clang version 13.0.0 (Fedora 13.0.0-5.fc36) > 51 79.16 gentoo-stage3:latest : Ok gcc (Gentoo 11.2.0 p1) 11.2.0 , clang version 13.0.0 > 52 68.81 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0 , clang version 3.9.1 (tags/RELEASE_391/final) > 53 38.50 mageia:7 : FAIL clang version 8.0.0 (Mageia 8.0.0-1.mga7) > yychar = yylex (&yylval, &yylloc, scanner); > ^ > #define yylex parse_events_lex > ^ > 1 error generated. > make[3]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: util] Error 2 > 54 89.20 manjaro:base : Ok gcc (GCC) 11.1.0 , clang version 13.0.0 > 55 6.18 openmandriva:cooker : FAIL gcc version 11.2.0 20210728 (OpenMandriva) (GCC) > In file included from builtin-bench.c:22: > bench/bench.h:66:19: error: conflicting types for 'pthread_attr_setaffinity_np'; have 'int(pthread_attr_t *, size_t, cpu_set_t *)' {aka 'int(pthread_attr_t *, long unsigned int, cpu_set_t *)'} > 66 | static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr __maybe_unused, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from bench/bench.h:64, > from builtin-bench.c:22: > /usr/include/pthread.h:394:12: note: previous declaration of 'pthread_attr_setaffinity_np' with type 'int(pthread_attr_t *, size_t, const cpu_set_t *)' {aka 'int(pthread_attr_t *, long unsigned int, const cpu_set_t *)'} > 394 | extern int pthread_attr_setaffinity_np (pthread_attr_t *__attr, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > ld: warning: -r and --gc-sections may not be used together, disabling --gc-sections > ld: warning: -r and --icf may not be used together, disabling --icf > ld: warning: -r and --gc-sections may not be used together, disabling --gc-sections > ld: warning: -r and --icf may not be used together, disabling --icf > ld: warning: -r and --gc-sections may not be used together, disabling --gc-sections > ld: warning: -r and --icf may not be used together, disabling --icf > 56 100.50 opensuse:15.0 : Ok gcc (SUSE Linux) 7.4.1 20190905 [gcc-7-branch revision 275407] , clang version 5.0.1 (tags/RELEASE_501/final 312548) > 57 107.92 opensuse:15.1 : Ok gcc (SUSE Linux) 7.5.0 , clang version 7.0.1 (tags/RELEASE_701/final 349238) > 58 102.71 opensuse:15.2 : Ok gcc (SUSE Linux) 7.5.0 , clang version 9.0.1 > 59 113.86 opensuse:15.3 : Ok gcc (SUSE Linux) 7.5.0 , clang version 11.0.1 > 60 114.75 opensuse:15.4 : Ok gcc (SUSE Linux) 7.5.0 , clang version 11.0.1 > 61 129.42 opensuse:tumbleweed : Ok gcc (SUSE Linux) 11.2.1 20211124 [revision 7510c23c1ec53aa4a62705f0384079661342ff7b] , clang version 13.0.0 > 62 94.32 oraclelinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4.0.1) , clang version 12.0.1 (Red Hat 12.0.1-4.0.1.module+el8.5.0+20428+2b4ecd47) > 63 94.81 rockylinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module+el8.5.0+715+58f51d49) > 64 71.11 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609 , clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final) > 65 6.89 ubuntu:16.04-x-arm : FAIL gcc version 5.4.0 20160609 (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) > arch/arm/util/cs-etm.c: In function 'cs_etm_set_option': > arch/arm/util/cs-etm.c:206:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu(); i++) { > ^ > arch/arm/util/cs-etm.c:207:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (!perf_cpu_map__has(event_cpus, i) || > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c:208:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' > !perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c: In function 'cs_etm_info_priv_size': > arch/arm/util/cs-etm.c:525:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu(); i++) { > ^ > arch/arm/util/cs-etm.c:526:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (!perf_cpu_map__has(event_cpus, i) || > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c:527:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' > !perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c:539:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu(); i++) { > ^ > arch/arm/util/cs-etm.c:540:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (!perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c: In function 'cs_etm_info_fill': > arch/arm/util/cs-etm.c:725:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (perf_cpu_map__has(event_cpus, i) && > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c:726:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' > !perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > arch/arm/util/cs-etm.c:746:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu() && offset < priv_size; i++) > ^ > arch/arm/util/cs-etm.c:747:34: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (perf_cpu_map__has(cpu_map, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^ > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed > make[5]: *** [util] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm' failed > make[4]: *** [arm] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed > make[3]: *** [arch] Error 2 > 66 6.99 ubuntu:16.04-x-arm64 : FAIL gcc version 5.4.0 20160609 (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) > arch/arm64/util/pmu.c: In function 'pmu_events_map__find': > arch/arm64/util/pmu.c:18:21: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') > if (pmu->cpus->nr != cpu__max_cpu()) > ^ > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed > make[5]: *** [util] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm64' failed > make[4]: *** [arm64] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed > make[3]: *** [arch] Error 2 > 67 18.54 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 68 19.04 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 69 18.93 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 70 19.04 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 71 76.32 ubuntu:18.04 : Ok gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 , clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final) > 72 7.49 ubuntu:18.04-x-arm : FAIL gcc version 7.5.0 (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) > arch/arm/util/cs-etm.c: In function 'cs_etm_set_option': > arch/arm/util/cs-etm.c:206:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu(); i++) { > ^ ~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:207:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (!perf_cpu_map__has(event_cpus, i) || > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:208:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' > !perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c: In function 'cs_etm_info_priv_size': > arch/arm/util/cs-etm.c:525:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu(); i++) { > ^ ~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:526:39: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (!perf_cpu_map__has(event_cpus, i) || > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:527:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' > !perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:539:17: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu(); i++) { > ^ ~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:540:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (!perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c: In function 'cs_etm_info_fill': > arch/arm/util/cs-etm.c:725:38: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (perf_cpu_map__has(event_cpus, i) && > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:726:40: error: incompatible type for argument 2 of 'perf_cpu_map__has' > !perf_cpu_map__has(online_cpus, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:746:16: error: invalid operands to binary < (have 'int' and 'struct perf_cpu') > for (i = 0; i < cpu__max_cpu() && offset < priv_size; i++) > ^ ~~~~~~~~~~~~~~ > arch/arm/util/cs-etm.c:747:34: error: incompatible type for argument 2 of 'perf_cpu_map__has' > if (perf_cpu_map__has(cpu_map, i)) > ^ > In file included from arch/arm/util/../../../util/cpumap.h:8:0, > from arch/arm/util/cs-etm.c:22: > /git/perf-5.16.0/tools/lib/perf/include/perf/cpumap.h:22:18: note: expected 'struct perf_cpu' but argument is of type 'int' > LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, struct perf_cpu cpu); > ^~~~~~~~~~~~~~~~~ > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed > make[5]: *** [util] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm' failed > make[4]: *** [arm] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed > make[3]: *** [arch] Error 2 > 73 7.49 ubuntu:18.04-x-arm64 : FAIL gcc version 7.5.0 (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) > arch/arm64/util/pmu.c: In function 'pmu_events_map__find': > arch/arm64/util/pmu.c:18:21: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') > if (pmu->cpus->nr != cpu__max_cpu()) > ~~~~~~~~~~~~~ ^~ ~~~~~~~~~~~~~~ > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'util' failed > make[5]: *** [util] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arm64' failed > make[4]: *** [arm64] Error 2 > /git/perf-5.16.0/tools/build/Makefile.build:139: recipe for target 'arch' failed > make[3]: *** [arch] Error 2 > 74 16.73 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 75 19.94 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 76 21.35 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 77 21.55 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 78 96.72 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 79 18.24 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 80 19.54 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 81 18.34 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0 > 82 73.64 ubuntu:20.04 : FAIL clang version 10.0.0-4ubuntu1 > > 83 22.06 ubuntu:20.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 > 84 73.74 ubuntu:20.10 : Ok gcc (Ubuntu 10.3.0-1ubuntu1~20.10) 10.3.0 , Ubuntu clang version 11.0.0-2 > 85 83.78 ubuntu:21.04 : Ok gcc (Ubuntu 10.3.0-1ubuntu1) 10.3.0 , Ubuntu clang version 12.0.0-3ubuntu1~21.04.2 > 86 86.88 ubuntu:21.10 : Ok gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0 , Ubuntu clang version 13.0.0-2 > 87 105.27 ubuntu:22.04 : Ok gcc (Ubuntu 11.2.0-13ubuntu1) 11.2.0 , Ubuntu clang version 13.0.0-9 > BUILD_TARBALL_HEAD=16ed0580fb4d64bd59771ae7559dc307f04a0473 > 88 5613.66 > > real 95m27.836s > user 1m24.038s > sys 0m50.044s > [perfbuilder@five ~]$ > > > > Thanks, > > Ian > > > > > [acme@quaco perf]$ uname -a > > > Linux quaco 5.15.7-200.fc35.x86_64 #1 SMP Wed Dec 8 19:00:47 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux > > > [acme@quaco perf]$ git log --oneline -1 > > > 16ed0580fb4d64bd (HEAD -> perf/core, seventh/perf/core, five/perf/core, acme.korg/tmp.perf/perf_cpu) perf cpumap: Give CPUs their own type > > > [acme@quaco perf]$ perf -v > > > perf version 5.16.g16ed0580fb4d > > > [acme@quaco perf]$ sudo su - > > > [sudo] password for acme: > > > [root@quaco ~]# perf -vv > > > perf version 5.16.g16ed0580fb4d > > > dwarf: [ on ] # HAVE_DWARF_SUPPORT > > > dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT > > > glibc: [ on ] # HAVE_GLIBC_SUPPORT > > > syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT > > > libbfd: [ on ] # HAVE_LIBBFD_SUPPORT > > > libelf: [ on ] # HAVE_LIBELF_SUPPORT > > > libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT > > > numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT > > > libperl: [ on ] # HAVE_LIBPERL_SUPPORT > > > libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT > > > libslang: [ on ] # HAVE_SLANG_SUPPORT > > > libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT > > > libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT > > > libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT > > > zlib: [ on ] # HAVE_ZLIB_SUPPORT > > > lzma: [ on ] # HAVE_LZMA_SUPPORT > > > get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT > > > bpf: [ on ] # HAVE_LIBBPF_SUPPORT > > > aio: [ on ] # HAVE_AIO_SUPPORT > > > zstd: [ on ] # HAVE_ZSTD_SUPPORT > > > libpfm4: [ OFF ] # HAVE_LIBPFM > > > [root@quaco ~]# perf test > > > 1: vmlinux symtab matches kallsyms : Ok > > > 2: Detect openat syscall event : Ok > > > 3: Detect openat syscall event on all cpus : Ok > > > 4: Read samples using the mmap interface : Ok > > > 5: Test data source output : Ok > > > 6: Parse event definition strings : Ok > > > 7: Simple expression parser : Ok > > > 8: PERF_RECORD_* events & perf_sample fields : Ok > > > 9: Parse perf pmu format : Ok > > > 10: PMU events : > > > 10.1: PMU event table sanity : Ok > > > 10.2: PMU event map aliases : Ok > > > 10.3: Parsing of PMU event table metrics : Ok > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > 11: DSO data read : Ok > > > 12: DSO data cache : Ok > > > 13: DSO data reopen : Ok > > > 14: Roundtrip evsel->name : Ok > > > 15: Parse sched tracepoints fields : Ok > > > 16: syscalls:sys_enter_openat event fields : Ok > > > 17: Setup struct perf_event_attr : Ok > > > 18: Match and link multiple hists : Ok > > > 19: 'import perf' in python : Ok > > > 20: Breakpoint overflow signal handler : Ok > > > 21: Breakpoint overflow sampling : Ok > > > 22: Breakpoint accounting : Ok > > > 23: Watchpoint : > > > 23.1: Read Only Watchpoint : Skip (missing hardware support) > > > 23.2: Write Only Watchpoint : Ok > > > 23.3: Read / Write Watchpoint : Ok > > > 23.4: Modify Watchpoint : Ok > > > 24: Number of exit events of a simple workload : Ok > > > 25: Software clock events period values : Ok > > > 26: Object code reading : Ok > > > 27: Sample parsing : Ok > > > 28: Use a dummy software event to keep tracking : Ok > > > 29: Parse with no sample_id_all bit set : Ok > > > 30: Filter hist entries : Ok > > > 31: Lookup mmap thread : Ok > > > 32: Share thread maps : Ok > > > 33: Sort output of hist entries : Ok > > > 34: Cumulate child hist entries : Ok > > > 35: Track with sched_switch : Ok > > > 36: Filter fds with revents mask in a fdarray : Ok > > > 37: Add fd to a fdarray, making it autogrow : Ok > > > 38: kmod_path__parse : Ok > > > 39: Thread map : Ok > > > 40: LLVM search and compile : > > > 40.1: Basic BPF llvm compile : Ok > > > 40.2: kbuild searching : Ok > > > 40.3: Compile source for BPF prologue generation : Ok > > > 40.4: Compile source for BPF relocation : Ok > > > 41: Session topology : Ok > > > 42: BPF filter : > > > 42.1: Basic BPF filtering : Ok > > > 42.2: BPF pinning : Ok > > > 42.3: BPF prologue generation : Ok > > > 43: Synthesize thread map : Ok > > > 44: Remove thread map : Ok > > > 45: Synthesize cpu map : Ok > > > 46: Synthesize stat config : Ok > > > 47: Synthesize stat : Ok > > > 48: Synthesize stat round : Ok > > > 49: Synthesize attr update : Ok > > > 50: Event times : Ok > > > 51: Read backward ring buffer : Ok > > > 52: Print cpu map : Ok > > > 53: Merge cpu map : Ok > > > 54: Probe SDT events : Ok > > > 55: is_printable_array : Ok > > > 56: Print bitmap : Ok > > > 57: perf hooks : Ok > > > 58: builtin clang support : > > > 58.1: builtin clang compile C source to IR : Skip (not compiled in) > > > 58.2: builtin clang compile C source to ELF object : Skip (not compiled in) > > > 59: unit_number__scnprintf : Ok > > > 60: mem2node : Ok > > > 61: time utils : Ok > > > 62: Test jit_write_elf : Ok > > > 63: Test libpfm4 support : > > > 63.1: test of individual --pfm-events : Skip (not compiled in) > > > 63.2: test groups of --pfm-events : Skip (not compiled in) > > > 64: Test api io : Ok > > > 65: maps__merge_in : Ok > > > 66: Demangle Java : Ok > > > 67: Demangle OCaml : Ok > > > 68: Parse and process metrics : Ok > > > 69: PE file support : Ok > > > 70: Event expansion for cgroups : Ok > > > 71: Convert perf time to TSC : Ok > > > 72: dlfilter C API : Ok > > > 73: Sigtrap : Ok > > > 74: x86 rdpmc : Ok > > > 75: Test dwarf unwind : Ok > > > 76: x86 instruction decoder - new instructions : Ok > > > 77: Intel PT packet decoder : Ok > > > 78: x86 bp modify : Ok > > > 79: x86 Sample parsing : Ok > > > 80: build id cache operations : Ok > > > 81: daemon operations : Ok > > > 82: perf pipe recording and injection test : Ok > > > 83: Add vfs_getname probe to get syscall args filenames : Ok > > > 84: probe libc's inet_pton & backtrace it with ping : Ok > > > 85: Use vfs_getname probe to get syscall args filenames : Ok > > > 86: Zstd perf.data compression/decompression : Ok > > > 87: perf stat csv summary test : Ok > > > 88: perf stat metrics (shadow stat) test : Ok > > > 89: perf all metricgroups test : FAILED! > > > 90: perf all metrics test : Ok > > > 91: perf all PMU test : Ok > > > 92: perf stat --bpf-counters test : Ok > > > 93: Check Arm CoreSight trace data recording and synthesized samples: Skip > > > 94: Check Arm SPE trace data recording and synthesized samples : Skip > > > 95: Check open filename arg using perf trace + vfs_getname : Ok > > > [root@quaco ~]# > > > > > > And the containers are ok so far: > > > > > > [perfbuilder@five ~]$ export BUILD_TARBALL=http://192.168.100.2/perf/perf-5.16.0.tar.xz > > > [perfbuilder@five ~]$ time dm > > > 1 95.61 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-4) , clang version 12.0.1 (Red Hat 12.0.1-4.module_el8.5.0+1025+93159d6c) > > > 2 56.18 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 , clang version 3.8.0 (tags/RELEASE_380/final) > > > 3 54.98 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 , clang version 3.8.1 (tags/RELEASE_381/final) > > > 4 57.69 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 , clang version 4.0.0 (tags/RELEASE_400/final) > > > 5 63.62 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) > > > 6 64.52 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0 , Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) > > > 7 66.54 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) > > > 8 91.91 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0 , Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) > > > 9 104.93 alpine:3.11 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 9.0.0 (https://git.alpinelinux.org/aports f7f0d2c2b8bcd6a5843401a9a702029556492689) (based on LLVM 9.0.0) > > > 10 107.97 alpine:3.12 : Ok gcc (Alpine 9.3.0) 9.3.0 , Alpine clang version 10.0.0 (https://gitlab.alpinelinux.org/alpine/aports.git 7445adce501f8473efdb93b17b5eaf2f1445ed4c) > > > 11 115.98 alpine:3.13 : Ok gcc (Alpine 10.2.1_pre1) 10.2.1 20201203 , Alpine clang version 10.0.1 > > > 12 101.73 alpine:3.14 : Ok gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424 , Alpine clang version 11.1.0 > > > 13 103.35 alpine:3.15 : Ok gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027 , Alpine clang version 12.0.1 > > > 14 104.43 alpine:edge : Ok gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128 , Alpine clang version 12.0.1 > > > 15 51.06 alt:p8 : Ok x86_64-alt-linux-gcc (GCC) 5.3.1 20151207 (ALT p8 5.3.1-alt3.M80P.1) , clang version 3.8.0 (tags/RELEASE_380/final) > > > 16 75.95 alt:p9 : Ok x86_64-alt-linux-gcc (GCC) 8.4.1 20200305 (ALT p9 8.4.1-alt0.p9.1) , clang version 10.0.0 > > > 17 75.26 alt:p10 : Ok x86_64-alt-linux-gcc (GCC) 10.3.1 20210703 (ALT Sisyphus 10.3.1-alt2) , clang version 11.0.1 > > > 18 74.85 alt:sisyphus : Ok x86_64-alt-linux-gcc (GCC) 11.2.1 20210911 (ALT Sisyphus 11.2.1-alt1) , ALT Linux Team clang version 12.0.1 > > > 19 52.87 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) , clang version 3.6.2 (tags/RELEASE_362/final) > > > 20 85.98 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-13) , clang version 11.1.0 (Amazon Linux 2 11.1.0-1.amzn2.0.2) > > > 21 79.77 archlinux:base : Ok gcc (GCC) 11.1.0 , clang version 13.0.0 > > > 22 83.56 centos:8 : Ok gcc (GCC) 8.4.1 20200928 (Red Hat 8.4.1-1) , clang version 11.0.1 (Red Hat 11.0.1-1.module_el8.4.0+966+2995ef20) > > > 23 98.02 centos:stream : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-3) , clang version 12.0.1 (Red Hat 12.0.1-2.module_el8.6.0+937+1cafe22c) > > > 24 27.67 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 11.2.1 20211228 releases/gcc-11.2.0-618-g3b2b18144c , clang version 11.1.0 > > > 25 65.92 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 , clang version 3.8.1-24 (tags/RELEASE_381/final) > > > 26 62.20 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0 , clang version 7.0.1-8+deb10u2 (tags/RELEASE_701/final) > > > 27: debian:11 > > > > > -- > > - Arnaldo
Em Mon, Jan 10, 2022 at 09:41:12PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Jan 10, 2022 at 02:29:58PM -0800, Ian Rogers escreveu: > > On Mon, Jan 10, 2022 at 1:34 PM Arnaldo Carvalho de Melo > > <acme@kernel.org> wrote: > > > > > > Em Mon, Jan 10, 2022 at 06:23:09PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > Em Mon, Jan 10, 2022 at 06:03:04PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > > Em Mon, Jan 10, 2022 at 05:46:52PM -0300, Arnaldo Carvalho de Melo escreveu: > > > > > > At this point we need to remove the now unused perf_env__get_cpu(), and > > > > > > then deal with the fallout in the following patches that needlessly > > > > > > modify this unused function. > > > > > > > > > > > > Doing that now. > > > > > > > > > > Done, force pushed to tmp.perf/perf_cpu, now it is going again thru the > > > > > build containers, a better start now: > > > > > > > So far so good: > > > > > > perf test ok, just that one that is failing, but before this series as > > > well: > > > > > > 89: perf all metricgroups test : FAILED! > > > > Could you add the verbose output? I suspect it is fixed by this: > > https://lore.kernel.org/lkml/20211223183948.3423989-1-irogers@google.com/ > > I'll try it. > > BTW, here are the final tests, problems with arm 32 and 64-bit, I'll go thru > them tomorrow, to fix in the cset the problem appears, so that we keep it > bisectable, else you can get what I have in tmp.perf/perf_cpu, fix it and > tomorrow I'll retest. > > 27 85.67 debian:11 : Ok gcc (Debian 10.2.1-6) 10.2.1 20210110 , Debian clang version 11.0.1-2 > 28 98.65 debian:experimental : Ok gcc (Debian 11.2.0-13) 11.2.0 , Debian clang version 13.0.0-9+b2 > 29 8.69 debian:experimental-x-arm64 : FAIL gcc version 11.2.0 (Debian 11.2.0-9) > arch/arm64/util/pmu.c: In function 'pmu_events_map__find': > arch/arm64/util/pmu.c:18:35: error: invalid operands to binary != (have 'int' and 'struct perf_cpu') > 18 | if (pmu->cpus->nr != cpu__max_cpu()) > | ~~~~~~~~~~~~~ ^~ ~~~~~~~~~~~~~~ > | | | > | int struct perf_cpu > make[5]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: util] Error 2 > make[4]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: arm64] Error 2 > make[3]: *** [/git/perf-5.16.0/tools/build/Makefile.build:139: arch] Error 2 > 30 19.15 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110 Fixed with the patch below squashed into 48/48 where the problem was introduced. tmp.perf/perf_cpu updated. [perfbuilder@five ~]$ dm debian:experimental-x-arm64 ubuntu:16.04-x-arm ubuntu:16.04-x-arm64 ubuntu:18.04-x-arm ubuntu:18.04-x-arm64 1 26.08 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 11.2.0-9) 11.2.0 2 21.68 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 3 21.53 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 4 61.22 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) 7.5.0 5 108.41 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) 7.5.0 BUILD_TARBALL_HEAD=5610e6f0b9e64a02dfc906c9db9d18fd198200d9 6 238.918 [perfbuilder@five ~]$ diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c index 129c0272d65b8596..2e8b2c4365a0003f 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -203,9 +203,11 @@ static int cs_etm_set_option(struct auxtrace_record *itr, struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL); /* Set option of each CPU we have */ - for (i = 0; i < cpu__max_cpu(); i++) { - if (!perf_cpu_map__has(event_cpus, i) || - !perf_cpu_map__has(online_cpus, i)) + for (i = 0; i < cpu__max_cpu().cpu; i++) { + struct perf_cpu cpu = { .cpu = i, }; + + if (!perf_cpu_map__has(event_cpus, cpu) || + !perf_cpu_map__has(online_cpus, cpu)) continue; if (option & BIT(ETM_OPT_CTXTID)) { @@ -522,9 +524,11 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, /* cpu map is not empty, we have specific CPUs to work with */ if (!perf_cpu_map__empty(event_cpus)) { - for (i = 0; i < cpu__max_cpu(); i++) { - if (!perf_cpu_map__has(event_cpus, i) || - !perf_cpu_map__has(online_cpus, i)) + for (i = 0; i < cpu__max_cpu().cpu; i++) { + struct perf_cpu cpu = { .cpu = i, }; + + if (!perf_cpu_map__has(event_cpus, cpu) || + !perf_cpu_map__has(online_cpus, cpu)) continue; if (cs_etm_is_ete(itr, i)) @@ -536,8 +540,10 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, } } else { /* get configuration for all CPUs in the system */ - for (i = 0; i < cpu__max_cpu(); i++) { - if (!perf_cpu_map__has(online_cpus, i)) + for (i = 0; i < cpu__max_cpu().cpu; i++) { + struct perf_cpu cpu = { .cpu = i, }; + + if (!perf_cpu_map__has(online_cpus, cpu)) continue; if (cs_etm_is_ete(itr, i)) @@ -722,8 +728,10 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, } else { /* Make sure all specified CPUs are online */ for (i = 0; i < perf_cpu_map__nr(event_cpus); i++) { - if (perf_cpu_map__has(event_cpus, i) && - !perf_cpu_map__has(online_cpus, i)) + struct perf_cpu cpu = { .cpu = i, }; + + if (perf_cpu_map__has(event_cpus, cpu) && + !perf_cpu_map__has(online_cpus, cpu)) return -EINVAL; } @@ -743,9 +751,12 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, offset = CS_ETM_SNAPSHOT + 1; - for (i = 0; i < cpu__max_cpu() && offset < priv_size; i++) - if (perf_cpu_map__has(cpu_map, i)) + for (i = 0; i < cpu__max_cpu().cpu && offset < priv_size; i++) { + struct perf_cpu cpu = { .cpu = i, }; + + if (perf_cpu_map__has(cpu_map, cpu)) cs_etm_get_metadata(i, &offset, itr, info); + } perf_cpu_map__put(online_cpus); diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/pmu.c index d3a18f9c85f6a731..79124bba713e5f0d 100644 --- a/tools/perf/arch/arm64/util/pmu.c +++ b/tools/perf/arch/arm64/util/pmu.c @@ -15,7 +15,7 @@ const struct pmu_events_map *pmu_events_map__find(void) * The cpumap should cover all CPUs. Otherwise, some CPUs may * not support some events or have different event IDs. */ - if (pmu->cpus->nr != cpu__max_cpu()) + if (pmu->cpus->nr != cpu__max_cpu().cpu) return NULL; return perf_pmu__find_map(pmu);
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 9791ae9b1a53..6b985abaa2d2 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1504,11 +1504,6 @@ static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) return id; } -static struct aggr_cpu_id perf_env__get_socket(struct perf_cpu_map *map, int idx, void *data) -{ - return perf_env__get_socket_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); -} - static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) { struct perf_env *env = data; @@ -1527,11 +1522,6 @@ static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) return id; } -static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, void *data) -{ - return perf_env__get_die_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); -} - static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) { struct perf_env *env = data; @@ -1551,11 +1541,6 @@ static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) return id; } -static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, void *data) -{ - return perf_env__get_core_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); -} - static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) { struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id(); @@ -1564,33 +1549,28 @@ static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data) return id; } -static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx, void *data) -{ - return perf_env__get_node_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data); -} - static int perf_env__build_socket_map(struct perf_env *env, struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) { - return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env); + return cpu_map__build_map(cpus, sockp, perf_env__get_socket_aggr_by_cpu, env); } static int perf_env__build_die_map(struct perf_env *env, struct perf_cpu_map *cpus, struct cpu_aggr_map **diep) { - return cpu_map__build_map(cpus, diep, perf_env__get_die, env); + return cpu_map__build_map(cpus, diep, perf_env__get_die_aggr_by_cpu, env); } static int perf_env__build_core_map(struct perf_env *env, struct perf_cpu_map *cpus, struct cpu_aggr_map **corep) { - return cpu_map__build_map(cpus, corep, perf_env__get_core, env); + return cpu_map__build_map(cpus, corep, perf_env__get_core_aggr_by_cpu, env); } static int perf_env__build_node_map(struct perf_env *env, struct perf_cpu_map *cpus, struct cpu_aggr_map **nodep) { - return cpu_map__build_map(cpus, nodep, perf_env__get_node, env); + return cpu_map__build_map(cpus, nodep, perf_env__get_node_aggr_by_cpu, env); } static struct aggr_cpu_id perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused, diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c index 49fba2c53822..feaf34b25efc 100644 --- a/tools/perf/util/cpumap.c +++ b/tools/perf/util/cpumap.c @@ -163,7 +163,7 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) } int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), + struct aggr_cpu_id (*f)(int cpu, void *data), void *data) { int nr = cpus->nr; @@ -178,7 +178,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, c->nr = 0; for (cpu = 0; cpu < nr; cpu++) { - s1 = f(cpus, cpu, data); + s1 = f(cpu, data); for (s2 = 0; s2 < c->nr; s2++) { if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2])) break; @@ -290,22 +290,22 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp) { - return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL); + return cpu_map__build_map(cpus, sockp, cpu_map__get_socket_aggr_by_cpu, NULL); } int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep) { - return cpu_map__build_map(cpus, diep, cpu_map__get_die, NULL); + return cpu_map__build_map(cpus, diep, cpu_map__get_die_aggr_by_cpu, NULL); } int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep) { - return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL); + return cpu_map__build_map(cpus, corep, cpu_map__get_core_aggr_by_cpu, NULL); } int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **numap) { - return cpu_map__build_map(cpus, numap, cpu_map__get_node, NULL); + return cpu_map__build_map(cpus, numap, cpu_map__get_node_aggr_by_cpu, NULL); } /* setup simple routines to easily access node numbers given a cpu number */ diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h index c62d67704425..9648816c4255 100644 --- a/tools/perf/util/cpumap.h +++ b/tools/perf/util/cpumap.h @@ -63,7 +63,7 @@ int cpu__max_present_cpu(void); int cpu__get_node(int cpu); int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data), + struct aggr_cpu_id (*f)(int cpu, void *data), void *data); int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);