selftests/resctrl: Pass the real number of tests to show_cache_info()

Results include warm-up test which is discarded before passing the sum
to show_cache_info(). show_cache_info() handles this by subtracting one
from the number of tests in divisor. It is a trappy construct to have
sum and number of tests parameters to disagree like this.

A more logical place for subtracting the skipped tests is where the sum
is calculated so move it there. Pass the correct number of tests to
show_cache_info() so it can be used directly as the divisor for
calculating the average.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Tested-by: Babu Moger <babu.moger@amd.com>
Tested-by: Shaopeng Tan (Fujitsu) <tan.shaopeng@fujitsu.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c
index 9c0e4ce4f28e0163cd9173487c27ecd2a981b73d..18ebd1324cb3b491e8812d6b5114c16bf3455293 100644 (file)
--- a/tools/testing/selftests/resctrl/cache.c
+++ b/tools/testing/selftests/resctrl/cache.c
@@ -294,7 +294,7 @@ int show_cache_info(unsigned long sum_llc_val, int no_of_bits,
        long avg_diff = 0;
        int ret;
 
-       avg_llc_val = sum_llc_val / (num_of_runs - 1);
+       avg_llc_val = sum_llc_val / num_of_runs;
        avg_diff = (long)abs(cache_span - avg_llc_val);
        diff_percent = ((float)cache_span - avg_llc_val) / cache_span * 100;
 

diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c
index ed6c8e64ad1160e07c15c9a141553a7de64aeba7..3848dfb46aba4f92b014cfedcfff1a8b3560d273 100644 (file)
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -77,7 +77,7 @@ static int check_results(struct resctrl_val_param *param)
        no_of_bits = count_bits(param->mask);
 
        return show_cache_info(sum_llc_perf_miss, no_of_bits, param->span / 64,
-                              MAX_DIFF, MAX_DIFF_PERCENT, NUM_OF_RUNS,
+                              MAX_DIFF, MAX_DIFF_PERCENT, runs - 1,
                               get_vendor() == ARCH_INTEL, false);
 }
 

diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c
index 0ac9d6bbd13d6d607420e3cfee4cc719e3ba80df..cb2197647c6cdf0e27b4fd61aa8764910a08d573 100644 (file)
--- a/tools/testing/selftests/resctrl/cmt_test.c
+++ b/tools/testing/selftests/resctrl/cmt_test.c
@@ -59,7 +59,7 @@ static int check_results(struct resctrl_val_param *param, int no_of_bits)
        fclose(fp);
 
        return show_cache_info(sum_llc_occu_resc, no_of_bits, param->span,
-                              MAX_DIFF, MAX_DIFF_PERCENT, NUM_OF_RUNS,
+                              MAX_DIFF, MAX_DIFF_PERCENT, runs - 1,
                               true, true);
 }