Skip to contentSkip to conversation

perf build: Update feature check for clang and llvm

PATCH RESEND In review Thomas Richter 3 participants 5 messages Jul 25, 2023 – Aug 10, 2023 perf events

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/2 perf build: Update feature check for clang and llvm

Perf build auto-detects features and packages already installed for its build. This is done in directory tools/build/feature. This directory contains small sample programs. When they successfully compile the necessary prereqs in form of libraries and header files are present.

Such a check is also done for llvm and clang. And the checks fail.

Fix this and update to the latest C++ standard and use the new library provided by clang (which contains new packaging) see this link for reference:
https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package

Output before:

 # rm -f ./test-clang.bin; make test-clang.bin; ./test-clang.bin; \
	ll test-clang.make.output
 g++  -MD -Wall -Werror -o test-clang.bin test-clang.cpp \
	 	> test-clang.make.output 2>&1 -std=gnu++14 \
	-I/usr/include 		\
	-L/usr/lib64		\
	-Wl,--start-group -lclangBasic -lclangDriver	\
	  -lclangFrontend -lclangEdit -lclangLex	\
	  -lclangAST -Wl,--end-group 			\
	-lLLVM-16	\
			\
	> test-clang.make.output 2>&1
 make: *** [Makefile:356: test-clang.bin] Error 1
 -bash: ./test-clang.bin: No such file or directory
 -rw-r--r--. 1 root root 252041 Jul 12 09:56 test-clang.make.output
 #

File test-clang.make.output contains many lines of unreferenced symbols.

Output after:

 # rm -f ./test-clang.bin; make test-clang.bin; ./test-clang.bin; \
	cat test-clang.make.output
 g++  -MD -Wall -Werror -o test-clang.bin test-clang.cpp \
	 > test-clang.make.output 2>&1 -std=gnu++17	\
	-I/usr/include 		\
	-L/usr/lib64		\
	-Wl,--start-group -lclang-cpp -Wl,--end-group	\
	-lLLVM-16	\
			\
	> test-clang.make.output 2>&1
 #
---
 tools/build/feature/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
tools/build/feature/Makefile +4 -6
index 2cd6dbbee088..3184f387990a 100644
@@ -340,7 +340,7 @@ $(OUTPUT)test-jvmti-cmlr.bin:
 	$(BUILD)
 
 $(OUTPUT)test-llvm.bin:
-	$(BUILDXX) -std=gnu++14 				\
+	$(BUILDXX) -std=gnu++17 				\
 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
 		-L$(shell $(LLVM_CONFIG) --libdir)		\
 		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
@@ -348,17 +348,15 @@ $(OUTPUT)test-llvm.bin:
 		> $(@:.bin=.make.output) 2>&1
 
 $(OUTPUT)test-llvm-version.bin:
-	$(BUILDXX) -std=gnu++14					\
+	$(BUILDXX) -std=gnu++17					\
 		-I$(shell $(LLVM_CONFIG) --includedir)		\
 		> $(@:.bin=.make.output) 2>&1
 
 $(OUTPUT)test-clang.bin:
-	$(BUILDXX) -std=gnu++14					\
+	$(BUILDXX) -std=gnu++17					\
 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
 		-L$(shell $(LLVM_CONFIG) --libdir)		\
-		-Wl,--start-group -lclangBasic -lclangDriver	\
-		  -lclangFrontend -lclangEdit -lclangLex	\
-		  -lclangAST -Wl,--end-group 			\
+		-Wl,--start-group -lclang-cpp -Wl,--end-group	\
 		$(shell $(LLVM_CONFIG) --libs Core option)	\
 		$(shell $(LLVM_CONFIG) --system-libs)		\
 		> $(@:.bin=.make.output) 2>&1
Signature · 1 line
2.41.0
#1 lore raw

PATCH RESEND 2/2 perf build: Support llvm and clang support compiled in

Perf build suports llvm and clang support compiled in. Test case 56 builtin clang support provides a test case which is always skipped.

Link perf with the latest llvm and clang libraries and enable this test case.

Use 'make LIBCLANGLLVM=1' to include this support.

V2: Add Library patch before -lclang-cpp

