Commit 41c472e8 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Use -O0 instead of -Og in selftests builds 



While -Og is designed to work well with debugger, it's still inferior to -O0
in terms of debuggability experience. It will cause some variables to still be
inlined, it will also prevent single-stepping some statements and otherwise
interfere with debugging experience. So switch to -O0 which turns off any
optimization and provides the best debugging experience.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210423181348.1801389-14-andrii@kernel.org
parent 0a342457

tools/testing/selftests/bpf/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ endif 


BPF_GCC		?= $(shell command -v bpf-gcc;)

SAN_CFLAGS	?=

CFLAGS += -g -Og -rdynamic -Wall $(GENFLAGS) $(SAN_CFLAGS)		\

CFLAGS += -g -O0 -rdynamic -Wall $(GENFLAGS) $(SAN_CFLAGS)		\

	  -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR)		\

	  -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT)			\

	  -Dbpf_prog_load=bpf_prog_test_load				\
@@ -205,7 +205,7 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ 
		    $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool

	$(Q)$(MAKE) $(submake_extras)  -C $(BPFTOOLDIR)			       \

		    CC=$(HOSTCC) LD=$(HOSTLD)				       \

		    EXTRA_CFLAGS='-g -Og'				       \

		    EXTRA_CFLAGS='-g -O0'				       \

		    OUTPUT=$(HOST_BUILD_DIR)/bpftool/			       \

		    prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install
@@ -225,7 +225,7 @@ $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ 
	   ../../../include/uapi/linux/bpf.h                                   \

	   | $(INCLUDE_DIR) $(BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \

		    EXTRA_CFLAGS='-g -Og'					       \

		    EXTRA_CFLAGS='-g -O0'				       \

		    DESTDIR=$(SCRATCH_DIR) prefix= all install_headers



ifneq ($(BPFOBJ),$(HOST_BPFOBJ))
@@ -233,7 +233,7 @@ $(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ 
	   ../../../include/uapi/linux/bpf.h                                   \

	   | $(INCLUDE_DIR) $(HOST_BUILD_DIR)/libbpf

	$(Q)$(MAKE) $(submake_extras) -C $(BPFDIR)                             \

		    EXTRA_CFLAGS='-g -Og'					       \

		    EXTRA_CFLAGS='-g -O0'				       \

		    OUTPUT=$(HOST_BUILD_DIR)/libbpf/ CC=$(HOSTCC) LD=$(HOSTLD) \

		    DESTDIR=$(HOST_SCRATCH_DIR)/ prefix= all install_headers

endif