[PATCH] selftests/powerpc: Skip vmx/vsx tests on older CPUs

[Michael Ellerman]

These tests use VSX or newer VMX instructions, so need to be skipped
on older CPUs to avoid SIGILL'ing.

Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
---
 tools/testing/selftests/powerpc/math/Makefile      | 8 ++++----
 tools/testing/selftests/powerpc/math/vmx_preempt.c | 3 +++
 tools/testing/selftests/powerpc/math/vmx_signal.c  | 3 +++
 tools/testing/selftests/powerpc/math/vmx_syscall.c | 7 ++++++-
 tools/testing/selftests/powerpc/math/vsx_preempt.c | 2 ++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/powerpc/math/Makefile 
b/tools/testing/selftests/powerpc/math/Makefile
index 4e2049d2fd8d..fcc91c205984 100644
--- a/tools/testing/selftests/powerpc/math/Makefile
+++ b/tools/testing/selftests/powerpc/math/Makefile
@@ -11,9 +11,9 @@ $(OUTPUT)/fpu_syscall: fpu_asm.S
 $(OUTPUT)/fpu_preempt: fpu_asm.S
 $(OUTPUT)/fpu_signal:  fpu_asm.S
 
-$(OUTPUT)/vmx_syscall: vmx_asm.S
-$(OUTPUT)/vmx_preempt: vmx_asm.S
-$(OUTPUT)/vmx_signal: vmx_asm.S
+$(OUTPUT)/vmx_syscall: vmx_asm.S ../utils.c
+$(OUTPUT)/vmx_preempt: vmx_asm.S ../utils.c
+$(OUTPUT)/vmx_signal: vmx_asm.S ../utils.c
 
 $(OUTPUT)/vsx_preempt: CFLAGS += -mvsx
-$(OUTPUT)/vsx_preempt: vsx_asm.S
+$(OUTPUT)/vsx_preempt: vsx_asm.S ../utils.c
diff --git a/tools/testing/selftests/powerpc/math/vmx_preempt.c 
b/tools/testing/selftests/powerpc/math/vmx_preempt.c
index 2e059f154e77..6761d6ce30ec 100644
--- a/tools/testing/selftests/powerpc/math/vmx_preempt.c
+++ b/tools/testing/selftests/powerpc/math/vmx_preempt.c
@@ -57,6 +57,9 @@ int test_preempt_vmx(void)
        int i, rc, threads;
        pthread_t *tids;
 
+       // vcmpequd used in vmx_asm.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
        threads = sysconf(_SC_NPROCESSORS_ONLN) * THREAD_FACTOR;
        tids = malloc(threads * sizeof(pthread_t));
        FAIL_IF(!tids);
diff --git a/tools/testing/selftests/powerpc/math/vmx_signal.c 
b/tools/testing/selftests/powerpc/math/vmx_signal.c
index 785a48e0976f..b340a5c4e79d 100644
--- a/tools/testing/selftests/powerpc/math/vmx_signal.c
+++ b/tools/testing/selftests/powerpc/math/vmx_signal.c
@@ -96,6 +96,9 @@ int test_signal_vmx(void)
        void *rc_p;
        pthread_t *tids;
 
+       // vcmpequd used in vmx_asm.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
        threads = sysconf(_SC_NPROCESSORS_ONLN) * THREAD_FACTOR;
        tids = malloc(threads * sizeof(pthread_t));
        FAIL_IF(!tids);
diff --git a/tools/testing/selftests/powerpc/math/vmx_syscall.c 
b/tools/testing/selftests/powerpc/math/vmx_syscall.c
index 9ee293cc868e..03c78dfe3444 100644
--- a/tools/testing/selftests/powerpc/math/vmx_syscall.c
+++ b/tools/testing/selftests/powerpc/math/vmx_syscall.c
@@ -49,9 +49,14 @@ int test_vmx_syscall(void)
         * Setup an environment with much context switching
         */
        pid_t pid2;
-       pid_t pid = fork();
+       pid_t pid;
        int ret;
        int child_ret;
+
+       // vcmpequd used in vmx_asm.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
+       pid = fork();
        FAIL_IF(pid == -1);
 
        pid2 = fork();
diff --git a/tools/testing/selftests/powerpc/math/vsx_preempt.c 
b/tools/testing/selftests/powerpc/math/vsx_preempt.c
index 63de9c6e2cd3..d1601bb889d4 100644
--- a/tools/testing/selftests/powerpc/math/vsx_preempt.c
+++ b/tools/testing/selftests/powerpc/math/vsx_preempt.c
@@ -92,6 +92,8 @@ int test_preempt_vsx(void)
        int i, rc, threads;
        pthread_t *tids;
 
+       SKIP_IF(!have_hwcap(PPC_FEATURE_HAS_VSX));
+
        threads = sysconf(_SC_NPROCESSORS_ONLN) * THREAD_FACTOR;
        tids = malloc(threads * sizeof(pthread_t));
        FAIL_IF(!tids);
-- 
2.25.1