Output before:

 # ./perf test 56
 56: builtin clang support                  :
 56.1: builtin clang compile C source to IR : Skip (not compiled in)
 56.2: builtin clang compile C source to ELF object: \
	 				Skip (not compiled in)

Output after:

 # ./perf test 56
 56: builtin clang support                          :
 56.1: builtin clang compile C source to IR         : Ok
 56.2: builtin clang compile C source to ELF object : Ok
 #

From Ian Rogers
Build tested with LLVM 14 and 15 using:
BUILD_BPF_SKEL=1 LIBCLANGLLVM=1 LLVM_CONFIG=llvm-config-14 BUILD_BPF_SKEL=1 LIBCLANGLLVM=1 LLVM_CONFIG=llvm-config-15

---
 tools/perf/Makefile.config | 2 +-
 tools/perf/Makefile.perf   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
tools/perf/Makefile.config +1 -1
index c5db0de49868..8e1d1fab9b4d 100644
@@ -325,7 +325,7 @@ CORE_CFLAGS += -Wall
 CORE_CFLAGS += -Wextra
 CORE_CFLAGS += -std=gnu11
 
-CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
+CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti
 CXXFLAGS += -Wall
 CXXFLAGS += -fno-omit-frame-pointer
 CXXFLAGS += -ggdb3
tools/perf/Makefile.perf +1 -4
index 097316ef38e6..158a0733fc9d 100644
@@ -426,10 +426,7 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
 LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
 
 ifeq ($(USE_CLANG), 1)
-  CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
-  CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
-  LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
-  LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
+  LIBS += -L$(shell $(LLVM_CONFIG) --libdir) -lclang-cpp
 endif
 
 ifeq ($(USE_LLVM), 1)
Signature · 1 line
2.41.0
#2 lore raw

Re: [PATCH 2/2 Resend] perf build: Support llvm and clang support compiled in

Em Tue, Jul 25, 2023 at 05:03:47PM +0200, Thomas Richter escreveu:

Quoted 18 lines

Perf build suports llvm and clang support compiled in. Test case 56 builtin clang support provides a test case which is always skipped.

Link perf with the latest llvm and clang libraries and enable this test case.

Use 'make LIBCLANGLLVM=1' to include this support.

V2: Add Library patch before -lclang-cpp

Output before:

 # ./perf test 56
 56: builtin clang support                  :
 56.1: builtin clang compile C source to IR : Skip (not compiled in)
 56.2: builtin clang compile C source to ELF object: \
	 				Skip (not compiled in)
Quoted 6 lines

Output after:

 # ./perf test 56
 56: builtin clang support                          :
 56.1: builtin clang compile C source to IR         : Ok
 56.2: builtin clang compile C source to ELF object : Ok
 #

Thanks, tested and applied!

- Arnaldo

Quoted 47 lines

From Ian Rogers
Build tested with LLVM 14 and 15 using:
BUILD_BPF_SKEL=1 LIBCLANGLLVM=1 LLVM_CONFIG=llvm-config-14 BUILD_BPF_SKEL=1 LIBCLANGLLVM=1 LLVM_CONFIG=llvm-config-15

---
 tools/perf/Makefile.config | 2 +-
 tools/perf/Makefile.perf   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
tools/perf/Makefile.config +1 -1
index c5db0de49868..8e1d1fab9b4d 100644
@@ -325,7 +325,7 @@ CORE_CFLAGS += -Wall
 CORE_CFLAGS += -Wextra
 CORE_CFLAGS += -std=gnu11
 
-CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
+CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti
 CXXFLAGS += -Wall
 CXXFLAGS += -fno-omit-frame-pointer
 CXXFLAGS += -ggdb3
tools/perf/Makefile.perf +1 -4
index 097316ef38e6..158a0733fc9d 100644
@@ -426,10 +426,7 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
 LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
 
 ifeq ($(USE_CLANG), 1)
-  CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
-  CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
-  LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
-  LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
+  LIBS += -L$(shell $(LLVM_CONFIG) --libdir) -lclang-cpp
 endif
 
 ifeq ($(USE_LLVM), 1)
Signature · 1 line
2.41.0
Signature · 1 line
- Arnaldo
#3 lore raw
In reply to Thomas Richter

