Skip to content

Backport dependency commits for 616b14b47a86 ("perf build: Conditionally define NDEBUG")

Simon Liebold linux-perf-users lkml stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2perf bench: Avoid NDEBUG warningtools/perf/bench/find-bit-bench.c+6 -20 replies
2/2perf block-range: Move debug code behind ifndef NDEBUGtools/perf/util/block-range.c+1 -50 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 6.1.y 0/2] Backport dependency commits for 616b14b47a86 ("perf build: Conditionally define NDEBUG")

Hi, please backport the following two patches to 6.1.y:

- d1babea9c382 ("perf bench: Avoid NDEBUG warning")
- 984a785f25e5 ("perf block-range: Move debug code behind ifndef NDEBUG")

They are stable dependencies for commit 616b14b47a86 ("perf build: Conditionally define NDEBUG") which was backported to v6.1.176 as 7bf35a0237d04.

That commit adds -DNDEBUG=1 to perf CFLAGS, which compiles out assert() calls, leaving variables consumed only by asserts as unused-but-set. Combined with -Werror this breaks the build:

bench/find-bit-bench.c:64:22: error: variable 'old' set but not used util/block-range.c:20:13: error: variable 'old' set but not used

We need these two dependency patches, because both guard assert-only variables with #ifndef NDEBUG so they are compiled out alongside the asserts they validate.

Tested using our regression test suite including kselftest and LTP on various EC2 instances.

Thanks.

- Simon

Ian Rogers (2):
perf bench: Avoid NDEBUG warning
perf block-range: Move debug code behind ifndef NDEBUG

 tools/perf/bench/find-bit-bench.c | 8 ++++++--
 tools/perf/util/block-range.c     | 6 +-----
 2 files changed, 7 insertions(+), 7 deletions(-)

base-commit: fdb6fcb41cc741ad5eaa7995f278dfcb94fdf795

Signature · 12 lines
2.50.1




Amazon Web Services Development Center Germany GmbH
Tamara-Danz-Str. 13
10243 Berlin
Geschaeftsfuehrung: Christof Hellmis, Andreas Stieger
Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B
Sitz: Berlin
Ust-ID: DE 365 538 597