perf bench: Avoid NDEBUG warning
Ian Rogers
reviewerPATCH 1/3 perf bench: Avoid NDEBUG warning
With NDEBUG set the asserts are compiled out. This yields "unused-but-set-variable" variables. Move these variables behind NDEBUG to avoid the warning.
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/bench/find-bit-bench.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/bench/find-bit-bench.c +6 -2
@@ -61,7 +61,6 @@ static int do_for_each_set_bit(unsigned int num_bits)double time_average, time_stddev;unsigned int bit, i, j;unsigned int set_bits, skip; -unsigned int old;init_stats (&fb_time_stats);init_stats (&tb_time_stats);
@@ -73,7 +72,10 @@ static int do_for_each_set_bit(unsigned int num_bits)__set_bit (i, to_test);for (i =0 ; i < outer_iterations; i++) { - old = accumulator; +#ifndef NDEBUG +unsigned int old = accumulator; +#endif +gettimeofday (&start,NULL );for (j =0 ; j < inner_iterations; j++) {for_each_set_bit (bit, to_test, num_bits)
@@ -85,7 +87,9 @@ static int do_for_each_set_bit(unsigned int num_bits) runtime_us = diff.tv_sec *USEC_PER_SEC + diff.tv_usec;update_stats (&fb_time_stats, runtime_us); +#ifndef NDEBUG old = accumulator; +#endif gettimeofday (&start,NULL );for (j =0 ; j < inner_iterations; j++) {for (bit =0 ; bit < num_bits; bit++) {
Signature · 1 line
2.40.0.348.gf938b09366-goog
Ian Rogers
reviewerPATCH 2/3 perf block-range: Move debug code behind ifndef NDEBUG
Make good on a comment and avoid a unused-but-set-variable warning.
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/util/block-range.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
tools/perf/util/block-range.c +1 -5
@@ -11,11 +11,7 @@ struct {static void block_range__debug (void ) { -/* -* XXX still paranoid for now; see if we can make this depend on -* DEBUG=1 builds. -*/ -#if 1 +#ifndef NDEBUG struct rb_node *rb;u64 old =0 ;/* NULL isn't executable */
Signature · 1 line
2.40.0.348.gf938b09366-goog
Ian Rogers
reviewerPATCH 3/3 perf build: Conditionally define NDEBUG
In reply to Ian RogersWhen a build is done without DEBUG=1 then define NDEBUG. This will compile out asserts and other debug code.
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/Makefile.config | 1 + 1 file changed, 1 insertion(+)
tools/perf/Makefile.config +1 -0
@@ -228,6 +228,7 @@ ifndef DEBUG endif ifeq ($(DEBUG),0) +CORE_CFLAGS += -DNDEBUG=1 ifeq ($(CC_NO_CLANG), 0) CORE_CFLAGS += -O3 else
Signature · 1 line
2.40.0.348.gf938b09366-goog
Em Thu, Mar 30, 2023 at 11:38:25AM -0700, Ian Rogers escreveu:
Quoted 3 lines
With NDEBUG set the asserts are compiled out. This yields "unused-but-set-variable" variables. Move these variables behind NDEBUG to avoid the warning.
Thanks, applied.
- Arnaldo
Quoted 42 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/bench/find-bit-bench.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)tools/perf/bench/find-bit-bench.c +6
-2@@ -61,7 +61,6 @@ static int do_for_each_set_bit(unsigned int num_bits)double time_average, time_stddev;unsigned int bit, i, j;unsigned int set_bits, skip; -unsigned int old;init_stats (&fb_time_stats);init_stats (&tb_time_stats);@@ -73,7 +72,10 @@ static int do_for_each_set_bit(unsigned int num_bits)__set_bit (i, to_test);for (i =0 ; i < outer_iterations; i++) { - old = accumulator; +#ifndef NDEBUG +unsigned int old = accumulator; +#endif +gettimeofday (&start,NULL );for (j =0 ; j < inner_iterations; j++) {for_each_set_bit (bit, to_test, num_bits)@@ -85,7 +87,9 @@ static int do_for_each_set_bit(unsigned int num_bits) runtime_us = diff.tv_sec *USEC_PER_SEC + diff.tv_usec;update_stats (&fb_time_stats, runtime_us); +#ifndef NDEBUG old = accumulator; +#endif gettimeofday (&start,NULL );for (j =0 ; j < inner_iterations; j++) {for (bit =0 ; bit < num_bits; bit++) {Signature · 1 line
2.40.0.348.gf938b09366-goog
Signature · 1 line
- Arnaldo