Skip to content

Commit b76c85b

Browse files
committed
TargetLowering: fix an infinite DAG combine in SimplifySETCC
TargetLowering::SimplifySetCC wants to swap the operands of a SETCC to canonicalize the constant to the RHS. The bug here was that it did so whether or not the RHS was already a constant, leading to an infinite loop. rdar://111847838 Differential revision: https://reviews.llvm.org/D155095
1 parent f03dbdb commit b76c85b

2 files changed

Lines changed: 35 additions & 2 deletions

File tree

llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4227,12 +4227,12 @@ SDValue TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
42274227
bool N1ConstOrSplat =
42284228
isConstOrConstSplat(N1, /*AllowUndefs*/ false, /*AllowTruncate*/ true);
42294229

4230-
// Ensure that the constant occurs on the RHS and fold constant comparisons.
4230+
// Canonicalize toward having the constant on the RHS.
42314231
// TODO: Handle non-splat vector constants. All undef causes trouble.
42324232
// FIXME: We can't yet fold constant scalable vector splats, so avoid an
42334233
// infinite loop here when we encounter one.
42344234
ISD::CondCode SwappedCC = ISD::getSetCCSwappedOperands(Cond);
4235-
if (N0ConstOrSplat && (!OpVT.isScalableVector() || !N1ConstOrSplat) &&
4235+
if (N0ConstOrSplat && !N1ConstOrSplat && !OpVT.isScalableVector() &&
42364236
(DCI.isBeforeLegalizeOps() ||
42374237
isCondCodeLegal(SwappedCC, N0.getSimpleValueType())))
42384238
return DAG.getSetCC(dl, VT, N1, N0, SwappedCC);
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc < %s -mtriple=arm64-apple-ios --global-isel=0 | FileCheck %s
3+
4+
target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
5+
target triple = "arm64-apple-ios"
6+
7+
declare void @llvm.memset.p0.i64(ptr nocapture writeonly, i8, i64, i1 immarg)
8+
9+
; TargetLowering::SimplifySetCC wants to swap the operands of a SETCC to
10+
; canonicalize the constant to the RHS. The bug here was that it did so whether
11+
; or not the RHS was already a constant, leading to an infinite loop.
12+
define <16 x i1> @setcc_swap_infloop(ptr %arg) {
13+
; CHECK-LABEL: setcc_swap_infloop:
14+
; CHECK: ; %bb.0:
15+
; CHECK-NEXT: mov x8, xzr
16+
; CHECK-NEXT: mov w9, #16 ; =0x10
17+
; CHECK-NEXT: movi.16b v1, #1
18+
; CHECK-NEXT: ldr q0, [x8]
19+
; CHECK-NEXT: cmeq.16b v2, v1, #0
20+
; CHECK-NEXT: str q1, [x8]
21+
; CHECK-NEXT: cmeq.16b v0, v0, #0
22+
; CHECK-NEXT: str q1, [x9]
23+
; CHECK-NEXT: orr.16b v0, v0, v2
24+
; CHECK-NEXT: ret
25+
call void @llvm.memset.p0.i64(ptr nonnull null, i8 1, i64 32, i1 false)
26+
%v = getelementptr inbounds i8, ptr null, i64 16
27+
%v14 = load <16 x i8>, ptr undef, align 32
28+
%v15 = icmp eq <16 x i8> %v14, zeroinitializer
29+
%v16 = load <16 x i8>, ptr %v, align 16
30+
%v17 = icmp eq <16 x i8> %v16, zeroinitializer
31+
%v20 = or <16 x i1> %v15, %v17
32+
ret <16 x i1> %v20
33+
}

0 commit comments

Comments
 (0)