[SystemZ] Fix matching another pattern for nxgrk (PR44496)

SystemZDAGToDAGISel::Select will attempt to split logical instruction
with a large immediate constant.  This must not happen if the result
matches one of the z15 combined operations, so the code checks for
those.  However, one of them was missed, causing invalid code to
be generated in the test case for PR44496.
This commit is contained in:
Ulrich Weigand 2020-01-09 19:03:16 +01:00
parent 7bbd4076c1
commit b51fa8670f
2 changed files with 29 additions and 2 deletions

View File

@ -1497,8 +1497,9 @@ void SystemZDAGToDAGISel::Select(SDNode *Node) {
if (ChildOpcode == ISD::AND || ChildOpcode == ISD::OR ||
ChildOpcode == ISD::XOR)
break;
// Check whether this expression matches OR-with-complement.
if (Opcode == ISD::OR && ChildOpcode == ISD::XOR) {
// Check whether this expression matches OR-with-complement
// (or matches an alternate pattern for NXOR).
if (ChildOpcode == ISD::XOR) {
auto Op0 = Node->getOperand(0);
if (auto *Op0Op1 = dyn_cast<ConstantSDNode>(Op0->getOperand(1)))
if (Op0Op1->getZExtValue() == (uint64_t)-1)

View File

@ -124,3 +124,29 @@ define i64 @f12(i64 %a) {
ret i64 %ret
}
; NXOR 32-bit (alternate match).
define i32 @f13(i32 %a) {
; CHECK-LABEL: f13:
; CHECK: lhi [[REG:%r[0-5]]], -256
; CHECK: nxrk %r2, %r2, [[REG]]
; CHECK: br %r14
; Use an opaque const so the pattern doesn't get optimized away early.
%const = bitcast i32 -256 to i32
%neg = xor i32 %a, -1
%ret = xor i32 %neg, %const
ret i32 %ret
}
; NXOR 64-bit (alternate match).
define i64 @f14(i64 %a) {
; CHECK-LABEL: f14:
; CHECK: lghi [[REG:%r[0-5]]], -256
; CHECK: nxgrk %r2, %r2, [[REG]]
; CHECK: br %r14
; Use an opaque const so the pattern doesn't get optimized away early.
%const = bitcast i64 -256 to i64
%neg = xor i64 %a, -1
%ret = xor i64 %neg, %const
ret i64 %ret
}