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.
This commit is contained in:
Stefan Schulze Frielinghaus 2021-11-19 16:56:56 +01:00
parent 487d604b6f
commit f47870e6a2
2 changed files with 13 additions and 1 deletions

View File

@ -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])"

View File

@ -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;
}