kselftest/arm64: Cover ZT in the FP stress test

Hook up the newly added zt-test program in the FPSIMD stress tests, start
a copy per CPU when SME2 is supported.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20221208-arm64-sme2-v4-15-f2fa0aef982f@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/tools/testing/selftests/arm64/fp/fp-stress.c b/tools/testing/selftests/arm64/fp/fp-stress.c
index f8b2f41aac36feeea601715112677208cedd9a1a..520385fcfede6b16745a8244cab1eeda66e3306a 100644 (file)
--- a/tools/testing/selftests/arm64/fp/fp-stress.c
+++ b/tools/testing/selftests/arm64/fp/fp-stress.c
@@ -370,6 +370,19 @@ static void start_za(struct child_data *child, int vl, int cpu)
        ksft_print_msg("Started %s\n", child->name);
 }
 
+static void start_zt(struct child_data *child, int cpu)
+{
+       int ret;
+
+       ret = asprintf(&child->name, "ZT-%d", cpu);
+       if (ret == -1)
+               ksft_exit_fail_msg("asprintf() failed\n");
+
+       child_start(child, "./zt-test");
+
+       ksft_print_msg("Started %s\n", child->name);
+}
+
 static void probe_vls(int vls[], int *vl_count, int set_vl)
 {
        unsigned int vq;
@@ -426,6 +439,7 @@ int main(int argc, char **argv)
        bool all_children_started = false;
        int seen_children;
        int sve_vls[MAX_VLS], sme_vls[MAX_VLS];
+       bool have_sme2;
        struct sigaction sa;
 
        while ((c = getopt_long(argc, argv, "t:", options, NULL)) != -1) {
@@ -458,6 +472,13 @@ int main(int argc, char **argv)
                sme_vl_count = 0;
        }
 
+       if (getauxval(AT_HWCAP2) & HWCAP2_SME2) {
+               tests += cpus;
+               have_sme2 = true;
+       } else {
+               have_sme2 = false;
+       }
+
        /* Force context switching if we only have FPSIMD */
        if (!sve_vl_count && !sme_vl_count)
                fpsimd_per_cpu = 2;
@@ -468,8 +489,9 @@ int main(int argc, char **argv)
        ksft_print_header();
        ksft_set_plan(tests);
 
-       ksft_print_msg("%d CPUs, %d SVE VLs, %d SME VLs\n",
-                      cpus, sve_vl_count, sme_vl_count);
+       ksft_print_msg("%d CPUs, %d SVE VLs, %d SME VLs, SME2 %s\n",
+                      cpus, sve_vl_count, sme_vl_count,
+                      have_sme2 ? "present" : "absent");
 
        if (timeout > 0)
                ksft_print_msg("Will run for %ds\n", timeout);
@@ -527,6 +549,9 @@ int main(int argc, char **argv)
                        start_ssve(&children[num_children++], sme_vls[j], i);
                        start_za(&children[num_children++], sme_vls[j], i);
                }
+
+               if (have_sme2)
+                       start_zt(&children[num_children++], i);
        }
 
        /*