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 --git a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c
index 1027ddceb9354ab23ac213cdda36e26d0d2cd6e4..a56bc46761431bc421663514f954a3636bd18c78 100644 (file)
--- 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 fc6946f2466daaa3c25c4434930d31f59f8de93f..64b8a732290e9868aa8e6c9c521d2c75cd5f43ca 100644 (file)
--- 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 51af4985247a19bdbc1b730febc0ad30e492b6fd..f2d784e762a80760abb27aa7e7d2898fec79b7ef 100644 (file)
--- 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>