[PATCH] perf config: Update default value for llvm.clang-bpf-cmd-template

[PATCH] perf config: Update default value for llvm.clang-bpf-cmd-template

[Leo Yan]

The clang bpf cmdline template has defined default value in the file
tools/perf/util/llvm-utils.c, which has been changed for several times.

This patch updates the documentation to reflect the latest default value
for the configuration llvm.clang-bpf-cmd-template.

Fixes: d35b168c3dcd ("perf bpf: Give precedence to bpf header dir")
Fixes: cb76371441d0 ("perf llvm: Allow passing options to llc in addition to clang")
Fixes: 1b16fffa389d ("perf llvm-utils: Add bpf include path to clang command line")
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 tools/perf/Documentation/perf-config.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 462b3cde0675..e4aa268d2e38 100644
--- a/tools/perf/Documentation/perf-config.txt
+++ b/tools/perf/Documentation/perf-config.txt
@@ -564,9 +564,12 @@ llvm.*::
 	llvm.clang-bpf-cmd-template::
 		Cmdline template. Below lines show its default value. Environment
 		variable is used to pass options.
-		"$CLANG_EXEC -D__KERNEL__ $CLANG_OPTIONS $KERNEL_INC_OPTIONS \
-		-Wno-unused-value -Wno-pointer-sign -working-directory \
-		$WORKING_DIR  -c $CLANG_SOURCE -target bpf -O2 -o -"
+		"$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\
+		"-DLINUX_VERSION_CODE=$LINUX_VERSION_CODE "	\
+		"$CLANG_OPTIONS $PERF_BPF_INC_OPTIONS $KERNEL_INC_OPTIONS " \
+		"-Wno-unused-value -Wno-pointer-sign "		\
+		"-working-directory $WORKING_DIR "		\
+		"-c \"$CLANG_SOURCE\" -target bpf $CLANG_EMIT_LLVM -O2 -o - $LLVM_OPTIONS_PIPE"
 
 	llvm.clang-opt::
 		Options passed to clang.
-- 
2.17.1

Re: [PATCH] perf config: Update default value for llvm.clang-bpf-cmd-template

[Arnaldo Carvalho de Melo]

Em Fri, Jun 07, 2019 at 10:35:08PM +0800, Leo Yan escreveu:
> The clang bpf cmdline template has defined default value in the file
> tools/perf/util/llvm-utils.c, which has been changed for several times.
> 
> This patch updates the documentation to reflect the latest default value
> for the configuration llvm.clang-bpf-cmd-template.
> 
> Fixes: d35b168c3dcd ("perf bpf: Give precedence to bpf header dir")
> Fixes: cb76371441d0 ("perf llvm: Allow passing options to llc in addition to clang")
> Fixes: 1b16fffa389d ("perf llvm-utils: Add bpf include path to clang command line")

Well done! Three fixes! :-)

Who was it that made the changes and forgot to update the docs... oops,
it was me 8-)

Thanks, applied.

- Arnaldo


> Signed-off-by: Leo Yan <leo.yan@linaro.org>
> ---
>  tools/perf/Documentation/perf-config.txt | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
> index 462b3cde0675..e4aa268d2e38 100644
> --- a/tools/perf/Documentation/perf-config.txt
> +++ b/tools/perf/Documentation/perf-config.txt
> @@ -564,9 +564,12 @@ llvm.*::
>  	llvm.clang-bpf-cmd-template::
>  		Cmdline template. Below lines show its default value. Environment
>  		variable is used to pass options.
> -		"$CLANG_EXEC -D__KERNEL__ $CLANG_OPTIONS $KERNEL_INC_OPTIONS \
> -		-Wno-unused-value -Wno-pointer-sign -working-directory \
> -		$WORKING_DIR  -c $CLANG_SOURCE -target bpf -O2 -o -"
> +		"$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\
> +		"-DLINUX_VERSION_CODE=$LINUX_VERSION_CODE "	\
> +		"$CLANG_OPTIONS $PERF_BPF_INC_OPTIONS $KERNEL_INC_OPTIONS " \
> +		"-Wno-unused-value -Wno-pointer-sign "		\
> +		"-working-directory $WORKING_DIR "		\
> +		"-c \"$CLANG_SOURCE\" -target bpf $CLANG_EMIT_LLVM -O2 -o - $LLVM_OPTIONS_PIPE"
>  
>  	llvm.clang-opt::
>  		Options passed to clang.
> -- 
> 2.17.1

-- 

- Arnaldo