Em Tue, Jul 25, 2023 at 05:03:46PM +0200, Thomas Richter escreveu:

Quoted 35 lines

Perf build auto-detects features and packages already installed for its build. This is done in directory tools/build/feature. This directory contains small sample programs. When they successfully compile the necessary prereqs in form of libraries and header files are present.

Such a check is also done for llvm and clang. And the checks fail.

Fix this and update to the latest C++ standard and use the new library provided by clang (which contains new packaging) see this link for reference:
https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package

Output before:

 # rm -f ./test-clang.bin; make test-clang.bin; ./test-clang.bin; \
	ll test-clang.make.output
 g++  -MD -Wall -Werror -o test-clang.bin test-clang.cpp \
	 	> test-clang.make.output 2>&1 -std=gnu++14 \
	-I/usr/include 		\
	-L/usr/lib64		\
	-Wl,--start-group -lclangBasic -lclangDriver	\
	  -lclangFrontend -lclangEdit -lclangLex	\
	  -lclangAST -Wl,--end-group 			\
	-lLLVM-16	\
			\
	> test-clang.make.output 2>&1
 make: *** [Makefile:356: test-clang.bin] Error 1
 -bash: ./test-clang.bin: No such file or directory
 -rw-r--r--. 1 root root 252041 Jul 12 09:56 test-clang.make.output
 #

File test-clang.make.output contains many lines of unreferenced symbols.

Output after:

Quoted 11 lines
 # rm -f ./test-clang.bin; make test-clang.bin; ./test-clang.bin; \
	cat test-clang.make.output
 g++  -MD -Wall -Werror -o test-clang.bin test-clang.cpp \
	 > test-clang.make.output 2>&1 -std=gnu++17	\
	-I/usr/include 		\
	-L/usr/lib64		\
	-Wl,--start-group -lclang-cpp -Wl,--end-group	\
	-lLLVM-16	\
			\
	> test-clang.make.output 2>&1
 #

Thanks, tested and applied. Added some notes about needing to have 'llvm-devel' and 'clang-devel' installed to do the tests.

- arnaldo

Quoted 42 lines
---
 tools/build/feature/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
tools/build/feature/Makefile +4 -6
index 2cd6dbbee088..3184f387990a 100644
@@ -340,7 +340,7 @@ $(OUTPUT)test-jvmti-cmlr.bin:
 	$(BUILD)
 
 $(OUTPUT)test-llvm.bin:
-	$(BUILDXX) -std=gnu++14 				\
+	$(BUILDXX) -std=gnu++17 				\
 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
 		-L$(shell $(LLVM_CONFIG) --libdir)		\
 		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
@@ -348,17 +348,15 @@ $(OUTPUT)test-llvm.bin:
 		> $(@:.bin=.make.output) 2>&1
 
 $(OUTPUT)test-llvm-version.bin:
-	$(BUILDXX) -std=gnu++14					\
+	$(BUILDXX) -std=gnu++17					\
 		-I$(shell $(LLVM_CONFIG) --includedir)		\
 		> $(@:.bin=.make.output) 2>&1
 
 $(OUTPUT)test-clang.bin:
-	$(BUILDXX) -std=gnu++14					\
+	$(BUILDXX) -std=gnu++17					\
 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
 		-L$(shell $(LLVM_CONFIG) --libdir)		\
-		-Wl,--start-group -lclangBasic -lclangDriver	\
-		  -lclangFrontend -lclangEdit -lclangLex	\
-		  -lclangAST -Wl,--end-group 			\
+		-Wl,--start-group -lclang-cpp -Wl,--end-group	\
 		$(shell $(LLVM_CONFIG) --libs Core option)	\
 		$(shell $(LLVM_CONFIG) --system-libs)		\
 		> $(@:.bin=.make.output) 2>&1
Signature · 1 line
2.41.0
Signature · 1 line
- Arnaldo
reviewer
#4 lore raw
Quoted 49 lines · Arnaldo Carvalho de Melo

Em Tue, Jul 25, 2023 at 05:03:46PM +0200, Thomas Richter escreveu:

Quoted 35 lines

