Hi,
this adds a missing -mzarch to some ifcvt test cases.
Going to commit this as obvious in some days barring objections.
Regards
Robin
gcc/testsuite/ChangeLog:
* gcc.target/s390/ifcvt-one-insn-bool.c: Add -mzarch.
* gcc.target/s390/ifcvt-one-insn-char.c: Dito.
* gcc.target/s390/ifcvt-two-insns-bool.c: Dito.
* gcc.target/s390/ifcvt-two-insns-int.c: Dito.
* gcc.target/s390/ifcvt-two-insns-long.c: Add -mzarch and split
scan into lp64 and ! lp64.
---
gcc/testsuite/gcc.target/s390/ifcvt-one-insn-bool.c | 2 +-
gcc/testsuite/gcc.target/s390/ifcvt-one-insn-char.c | 2 +-
gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c | 2 +-
gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c | 2 +-
gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c | 8 ++++++--
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-bool.c
b/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-bool.c
index 0a96b71f4583..0c8c2f879a69 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-bool.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-bool.c
@@ -1,7 +1,7 @@
/* Check load on condition for bool. */
/* { dg-do compile { target { s390*-*-* } } } */
-/* { dg-options "-O2 -march=z13" } */
+/* { dg-options "-O2 -march=z13 -mzarch" } */
/* { dg-final { scan-assembler "lochinh\t%r.?,1" } } */
#include <stdbool.h>
diff --git a/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-char.c
b/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-char.c
index 9c3d041618b3..8c8e0ae02dfc 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-char.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-one-insn-char.c
@@ -1,7 +1,7 @@
/* Check load on condition for global char. */
/* { dg-do compile { target { s390*-*-* } } } */
-/* { dg-options "-O2 -march=z13" } */
+/* { dg-options "-O2 -march=z13 -mzarch" } */
/* { dg-final { scan-assembler "locrnh\t%r.?,%r.?" } } */
#include <stdbool.h>
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 df0416a71d83..1027ddceb935 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-bool.c
@@ -1,7 +1,7 @@
/* Check if conversion for two instructions. */
/* { dg-do run } */
-/* { dg-options "-O2 -march=z13 --save-temps" } */
+/* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */
/* { dg-final { scan-assembler "lochih\t%r.?,1" } } */
/* { dg-final { scan-assembler "locrh\t.*" } } */
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 181173b91e97..fc6946f2466d 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c
@@ -1,7 +1,7 @@
/* Check if conversion for two instructions. */
/* { dg-do run } */
-/* { dg-options "-O2 -march=z13 --save-temps" } */
+/* { dg-options "-O2 -march=z13 -mzarch --save-temps" } */
/* { dg-final { scan-assembler "lochih\t%r.?,1" } } */
/* { dg-final { scan-assembler "locrh\t.*" } } */
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 c66ef6cfdead..09f6899f01ec 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,12 @@
/* { dg-do run } */
/* { dg-options "-O2 -march=z13 --save-temps" } */
-/* { dg-final { scan-assembler "locghih\t%r.?,1" } } */
-/* { dg-final { scan-assembler "locgrh\t.*" } } */
+/* { dg-final { scan-assembler "locghih\t%r.?,1" } { target { lp64 } } */
+/* { dg-final { scan-assembler "locgrh\t.*" } { target { lp64 } } */
+
+/* { dg-final { scan-assembler "lochih\t%r.?,1" } { target { ! lp64 } } */
+/* { dg-final { scan-assembler "locrh\t.*" } { target { ! lp64 } } */
+
#include <limits.h>
#include <stdio.h>
#include <assert.h>
--
2.31.1
