Commit 26385fd2 authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf build: Combine test-dwarf-getcfi into test-libdw 



dwarf_getcfi support in libdw is 15 years old. Make libdw imply
dwarf_getcfi support and simplify build logic.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarLeo Yan <leo.yan@arm.com>
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-8-irogers@google.com


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

tools/build/Makefile.feature

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ endef 
FEATURE_TESTS_BASIC :=                  \

        backtrace                       \

        libdw                           \

        dwarf_getcfi                    \

        eventfd                         \

        fortify-source                  \

        get_current_dir_name            \

tools/build/feature/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ FILES= \ 
         test-backtrace.bin                     \

         test-bionic.bin                        \

         test-libdw.bin                         \

         test-dwarf_getcfi.bin                  \

         test-eventfd.bin                       \

         test-fortify-source.bin                \

         test-get_current_dir_name.bin          \
@@ -187,9 +186,6 @@ endif 
$(OUTPUT)test-libdw.bin:

	$(BUILD) $(DWLIBS)



$(OUTPUT)test-dwarf_getcfi.bin:

	$(BUILD) $(DWLIBS)



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

	$(BUILD) -lelf

tools/build/feature/test-dwarf_getcfi.c

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <stdio.h>

#include <elfutils/libdw.h>



int main(void)

{

	Dwarf *dwarf = NULL;

	return dwarf_getcfi(dwarf) == NULL;

}

tools/build/feature/test-libdw.c

+9 −1
Original line number Diff line number Diff line
@@ -34,7 +34,15 @@ int test_libdw_getlocations(void) 
	return (int)dwarf_getlocations(&attr, offset, &base, &start, &end, &op, &nops);

}



int test_libdw_getcfi(void)

{

	Dwarf *dwarf = NULL;



	return dwarf_getcfi(dwarf) == NULL;

}



int main(void)

{

	return test_libdw() + test_libdw_unwind() + test_libdw_getlocations();

	return test_libdw() + test_libdw_unwind() + test_libdw_getlocations() +

	       test_libdw_getcfi();

}

tools/perf/Makefile.config

+1 −7
Original line number Diff line number Diff line
@@ -164,8 +164,6 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) 
endif

FEATURE_CHECK_CFLAGS-libdw := $(LIBDW_CFLAGS)

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

FEATURE_CHECK_CFLAGS-dwarf_getcfi := $(LIBDW_CFLAGS)

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



# for linking with debug library, run like:

# make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/
@@ -470,11 +468,7 @@ else 
      endif

    else

      CFLAGS += -DHAVE_DWARF_GETLOCATIONS_SUPPORT

      ifneq ($(feature-dwarf_getcfi), 1)

        $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.142)

      else

      CFLAGS += -DHAVE_DWARF_CFI_SUPPORT

      endif # dwarf_getcfi

    endif # Dwarf support

  endif # libelf support

endif # NO_LIBELF