Perf build auto-detects features and packages already installed for its build. This is done in directory tools/build/feature. This directory contains small sample programs. When they successfully compile the necessary prereqs in form of libraries and header files are present.

Such a check is also done for llvm and clang. And the checks fail.

Fix this and update to the latest C++ standard and use the new library provided by clang (which contains new packaging) see this link for reference:
https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package

Output before:

 # rm -f ./test-clang.bin; make test-clang.bin; ./test-clang.bin; \
      ll test-clang.make.output
 g++  -MD -Wall -Werror -o test-clang.bin test-clang.cpp \
              > test-clang.make.output 2>&1 -std=gnu++14 \
      -I/usr/include          \
      -L/usr/lib64            \
      -Wl,--start-group -lclangBasic -lclangDriver    \
        -lclangFrontend -lclangEdit -lclangLex        \
        -lclangAST -Wl,--end-group                    \
      -lLLVM-16       \
                      \
      > test-clang.make.output 2>&1
 make: *** [Makefile:356: test-clang.bin] Error 1
 -bash: ./test-clang.bin: No such file or directory
 -rw-r--r--. 1 root root 252041 Jul 12 09:56 test-clang.make.output
 #

File test-clang.make.output contains many lines of unreferenced symbols.

Output after:

Quoted 11 lines
 # rm -f ./test-clang.bin; make test-clang.bin; ./test-clang.bin; \
      cat test-clang.make.output
 g++  -MD -Wall -Werror -o test-clang.bin test-clang.cpp \
       > test-clang.make.output 2>&1 -std=gnu++17     \
      -I/usr/include          \
      -L/usr/lib64            \
      -Wl,--start-group -lclang-cpp -Wl,--end-group   \
      -lLLVM-16       \
                      \
      > test-clang.make.output 2>&1
 #
Quoted 6 lines

Thanks, tested and applied. Added some notes about needing to have 'llvm-devel' and 'clang-devel' installed to do the tests.

- arnaldo

Quoted 1 line

Note, the libllvm and clang support was needed for BPF events which I propose removing in:
https://lore.kernel.org/lkml/[email protected]/
(Sorry, forgot to add Thomas to the to/cc line of those changes).

Thanks,
Ian

Quoted 45 lines
Quoted 39 lines
---
 tools/build/feature/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
tools/build/feature/Makefile +4 -7
index 2cd6dbbee088..3184f387990a 100644
@@ -340,7 +340,7 @@ $(OUTPUT)test-jvmti-cmlr.bin:
      $(BUILD)
 
 $(OUTPUT)test-llvm.bin:
-     $(BUILDXX) -std=gnu++14                                 \
+     $(BUILDXX) -std=gnu++17                                 \
              -I$(shell $(LLVM_CONFIG) --includedir)          \
              -L$(shell $(LLVM_CONFIG) --libdir)              \
              $(shell $(LLVM_CONFIG) --libs Core BPF)         \
@@ -348,17 +348,15 @@ $(OUTPUT)test-llvm.bin:
              > $(@:.bin=.make.output) 2>&1
 
 $(OUTPUT)test-llvm-version.bin:
-     $(BUILDXX) -std=gnu++14                                 \
+     $(BUILDXX) -std=gnu++17                                 \
              -I$(shell $(LLVM_CONFIG) --includedir)          \
              > $(@:.bin=.make.output) 2>&1
 
 $(OUTPUT)test-clang.bin:
-     $(BUILDXX) -std=gnu++14                                 \
+     $(BUILDXX) -std=gnu++17                                 \
              -I$(shell $(LLVM_CONFIG) --includedir)          \
              -L$(shell $(LLVM_CONFIG) --libdir)              \
-             -Wl,--start-group -lclangBasic -lclangDriver    \
-               -lclangFrontend -lclangEdit -lclangLex        \
-               -lclangAST -Wl,--end-group                    \
+             -Wl,--start-group -lclang-cpp -Wl,--end-group   \
              $(shell $(LLVM_CONFIG) --libs Core option)      \
              $(shell $(LLVM_CONFIG) --system-libs)           \
              > $(@:.bin=.make.output) 2>&1
--
Quoted 2 lines

2.41.0

--

- Arnaldo