* [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings @ 2022-04-28 20:29 Ian Rogers 2022-04-28 20:29 ` [PATCH 2/2] perf vendor events intel: Add cpuid for sapphirerapids Ian Rogers 2022-04-29 9:21 ` [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Athira Rajeev 0 siblings, 2 replies; 6+ messages in thread From: Ian Rogers @ 2022-04-28 20:29 UTC (permalink / raw) To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Athira Rajeev, Ian Rogers, Andi Kleen, Jin Yao, Zhengjun Xing, linux-perf-users, linux-kernel BUG_ON is a no-op if NDEBUG is defined, otherwise it is an assert. Compiling with NDEBUG yields: bench/numa.c: In function ‘bind_to_cpu’: bench/numa.c:314:1: error: control reaches end of non-void function [-Werror=return-type] 314 | } | ^ bench/numa.c: In function ‘bind_to_node’: bench/numa.c:367:1: error: control reaches end of non-void function [-Werror=return-type] 367 | } | ^ Add return statements to cover this case. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/bench/numa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 44e1f8a44087..d5289fa58a4f 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -311,6 +311,7 @@ static cpu_set_t *bind_to_cpu(int target_cpu) /* BUG_ON due to failure in allocation of orig_mask/mask */ BUG_ON(-1); + return NULL; } static cpu_set_t *bind_to_node(int target_node) @@ -364,6 +365,7 @@ static cpu_set_t *bind_to_node(int target_node) /* BUG_ON due to failure in allocation of orig_mask/mask */ BUG_ON(-1); + return NULL; } static void bind_to_cpumask(cpu_set_t *mask) -- 2.36.0.464.gb9c8b46e94-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] perf vendor events intel: Add cpuid for sapphirerapids 2022-04-28 20:29 [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Ian Rogers @ 2022-04-28 20:29 ` Ian Rogers 2022-04-29 3:17 ` Xing Zhengjun 2022-04-29 9:21 ` [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Athira Rajeev 1 sibling, 1 reply; 6+ messages in thread From: Ian Rogers @ 2022-04-28 20:29 UTC (permalink / raw) To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Athira Rajeev, Ian Rogers, Andi Kleen, Jin Yao, Zhengjun Xing, linux-perf-users, linux-kernel Fixes compile time warnings: pmu-events/pmu-events.c:27238:31: error: ‘pme_sapphirerapids’ defined but not used [-Werror=unused-const-variable=] 27238 | static const struct pmu_event pme_sapphirerapids[] = { | ^~~~~~~~~~~~~~~~~~ Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/pmu-events/arch/x86/mapfile.csv b/tools/perf/pmu-events/arch/x86/mapfile.csv index 963a76fec277..4b47ac1b806d 100644 --- a/tools/perf/pmu-events/arch/x86/mapfile.csv +++ b/tools/perf/pmu-events/arch/x86/mapfile.csv @@ -41,6 +41,7 @@ GenuineIntel-6-A7,v1,icelake,core GenuineIntel-6-6A,v1,icelakex,core GenuineIntel-6-6C,v1,icelakex,core GenuineIntel-6-86,v1,tremontx,core +GenuineIntel-6-8F,v1,sapphirerapids,core GenuineIntel-6-96,v1,elkhartlake,core GenuineIntel-6-97,v1,alderlake,core GenuineIntel-6-9A,v1,alderlake,core -- 2.36.0.464.gb9c8b46e94-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] perf vendor events intel: Add cpuid for sapphirerapids 2022-04-28 20:29 ` [PATCH 2/2] perf vendor events intel: Add cpuid for sapphirerapids Ian Rogers @ 2022-04-29 3:17 ` Xing Zhengjun 0 siblings, 0 replies; 6+ messages in thread From: Xing Zhengjun @ 2022-04-29 3:17 UTC (permalink / raw) To: Ian Rogers, Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Athira Rajeev, Andi Kleen, Jin Yao, linux-perf-users, linux-kernel On 4/29/2022 4:29 AM, Ian Rogers wrote: > Fixes compile time warnings: > > pmu-events/pmu-events.c:27238:31: error: ‘pme_sapphirerapids’ defined but not used [-Werror=unused-const-variable=] > 27238 | static const struct pmu_event pme_sapphirerapids[] = { > | ^~~~~~~~~~~~~~~~~~ > > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/perf/pmu-events/arch/x86/mapfile.csv b/tools/perf/pmu-events/arch/x86/mapfile.csv > index 963a76fec277..4b47ac1b806d 100644 > --- a/tools/perf/pmu-events/arch/x86/mapfile.csv > +++ b/tools/perf/pmu-events/arch/x86/mapfile.csv > @@ -41,6 +41,7 @@ GenuineIntel-6-A7,v1,icelake,core > GenuineIntel-6-6A,v1,icelakex,core > GenuineIntel-6-6C,v1,icelakex,core > GenuineIntel-6-86,v1,tremontx,core > +GenuineIntel-6-8F,v1,sapphirerapids,core In https://lore.kernel.org/all/20220413210503.3256922-3-irogers@google.com/, it has already added the cpuid for sapphirerapids > GenuineIntel-6-96,v1,elkhartlake,core > GenuineIntel-6-97,v1,alderlake,core > GenuineIntel-6-9A,v1,alderlake,core -- Zhengjun Xing ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings 2022-04-28 20:29 [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Ian Rogers 2022-04-28 20:29 ` [PATCH 2/2] perf vendor events intel: Add cpuid for sapphirerapids Ian Rogers @ 2022-04-29 9:21 ` Athira Rajeev 2022-04-30 1:58 ` Ian Rogers 1 sibling, 1 reply; 6+ messages in thread From: Athira Rajeev @ 2022-04-29 9:21 UTC (permalink / raw) To: Ian Rogers Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Andi Kleen, Jin Yao, Zhengjun Xing, linux-perf-users, linux-kernel > On 29-Apr-2022, at 1:59 AM, Ian Rogers <irogers@google.com> wrote: > > BUG_ON is a no-op if NDEBUG is defined, otherwise it is an assert. > Compiling with NDEBUG yields: > > bench/numa.c: In function ‘bind_to_cpu’: > bench/numa.c:314:1: error: control reaches end of non-void function [-Werror=return-type] > 314 | } > | ^ > bench/numa.c: In function ‘bind_to_node’: > bench/numa.c:367:1: error: control reaches end of non-void function [-Werror=return-type] > 367 | } > | ^ > > Add return statements to cover this case. Looks fine to me Reviewed-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Thanks Athira > > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/bench/numa.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c > index 44e1f8a44087..d5289fa58a4f 100644 > --- a/tools/perf/bench/numa.c > +++ b/tools/perf/bench/numa.c > @@ -311,6 +311,7 @@ static cpu_set_t *bind_to_cpu(int target_cpu) > > /* BUG_ON due to failure in allocation of orig_mask/mask */ > BUG_ON(-1); > + return NULL; > } > > static cpu_set_t *bind_to_node(int target_node) > @@ -364,6 +365,7 @@ static cpu_set_t *bind_to_node(int target_node) > > /* BUG_ON due to failure in allocation of orig_mask/mask */ > BUG_ON(-1); > + return NULL; > } > > static void bind_to_cpumask(cpu_set_t *mask) > -- > 2.36.0.464.gb9c8b46e94-goog > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings 2022-04-29 9:21 ` [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Athira Rajeev @ 2022-04-30 1:58 ` Ian Rogers 2022-04-30 15:27 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 6+ messages in thread From: Ian Rogers @ 2022-04-30 1:58 UTC (permalink / raw) To: Athira Rajeev, Arnaldo Carvalho de Melo Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Andi Kleen, Jin Yao, Zhengjun Xing, linux-perf-users, linux-kernel On Fri, Apr 29, 2022 at 2:21 AM Athira Rajeev <atrajeev@linux.vnet.ibm.com> wrote: > > > > > On 29-Apr-2022, at 1:59 AM, Ian Rogers <irogers@google.com> wrote: > > > > BUG_ON is a no-op if NDEBUG is defined, otherwise it is an assert. > > Compiling with NDEBUG yields: > > > > bench/numa.c: In function ‘bind_to_cpu’: > > bench/numa.c:314:1: error: control reaches end of non-void function [-Werror=return-type] > > 314 | } > > | ^ > > bench/numa.c: In function ‘bind_to_node’: > > bench/numa.c:367:1: error: control reaches end of non-void function [-Werror=return-type] > > 367 | } > > | ^ > > > > Add return statements to cover this case. > > Looks fine to me > > Reviewed-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> > > Thanks > Athira Thanks Athira :-) Arnaldo, could we get this in the 5th batch for 5.18 to keep NDEBUG building? It looks like there is a missing build test for NDEBUG too. Thanks, Ian > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/bench/numa.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c > > index 44e1f8a44087..d5289fa58a4f 100644 > > --- a/tools/perf/bench/numa.c > > +++ b/tools/perf/bench/numa.c > > @@ -311,6 +311,7 @@ static cpu_set_t *bind_to_cpu(int target_cpu) > > > > /* BUG_ON due to failure in allocation of orig_mask/mask */ > > BUG_ON(-1); > > + return NULL; > > } > > > > static cpu_set_t *bind_to_node(int target_node) > > @@ -364,6 +365,7 @@ static cpu_set_t *bind_to_node(int target_node) > > > > /* BUG_ON due to failure in allocation of orig_mask/mask */ > > BUG_ON(-1); > > + return NULL; > > } > > > > static void bind_to_cpumask(cpu_set_t *mask) > > -- > > 2.36.0.464.gb9c8b46e94-goog > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings 2022-04-30 1:58 ` Ian Rogers @ 2022-04-30 15:27 ` Arnaldo Carvalho de Melo 0 siblings, 0 replies; 6+ messages in thread From: Arnaldo Carvalho de Melo @ 2022-04-30 15:27 UTC (permalink / raw) To: Ian Rogers Cc: Athira Rajeev, Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Andi Kleen, Jin Yao, Zhengjun Xing, linux-perf-users, linux-kernel Em Fri, Apr 29, 2022 at 06:58:22PM -0700, Ian Rogers escreveu: > On Fri, Apr 29, 2022 at 2:21 AM Athira Rajeev > <atrajeev@linux.vnet.ibm.com> wrote: > > > > > > > > > On 29-Apr-2022, at 1:59 AM, Ian Rogers <irogers@google.com> wrote: > > > > > > BUG_ON is a no-op if NDEBUG is defined, otherwise it is an assert. > > > Compiling with NDEBUG yields: > > > > > > bench/numa.c: In function ‘bind_to_cpu’: > > > bench/numa.c:314:1: error: control reaches end of non-void function [-Werror=return-type] > > > 314 | } > > > | ^ > > > bench/numa.c: In function ‘bind_to_node’: > > > bench/numa.c:367:1: error: control reaches end of non-void function [-Werror=return-type] > > > 367 | } > > > | ^ > > > > > > Add return statements to cover this case. > > > > Looks fine to me > > > > Reviewed-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> > > > > Thanks > > Athira > > Thanks Athira :-) Arnaldo, could we get this in the 5th batch for 5.18 > to keep NDEBUG building? It looks like there is a missing build test > for NDEBUG too. Applied to perf/urgent. Thanks, - Arnaldo ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-30 15:27 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-04-28 20:29 [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Ian Rogers 2022-04-28 20:29 ` [PATCH 2/2] perf vendor events intel: Add cpuid for sapphirerapids Ian Rogers 2022-04-29 3:17 ` Xing Zhengjun 2022-04-29 9:21 ` [PATCH 1/2] perf bench: Fix two numa NDEBUG warnings Athira Rajeev 2022-04-30 1:58 ` Ian Rogers 2022-04-30 15:27 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.