From 2aa5f8808d1d83c58ced64c89c14bdd237135795 Mon Sep 17 00:00:00 2001
From: Robin Dapp <rdapp@linux.ibm.com>
Date: Tue, 6 Sep 2022 08:56:04 +0200
Subject: [PATCH] testsuite/s390: Add -mzarch to ifcvt test cases.

Add missing -mzarch to ifcvt test cases.

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 change
	long into long long.
---
 gcc/testsuite/gcc.target/s390/ifcvt-one-insn-bool.c |  2 +-
 gcc/testsuite/gcc.target/s390/ifcvt-one-insn-char.c |  2 +-
 .../gcc.target/s390/ifcvt-two-insns-bool.c          |  2 +-
 gcc/testsuite/gcc.target/s390/ifcvt-two-insns-int.c |  2 +-
 .../gcc.target/s390/ifcvt-two-insns-long.c          | 13 +++++++------
 5 files changed, 11 insertions(+), 10 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..51af4985247a 100644
--- a/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c
+++ b/gcc/testsuite/gcc.target/s390/ifcvt-two-insns-long.c
@@ -1,19 +1,20 @@
 /* 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 "locghih\t%r.?,1" } } */
 /* { dg-final { scan-assembler "locgrh\t.*" } } */
+
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
 
 __attribute__ ((noinline))
-long foo (long *a, unsigned long n)
+long long foo (long long *a, unsigned long long n)
 {
-  long min = 999999;
-  long bla = 0;
+  long long min = 999999;
+  long long bla = 0;
   for (int i = 0; i < n; i++)
     {
       if (a[i] < min)
@@ -30,9 +31,9 @@ long foo (long *a, unsigned long n)
 
 int main()
 {
-  long a[] = {2, 1, -13, LONG_MAX, LONG_MIN, 0};
+  long long a[] = {2, 1, -13, LONG_MAX, LONG_MIN, 0};
 
-  long res = foo (a, sizeof (a) / sizeof (a[0]));
+  long long res = foo (a, sizeof (a) / sizeof (a[0]));
 
   assert (res == (LONG_MIN + 1));
 }
-- 
2.47.2