[gcc r13-6448] s390: Fix ifcvt test cases.

Robin Dapp rdapp@gcc.gnu.org
Fri Mar 3 15:06:53 GMT 2023


https://gcc.gnu.org/g:0412a2358a169875c8a295304f2d1085c79fe392

commit r13-6448-g0412a2358a169875c8a295304f2d1085c79fe392
Author: Robin Dapp <rdapp@linux.ibm.com>
Date:   Wed Feb 1 19:33:35 2023 +0100

    s390: Fix ifcvt test cases.
    
    We seem to flip flop between the "high" and "not low" variants of load on
    condition.  Accept both in the affected test cases.
    
    gcc/testsuite/ChangeLog:
    
            * gcc.target/s390/ifcvt-two-insns-bool.c: Allow "high" and
            "not low or equal" load on condition variant.
            * gcc.target/s390/ifcvt-two-insns-int.c: Dito.
            * gcc.target/s390/ifcvt-two-insns-long.c: Dito.

Diff:
---
 gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c | 4 ++--
 gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c  | 4 ++--
 gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c
index 1027ddceb93..a56bc467614 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c
@@ -3,8 +3,8 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */
 
-/* { dg-final { scan-assembler "lochih\t%r.?,1" } } */
-/* { dg-final { scan-assembler "locrh\t.*" } } */
+/* { dg-final { scan-assembler "lochi(?:h|nle)\t%r.?,1" } } */
+/* { dg-final { scan-assembler "locr(?:h|nle)\t.*" } } */
 #include <stdbool.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c
index fc6946f2466..64b8a732290 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c
@@ -3,8 +3,8 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */
 
-/* { dg-final { scan-assembler "lochih\t%r.?,1" } } */
-/* { dg-final { scan-assembler "locrh\t.*" } } */
+/* { dg-final { scan-assembler "lochi(h|nle)\t%r.?,1" } } */
+/* { dg-final { scan-assembler "locr(?:h|nle)\t.*" } } */
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c
index 51af4985247..f2d784e762a 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c
@@ -3,8 +3,8 @@
 /* { dg-do run } */
 /* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */
 
-/* { dg-final { scan-assembler "locghih\t%r.?,1" } } */
-/* { dg-final { scan-assembler "locgrh\t.*" } } */
+/* { dg-final { scan-assembler "locghi(?:h|nle)\t%r.?,1" } } */
+/* { dg-final { scan-assembler "locgr(?:h|nle)\t.*" } } */
 
 #include <limits.h>
 #include <stdio.h>


More information about the Gcc-cvs mailing list