selftests/resctrl: fix clang build warnings related to abs(), labs() calls
Subsystems (2)
PATCH v3 1/1 selftests/resctrl: fix clang build warnings related to abs(), labs() calls
When building with clang, via:
make LLVM=1 -C tools/testing/selftests
...two types of warnings occur:
warning: absolute value function 'abs' given an argument of type 'long' but has parameter of type 'int' which may cause truncation of value
warning: taking the absolute value of unsigned type 'unsigned long' has no effect
Fix these by:
a) using labs() in place of abs(), when long integers are involved, and
b) Change to use signed integer data types, in places where subtraction is used (and could end up with negative values).
c) Remove a duplicate abs() call in cmt_test.c.
--- tools/testing/selftests/resctrl/cmt_test.c | 4 ++-- tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/resctrl/cmt_test.c +2 -2
@@ -40,11 +40,11 @@ static int show_results_info(unsigned long sum_llc_val, int no_of_bits,int ret; avg_llc_val = sum_llc_val / num_of_runs; - avg_diff = (long )abs (cache_span - avg_llc_val); + avg_diff = (long )(cache_span - avg_llc_val); diff_percent = ((float )cache_span - avg_llc_val) / cache_span *100 ; ret = platform &&abs ((int )diff_percent) > max_diff_percent && -abs (avg_diff) > max_diff; +labs (avg_diff) > max_diff;ksft_print_msg ("%s Check cache miss rate within %lu%%\n" , ret ?"Fail:" :"Pass:" , max_diff_percent);
tools/testing/selftests/resctrl/mba_test.c +1 -1
@@ -60,7 +60,7 @@ static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc)/* Memory bandwidth from 100% down to 10% */ for (allocation =0 ; allocation <ALLOCATION_MAX /ALLOCATION_STEP ; allocation++) { -unsigned long avg_bw_imc, avg_bw_resc; +long avg_bw_imc, avg_bw_resc;unsigned long sum_bw_imc =0 , sum_bw_resc =0 ;int avg_diff_per;float avg_diff;
tools/testing/selftests/resctrl/mbm_test.c +1 -1
@@ -17,7 +17,7 @@static int show_bw_info (unsigned long *bw_imc,unsigned long *bw_resc,size_t span) { -unsigned long avg_bw_imc =0 , avg_bw_resc =0 ; +long avg_bw_imc =0 , avg_bw_resc =0 ;unsigned long sum_bw_imc =0 , sum_bw_resc =0 ;int runs, ret, avg_diff_per;float avg_diff =0 ;
base-commit: 45db3ab70092637967967bfd8e6144017638563c
Signature · 1 line
2.45.0
Reinette Chatre
maintainerHi John,
Quoted 54 lines · John Hubbard
When building with clang, via:
make LLVM=1 -C
tools/testing/selftests...two types of warnings occur:
warning: absolute value function 'abs' given an argument of type 'long' but has parameter of type 'int' which may cause truncation of value
warning: taking the absolute value of unsigned type 'unsigned long' has no effect
Fix these by:
a) using
labs()in place ofabs(), when long integers are involved, andb) Change to use signed integer data types, in places where subtraction is used (and could end up with negative values).
c) Remove a duplicate
abs()call incmt_test.c.Cc Reinette Chatre <[email protected]>Cc Ilpo Järvinen <[email protected]>Signed-off-by John Hubbard <[email protected]>--- tools/testing/selftests/resctrl/cmt_test.c | 4 ++-- tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/resctrl/cmt_test.c +2
-2@@ -40,11 +40,11 @@ static int show_results_info(unsigned long sum_llc_val, int no_of_bits,int ret; avg_llc_val = sum_llc_val / num_of_runs; - avg_diff = (long )abs (cache_span - avg_llc_val); + avg_diff = (long )(cache_span - avg_llc_val); diff_percent = ((float )cache_span - avg_llc_val) / cache_span *100 ; ret = platform &&abs ((int )diff_percent) > max_diff_percent && -abs (avg_diff) > max_diff; +labs (avg_diff) > max_diff;ksft_print_msg ("%s Check cache miss rate within %lu%%\n" , ret ?"Fail:" :"Pass:" , max_diff_percent);tools/testing/selftests/resctrl/mba_test.c +0
-0
tools/testing/selftests/resctrl/mba_test.c static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc) · line 64
Quoted 6 lines
tools/testing/selftests/resctrl/mba_test.c +1
-1@@ -60,7 +60,7 @@ static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc)/* Memory bandwidth from 100% down to 10% */ for (allocation =0 ; allocation <ALLOCATION_MAX /ALLOCATION_STEP ; allocation++) { -unsigned long avg_bw_imc, avg_bw_resc; +long avg_bw_imc, avg_bw_resc;unsigned long sum_bw_imc =0 , sum_bw_resc =0 ;
nit: since you are touching this line, could you please move it down one line to establish reverse fir order?
Quoted 7 lines
tools/testing/selftests/resctrl/mba_test.c +0
-0int avg_diff_per;float avg_diff;tools/testing/selftests/resctrl/mbm_test.c +0
-0
tools/testing/selftests/resctrl/mbm_test.c line 23
Quoted 8 lines
tools/testing/selftests/resctrl/mbm_test.c +1
-1@@ -17,7 +17,7 @@static int show_bw_info (unsigned long *bw_imc,unsigned long *bw_resc,size_t span) { -unsigned long avg_bw_imc =0 , avg_bw_resc =0 ; +long avg_bw_imc =0 , avg_bw_resc =0 ;unsigned long sum_bw_imc =0 , sum_bw_resc =0 ;int runs, ret, avg_diff_per;float avg_diff =0 ;
Same nit here about reverse fir order.
Thank you very much for sticking with this to fix the warnings. With the nitpicks addressed you can add:
| Reviewed-by: Reinette Chatre <[email protected]>
Reinette
Quoted 3 lines · Reinette Chatre
Hi John,
On 5/8/2024 12:41 PM, John Hubbard wrote:
...
Quoted 33 lines
tools/testing/selftests/resctrl/mba_test.c static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc) · line 64
Quoted 11 lines
tools/testing/selftests/resctrl/mba_test.c +1
-1@@ -60,7 +60,7 @@ static bool show_mba_info(unsigned long *bw_imc, unsigned long *bw_resc)/* Memory bandwidth from 100% down to 10% */ for (allocation =0 ; allocation <ALLOCATION_MAX /ALLOCATION_STEP ; allocation++) { -unsigned long avg_bw_imc, avg_bw_resc; +long avg_bw_imc, avg_bw_resc;unsigned long sum_bw_imc =0 , sum_bw_resc =0 ;nit: since you are touching this line, could you please move it down one line to establish reverse fir order?
Quoted 7 lines
tools/testing/selftests/resctrl/mba_test.c +0
-0int avg_diff_per;float avg_diff;tools/testing/selftests/resctrl/mbm_test.c +0
-0tools/testing/selftests/resctrl/mbm_test.c line 23
Quoted 8 lines
tools/testing/selftests/resctrl/mbm_test.c +1
-1@@ -17,7 +17,7 @@static int show_bw_info (unsigned long *bw_imc,unsigned long *bw_resc,size_t span) { -unsigned long avg_bw_imc =0 , avg_bw_resc =0 ; +long avg_bw_imc =0 , avg_bw_resc =0 ;unsigned long sum_bw_imc =0 , sum_bw_resc =0 ;int runs, ret, avg_diff_per;float avg_diff =0 ;Same nit here about reverse fir order.
Quoted 4 lines
Thank you very much for sticking with this to fix the warnings. With the nitpicks addressed you can add:
| Reviewed-by: Reinette Chatre <[email protected]>
Sure, I'll post another one with those two changes and your rb, thanks for the review(s)!
thanks,
Signature · 2 lines
John Hubbard NVIDIA