Commit 7c943261 authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf build: Rename test-dwarf to test-libdw 



Be more intention revealing that the dwarf test is actually testing
for libdw support.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Anup Patel <anup@brainfault.org>
Cc: Yang Jihong <yangjihong@bytedance.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Shenlin Liang <liangshenlin@eswincomputing.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Guilherme Amadio <amadio@gentoo.org>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Alexander Lobakin <aleksander.lobakin@intel.com>
Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: James Clark <james.clark@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Chen Pei <cp0613@linux.alibaba.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Aditya Gupta <adityag@linux.ibm.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-riscv@lists.infradead.org
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Atish Patra <atishp@rivosinc.com>
Cc: Dima Kogan <dima@secretsauce.net>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: linux-csky@vger.kernel.org
Link: https://lore.kernel.org/r/20241017001354.56973-5-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent a6c55df9

tools/build/Makefile.feature

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ endef 
#

FEATURE_TESTS_BASIC :=                  \

        backtrace                       \

        dwarf                           \

        libdw                           \

        dwarf_getlocations              \

        dwarf_getcfi                    \

        eventfd                         \
@@ -120,7 +120,7 @@ ifeq ($(FEATURE_TESTS),all) 
endif



FEATURE_DISPLAY ?=              \

         dwarf                  \

         libdw                  \

         dwarf_getlocations     \

         glibc                  \

         libbfd                 \
@@ -233,7 +233,7 @@ endef 


#

# generates feature value assignment for name, like:

#   $(call feature_assign,dwarf) == feature-dwarf=1

#   $(call feature_assign,libdw) == feature-libdw=1

#

feature_assign = feature-$(1)=$(feature-$(1))

tools/build/feature/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ FILES= \ 
         test-all.bin                           \

         test-backtrace.bin                     \

         test-bionic.bin                        \

         test-dwarf.bin                         \

         test-libdw.bin                         \

         test-dwarf_getlocations.bin            \

         test-dwarf_getcfi.bin                  \

         test-eventfd.bin                       \
@@ -168,9 +168,9 @@ $(OUTPUT)test-libopencsd.bin: 
	$(BUILD) # -lopencsd_c_api -lopencsd provided by

		 # $(FEATURE_CHECK_LDFLAGS-libopencsd)



DWARFLIBS := -ldw

DWLIBS := -ldw

ifeq ($(findstring -static,${LDFLAGS}),-static)

  DWARFLIBS += -lelf -lz -llzma -lbz2 -lzstd

  DWLIBS += -lelf -lz -llzma -lbz2 -lzstd



  LIBDW_VERSION := $(shell $(PKG_CONFIG) --modversion libdw).0.0

  LIBDW_VERSION_1 := $(word 1, $(subst ., ,$(LIBDW_VERSION)))
@@ -179,21 +179,21 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) 
  # Elfutils merged libebl.a into libdw.a starting from version 0.177,

  # Link libebl.a only if libdw is older than this version.

  ifeq ($(shell test $(LIBDW_VERSION_2) -lt 177; echo $$?),0)

    DWARFLIBS += -lebl

    DWLIBS += -lebl

  endif



  # Must put -ldl after -lebl for dependency

  DWARFLIBS += -ldl

endif



$(OUTPUT)test-dwarf.bin:

	$(BUILD) $(DWARFLIBS)

$(OUTPUT)test-libdw.bin:

	$(BUILD) $(DWLIBS)



$(OUTPUT)test-dwarf_getlocations.bin:

	$(BUILD) $(DWARFLIBS)

	$(BUILD) $(DWLIBS)



$(OUTPUT)test-dwarf_getcfi.bin:

	$(BUILD) $(DWARFLIBS)

	$(BUILD) $(DWLIBS)



$(OUTPUT)test-libelf-getphdrnum.bin:

	$(BUILD) -lelf

tools/build/feature/test-all.c

+3 −3
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
# include "test-glibc.c"

#undef main



#define main main_test_dwarf

# include "test-dwarf.c"

#define main main_test_libdw

# include "test-libdw.c"

#undef main



#define main main_test_dwarf_getlocations
@@ -187,7 +187,7 @@ int main(int argc, char *argv[]) 
	main_test_get_current_dir_name();

	main_test_gettid();

	main_test_glibc();

	main_test_dwarf();

	main_test_libdw();

	main_test_dwarf_getlocations();

	main_test_eventfd();

	main_test_libelf_getphdrnum();

tools/perf/Makefile.config

+3 −3
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) 
  # Must put -ldl after -lebl for dependency

  DWARFLIBS += -ldl

endif

FEATURE_CHECK_CFLAGS-dwarf := $(LIBDW_CFLAGS)

FEATURE_CHECK_LDFLAGS-dwarf := $(LIBDW_LDFLAGS) $(DWARFLIBS)

FEATURE_CHECK_CFLAGS-libdw := $(LIBDW_CFLAGS)

FEATURE_CHECK_LDFLAGS-libdw := $(LIBDW_LDFLAGS) $(DWARFLIBS)

FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)

FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) $(DWARFLIBS)

FEATURE_CHECK_CFLAGS-dwarf_getlocations := $(LIBDW_CFLAGS)
@@ -473,7 +473,7 @@ else 
        $(warning No libdw DWARF unwind found, Please install elfutils-devel/libdw-dev >= 0.158 and/or set LIBDW_DIR)

      endif

    endif

    ifneq ($(feature-dwarf), 1)

    ifneq ($(feature-libdw), 1)

      ifndef NO_LIBDW

        $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev)

        NO_LIBDW := 1