Skip to contentSkip to conversation

selftests/bpf: make BPF_TARGET_ENDIAN non-recursive to speed up *.bpf.o build

PATCH Applied Eduard Zingerman 3 participants 4 messages Dec 13, 2024

Subsystems (3)
lore
Share & tools
lore

Eduard Zingerman

author maintainer
#0 lore raw

PATCH 1/1 selftests/bpf: make BPF_TARGET_ENDIAN non-recursive to speed up *.bpf.o build

BPF_TARGET_ENDIAN is used in CLANG_BPF_BUILD_RULE and co macros. It is defined as a recursively expanded variable, meaning that it is recomputed each time the value is needed. Thus, it is recomputed for each *.bpf.o file compilation. The variable is computed by running a C compiler in a shell. This significantly hinders parallel build performance for *.bpf.o files.

This commit changes BPF_TARGET_ENDIAN to be a simply expanded variable.

# Build performance stats before this commit
$ git clean -xfd; time make -j12
real 1m0.000s
...

# Build performance stats after this commit
$ git clean -xfd; time make -j12
real 0m43.605s
...

---
 tools/testing/selftests/bpf/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/Makefile +3 -3
index bb8cf8f5bf11..9e870e519c30 100644
@@ -461,10 +461,10 @@ $(shell $(1) $(2) -dM -E - </dev/null | grep -E 'MIPS(EL|EB)|_MIPS_SZ(PTR|LONG)
 endef
 
 # Determine target endianness.
-IS_LITTLE_ENDIAN = $(shell $(CC) -dM -E - </dev/null | \
+IS_LITTLE_ENDIAN := $(shell $(CC) -dM -E - </dev/null | \
 			grep 'define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__')
-MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)
-BPF_TARGET_ENDIAN=$(if $(IS_LITTLE_ENDIAN),--target=bpfel,--target=bpfeb)
+MENDIAN:=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)
+BPF_TARGET_ENDIAN:=$(if $(IS_LITTLE_ENDIAN),--target=bpfel,--target=bpfeb)
 
 ifneq ($(CROSS_COMPILE),)
 CLANG_TARGET_ARCH = --target=$(notdir $(CROSS_COMPILE:%-=%))
Signature · 1 line
2.47.0
author maintainer
#1 lore raw

On Thu, 2024-12-12 at 16:32 -0800, Eduard Zingerman wrote:

Wrong tree, it should have been 'bpf-next' :(

reviewer Acked-by on v1 1/1
#2 lore raw
In reply to Eduard Zingerman
Quoted 15 lines · Eduard Zingerman

BPF_TARGET_ENDIAN is used in CLANG_BPF_BUILD_RULE and co macros. It is defined as a recursively expanded variable, meaning that it is recomputed each time the value is needed. Thus, it is recomputed for each *.bpf.o file compilation. The variable is computed by running a C compiler in a shell. This significantly hinders parallel build performance for *.bpf.o files.

This commit changes BPF_TARGET_ENDIAN to be a simply expanded variable.

# Build performance stats before this commit
$ git clean -xfd; time make -j12
real 1m0.000s
...

Quoted 6 lines

# Build performance stats after this commit
$ git clean -xfd; time make -j12
real 0m43.605s
...

LGTM except should target to bpf-next.

Quoted 22 lines
---
  tools/testing/selftests/bpf/Makefile | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/Makefile +3 -3
index bb8cf8f5bf11..9e870e519c30 100644
@@ -461,10 +461,10 @@ $(shell $(1) $(2) -dM -E - </dev/null | grep -E 'MIPS(EL|EB)|_MIPS_SZ(PTR|LONG)
  endef
 
  # Determine target endianness.
-IS_LITTLE_ENDIAN = $(shell $(CC) -dM -E - </dev/null | \
+IS_LITTLE_ENDIAN := $(shell $(CC) -dM -E - </dev/null | \
  			grep 'define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__')
-MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)
-BPF_TARGET_ENDIAN=$(if $(IS_LITTLE_ENDIAN),--target=bpfel,--target=bpfeb)
+MENDIAN:=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)
+BPF_TARGET_ENDIAN:=$(if $(IS_LITTLE_ENDIAN),--target=bpfel,--target=bpfeb)
 
  ifneq ($(CROSS_COMPILE),)
  CLANG_TARGET_ARCH = --target=$(notdir $(CROSS_COMPILE:%-=%))
#3 lore raw
In reply to Eduard Zingerman
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 8 lines · On Thu, 12 Dec 2024 16:32:24 -0800 you wrote:

BPF_TARGET_ENDIAN is used in CLANG_BPF_BUILD_RULE and co macros. It is defined as a recursively expanded variable, meaning that it is recomputed each time the value is needed. Thus, it is recomputed for each *.bpf.o file compilation. The variable is computed by running a C compiler in a shell. This significantly hinders parallel build performance for *.bpf.o files.

[...]

Here is the summary with links:
- [bpf] selftests/bpf: make BPF_TARGET_ENDIAN non-recursive to speed up *.bpf.o build

    https://git.kernel.org/bpf/bpf-next/c/5506b7d7bbdb

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html