Several of the fp-stress test loads have blocks at the end of their barf
functions with a range of commented out options for how to exit the program
after logging an error. Comments indicate that these were intended to
interact with some long gone debugging code in the kernel. At the minute
the option selected by all the programs is to delivera SIGABRT to
themselves but there is no need to do this over a normal exit with a non
zero status. In order to facilitate running as a KVM guest replace these
repeated blocks with calls to exit_error(), this will integrate just as
well with the fp-stress harness.

Signed-off-by: Mark Brown <[email protected]>
---
 tools/testing/selftests/arm64/fp/sve-test.S | 14 +-------------
 tools/testing/selftests/arm64/fp/za-test.S  | 14 +-------------
 tools/testing/selftests/arm64/fp/zt-test.S  | 14 +-------------
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/tools/testing/selftests/arm64/fp/sve-test.S 
b/tools/testing/selftests/arm64/fp/sve-test.S
index 26efdbdd88f9..88c3220caf7c 100644
--- a/tools/testing/selftests/arm64/fp/sve-test.S
+++ b/tools/testing/selftests/arm64/fp/sve-test.S
@@ -515,19 +515,7 @@ function barf
        bl      putdecn
 #endif
 
-       mov     x8, #__NR_getpid
-       svc     #0
-// fpsimd.c acitivty log dump hack
-//     ldr     w0, =0xdeadc0de
-//     mov     w8, #__NR_exit
-//     svc     #0
-// ^ end of hack
-       mov     x1, #SIGABRT
-       mov     x8, #__NR_kill
-       svc     #0
-//     mov     x8, #__NR_exit
-//     mov     x1, #1
-//     svc     #0
+       b       exit_error
 endfunction
 
 function vl_barf
diff --git a/tools/testing/selftests/arm64/fp/za-test.S 
b/tools/testing/selftests/arm64/fp/za-test.S
index 7208bb2db9f1..4a5b4b37d475 100644
--- a/tools/testing/selftests/arm64/fp/za-test.S
+++ b/tools/testing/selftests/arm64/fp/za-test.S
@@ -326,19 +326,7 @@ function barf
        mov     x0, x13
        bl      putdecn
 
-       mov     x8, #__NR_getpid
-       svc     #0
-// fpsimd.c acitivty log dump hack
-//     ldr     w0, =0xdeadc0de
-//     mov     w8, #__NR_exit
-//     svc     #0
-// ^ end of hack
-       mov     x1, #SIGABRT
-       mov     x8, #__NR_kill
-       svc     #0
-//     mov     x8, #__NR_exit
-//     mov     x1, #1
-//     svc     #0
+       b       exit_error
 endfunction
 
 function vl_barf
diff --git a/tools/testing/selftests/arm64/fp/zt-test.S 
b/tools/testing/selftests/arm64/fp/zt-test.S
index c6cfbdeb2f0c..82a76bb2307a 100644
--- a/tools/testing/selftests/arm64/fp/zt-test.S
+++ b/tools/testing/selftests/arm64/fp/zt-test.S
@@ -256,19 +256,7 @@ function barf
        mov     x0, x13
        bl      putdecn
 
-       mov     x8, #__NR_getpid
-       svc     #0
-// fpsimd.c acitivty log dump hack
-//     ldr     w0, =0xdeadc0de
-//     mov     w8, #__NR_exit
-//     svc     #0
-// ^ end of hack
-       mov     x1, #SIGABRT
-       mov     x8, #__NR_kill
-       svc     #0
-//     mov     x8, #__NR_exit
-//     mov     x1, #1
-//     svc     #0
+       b       exit_error
 endfunction
 
 function svcr_barf

-- 
2.47.3


Reply via email to