selftests/resctrl: Disable MBA and MBM tests for AMD

For now, disable MBA and MBM tests for AMD. Deciding test pass/fail
is not clear right now. We can enable when we have some clarity.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Co-developed-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c
index c194fcc..5da4376 100644 (file)
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -64,8 +64,8 @@ static void show_cache_info(unsigned long sum_llc_perf_miss, int no_of_bits,
                                allocated_cache_lines * 100;
 
        printf("%sok CAT: cache miss rate within %d%%\n",
-              abs((int)diff_percent) > MAX_DIFF_PERCENT ? "not " : "",
-              MAX_DIFF_PERCENT);
+              !is_amd && abs((int)diff_percent) > MAX_DIFF_PERCENT ?
+              "not " : "", MAX_DIFF_PERCENT);
        tests_run++;
        printf("# Percent diff=%d\n", abs((int)diff_percent));
        printf("# Number of bits: %d\n", no_of_bits);

diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index 884e918..425cc85 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
        check_resctrlfs_support();
        filter_dmesg();
 
-       if (mbm_test) {
+       if (!is_amd && mbm_test) {
                printf("# Starting MBM BW change ...\n");
                if (!has_ben)
                        sprintf(benchmark_cmd[5], "%s", "mba");
@@ -168,7 +168,7 @@ int main(int argc, char **argv)
                tests_run++;
        }
 
-       if (mba_test) {
+       if (!is_amd && mba_test) {
                printf("# Starting MBA Schemata change ...\n");
                if (!has_ben)
                        sprintf(benchmark_cmd[1], "%d", span);