summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schulze Frielinghaus <stefansf@linux.ibm.com>2021-11-19 16:56:56 +0100
committerStefan Schulze Frielinghaus <stefansf@linux.ibm.com>2021-11-19 16:56:56 +0100
commitf47870e6a272dfe740a38422030c6c68e0fc7ff8 (patch)
tree1453130f833e11c6342db96a6b1f8a088991336e
parent487d604b6fa0f0a981eadc216d9e481d08ed7e7b (diff)
IBM Z: Fix load-and-test peephole2 condition
For a peephole2 condition variable insn points to the first matched insn. In order to refer to the second matched insn use peep2_next_insn(1) instead. gcc/ChangeLog: * config/s390/s390.md (define_peephole2): Variable insn points to the first matched insn. Use peep2_next_insn(1) to refer to the second matched insn. gcc/testsuite/ChangeLog: * gcc.target/s390/20211119.c: New test.
-rw-r--r--gcc/config/s390/s390.md2
-rw-r--r--gcc/testsuite/gcc.target/s390/20211119.c12
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 4debdcd1247..c4f92bde061 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -1003,7 +1003,7 @@
(match_operand:GPR 2 "memory_operand"))
(set (reg CC_REGNUM)
(compare (match_dup 0) (match_operand:GPR 1 "const0_operand")))]
- "s390_match_ccmode(insn, CCSmode) && TARGET_EXTIMM
+ "s390_match_ccmode (peep2_next_insn (1), CCSmode) && TARGET_EXTIMM
&& GENERAL_REG_P (operands[0])
&& satisfies_constraint_T (operands[2])
&& !contains_constant_pool_address_p (operands[2])"
diff --git a/gcc/testsuite/gcc.target/s390/20211119.c b/gcc/testsuite/gcc.target/s390/20211119.c
new file mode 100644
index 00000000000..b9d216389f4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/20211119.c
@@ -0,0 +1,12 @@
+/* { dg-do run { target { s390_useable_hw } } } */
+/* { dg-options "-Os -march=z10" } */
+signed char a;
+int b = -925974181, c;
+unsigned *d = &b;
+int *e = &c;
+int main() {
+ *e = ((217 ^ a) > 585) < *d;
+ if (c != 1)
+ __builtin_abort();
+ return 0;
+}