perf tools: Refactor LLVM test warning for missing binary
PATCH 1/3 perf tools: Refactor LLVM test warning for missing binary
The same warning is duplicated in two places so refactor it into a single function "search_program_and_warn". This will be used a third time in a later commit.
--- tools/perf/util/llvm-utils.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-)
tools/perf/util/llvm-utils.c +21 -15
@@ -38,6 +38,8 @@ struct llvm_param llvm_param = { .user_set_param = false, }; +static void version_notice (void ); +int perf_llvm_config (const char *var,const char *value) {if (!strstarts (var,"llvm." ))
@@ -108,6 +110,21 @@ search_program(const char *def, const char *name,return ret; } +static int search_program_and_warn (const char *def,const char *name, +char *output) +{ +int ret =search_program (def, name, output); + +if (ret) { +pr_err ("ERROR:\tunable to find %s.\n" +"Hint:\tTry to install latest clang/llvm to support BPF. Check your $PATH\n" +" \tand '%s-path' option in [llvm] section of ~/.perfconfig.\n" , + name, name); +version_notice (); + } +return ret; +} +#define READ_SIZE 4096static int read_from_pipe (const char *cmd,void **p_buf,size_t *p_read_sz)
@@ -458,16 +475,10 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,if (!template) template =CLANG_BPF_CMD_DEFAULT_TEMPLATE ; - err =search_program (llvm_param.clang_path, + err =search_program_and_warn (llvm_param.clang_path,"clang" , clang_path); -if (err) { -pr_err ( -"ERROR:\tunable to find clang.\n" -"Hint:\tTry to install latest clang/llvm to support BPF. Check your $PATH\n" -" \tand 'clang-path' option in [llvm] section of ~/.perfconfig.\n" ); -version_notice (); +if (err)return -ENOENT ; - }/* * This is an optional work. Even it fail we can continue our
@@ -495,14 +506,9 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,force_set_env ("WORKING_DIR" , kbuild_dir ? :"." );if (opts) { - err =search_program (llvm_param.llc_path,"llc" , llc_path); -if (err) { -pr_err ("ERROR:\tunable to find llc.\n" -"Hint:\tTry to install latest clang/llvm to support BPF. Check your $PATH\n" -" \tand 'llc-path' option in [llvm] section of ~/.perfconfig.\n" ); -version_notice (); + err =search_program_and_warn (llvm_param.llc_path,"llc" , llc_path); +if (err) goto errout; - } err = -ENOMEM ; if (asprintf(&pipe_template, "%s -emit-llvm | %s -march=bpf %s -filetype=obj -o -",
Signature · 1 line
2.28.0
PATCH 2/3 perf tools: Fix LLVM test failure when running in verbose mode
A CI system might want to run all tests in verbose mode so that there is enough information to diagnose issues. This LLVM test is the only test that uses "-v" to signify to not skip the test if the preconditions aren't met (LLVM isn't installed). This means that running the test in verbose mode without LLVM installed causes a test failure.
For consistency with the other tests, remove this verbose/skip check. An alternate solution would be to make _all_ tests not skip when run in verbose mode, but I don't think that would be intuitive.
Also change the search_program() call to search_program_and_warn(). Previously the hint about installing LLVM was only printed by the actual test because this check was skipped in verbose mode. To maintain the old behaviour, the precondition check must also print the full warning.
Previous output:
$ ./perf test llvm 40: LLVM search and compile : 40.1: Basic BPF llvm compile : Skip
$ ./perf test -v llvm 40: LLVM search and compile : 40.1: Basic BPF llvm compile : --- start --- test child forked, pid 2085835 ERROR: unable to find clang. Hint: Try to install latest clang/llvm to support BPF. Check your $PATH ... test child finished with -1 ---- end ---- LLVM search and compile subtest 1: FAILED!
New output (non verbose mode is identical, verbose changes from fail to skip):
$ ./perf test llvm 40: LLVM search and compile : 40.1: Basic BPF llvm compile : Skip
$ ./perf test -v llvm 40: LLVM search and compile : 40.1: Basic BPF llvm compile : --- start --- test child forked, pid 2087680 ERROR: unable to find clang. Hint: Try to install latest clang/llvm to support BPF. Check your $PATH ... No clang, skip this test test child finished with -2 ---- end ---- LLVM search and compile subtest 1: Skip
--- tools/perf/tests/llvm.c | 7 +++---- tools/perf/util/llvm-utils.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
tools/perf/tests/llvm.c +3 -4
@@ -67,12 +67,11 @@ test_llvm__fetch_bpf_obj(void **p_obj_buf,/* * Skip this test if user's .perfconfig doesn't set [llvm] section -* and clang is not found in $PATH, and this is not perf test -v +* and clang is not found in $PATH */ -if (!force && (verbose <=0 && - !llvm_param.user_set_param && +if (!force && (!llvm_param.user_set_param &&llvm__search_clang ())) { -pr_debug ("No clang and no verbosive, skip this test\n" ); +pr_debug ("No clang, skip this test\n" );return TEST_SKIP ; }
tools/perf/util/llvm-utils.c +1 -1
@@ -585,5 +585,5 @@ int llvm__search_clang(void) {char clang_path[PATH_MAX ]; -return search_program (llvm_param.clang_path,"clang" , clang_path); +return search_program_and_warn (llvm_param.clang_path,"clang" , clang_path); }
Signature · 1 line
2.28.0
PATCH 3/3 perf tools: Fix LLVM download hint link
In reply to James Clarkhttp://llvm.org/apt returns 404, it has moved to https://apt.llvm.org/
--- tools/perf/util/llvm-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/llvm-utils.c +1 -1
@@ -234,7 +234,7 @@ version_notice(void)" \t\tgit clone http://llvm.org/git/clang.git\n\n" " \tOr fetch the latest clang/llvm 3.7 from pre-built llvm packages for\n" " \tdebian/ubuntu:\n" -" \t\thttp://llvm.org/apt\n\n" +" \t\thttps://apt.llvm.org/\n\n" " \tIf you are using old version of clang, change 'clang-bpf-cmd-template'\n" " \toption in [llvm] section of ~/.perfconfig to:\n\n" " \t \"$CLANG_EXEC $CLANG_OPTIONS $KERNEL_INC_OPTIONS $PERF_BPF_INC_OPTIONS \\\n"
Signature · 1 line
2.28.0
Em Tue, Aug 31, 2021 at 03:54:59PM +0100, James Clark escreveu:
Quoted 3 lines
The same warning is duplicated in two places so refactor it into a single function "
search_program_and_warn". This will be used a third time in a later commit.
Thanks, applied the three patches.
- Arnaldo
Quoted 78 lines
Signed-off-by James Clark <[email protected]>--- tools/perf/util/llvm-utils.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-)tools/perf/util/llvm-utils.c +21
-15@@ -38,6 +38,8 @@ struct llvm_param llvm_param = { .user_set_param = false, }; +static void version_notice (void ); +int perf_llvm_config (const char *var,const char *value) {if (!strstarts (var,"llvm." ))@@ -108,6 +110,21 @@ search_program(const char *def, const char *name,return ret; } +static int search_program_and_warn (const char *def,const char *name, +char *output) +{ +int ret =search_program (def, name, output); + +if (ret) { +pr_err ("ERROR:\tunable to find %s.\n" +"Hint:\tTry to install latest clang/llvm to support BPF. Check your $PATH\n" +" \tand '%s-path' option in [llvm] section of ~/.perfconfig.\n" , + name, name); +version_notice (); + } +return ret; +} +#define READ_SIZE 4096static int read_from_pipe (const char *cmd,void **p_buf,size_t *p_read_sz)@@ -458,16 +475,10 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,if (!template) template =CLANG_BPF_CMD_DEFAULT_TEMPLATE ; - err =search_program (llvm_param.clang_path, + err =search_program_and_warn (llvm_param.clang_path,"clang" , clang_path); -if (err) { -pr_err ( -"ERROR:\tunable to find clang.\n" -"Hint:\tTry to install latest clang/llvm to support BPF. Check your $PATH\n" -" \tand 'clang-path' option in [llvm] section of ~/.perfconfig.\n" ); -version_notice (); +if (err)return -ENOENT ; - }/* * This is an optional work. Even it fail we can continue our @@ -495,14 +506,9 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,force_set_env ("WORKING_DIR" , kbuild_dir ? :"." );if (opts) { - err =search_program (llvm_param.llc_path,"llc" , llc_path); -if (err) { -pr_err ("ERROR:\tunable to find llc.\n" -"Hint:\tTry to install latest clang/llvm to support BPF. Check your $PATH\n" -" \tand 'llc-path' option in [llvm] section of ~/.perfconfig.\n" ); -version_notice (); + err =search_program_and_warn (llvm_param.llc_path,"llc" , llc_path); +if (err) goto errout; - } err = -ENOMEM ; if (asprintf(&pipe_template, "%s -emit-llvm | %s -march=bpf %s -filetype=obj -o -",Signature · 1 line
2.28.0
Signature · 1 line
- Arnaldo