diff options
| -rw-r--r-- | llvm/lib/Analysis/LazyValueInfo.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Transforms/CorrelatedValuePropagation/basic.ll | 6 | ||||
| -rw-r--r-- | llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp index 9ae31d1..b8bc811 100644 --- a/llvm/lib/Analysis/LazyValueInfo.cpp +++ b/llvm/lib/Analysis/LazyValueInfo.cpp @@ -1069,14 +1069,14 @@ static bool matchICmpOperand(APInt &Offset, Value *LHS, Value *Val, // Handle range checking idiom produced by InstCombine. We will subtract the // offset from the allowed range for RHS in this case. const APInt *C; - if (match(LHS, m_Add(m_Specific(Val), m_APInt(C)))) { + if (match(LHS, m_AddLike(m_Specific(Val), m_APInt(C)))) { Offset = *C; return true; } // Handle the symmetric case. This appears in saturation patterns like // (x == 16) ? 16 : (x + 1). - if (match(Val, m_Add(m_Specific(LHS), m_APInt(C)))) { + if (match(Val, m_AddLike(m_Specific(LHS), m_APInt(C)))) { Offset = -*C; return true; } diff --git a/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll b/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll index 94de012..701d867 100644 --- a/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll +++ b/llvm/test/Transforms/CorrelatedValuePropagation/basic.ll @@ -879,8 +879,7 @@ define i1 @clamp_high1_or(i32 noundef %a) { ; CHECK-NEXT: [[SEL_CMP:%.*]] = icmp eq i32 [[A]], 5 ; CHECK-NEXT: [[ADD:%.*]] = or disjoint i32 [[A]], 1 ; CHECK-NEXT: [[SEL:%.*]] = select i1 [[SEL_CMP]], i32 5, i32 [[ADD]] -; CHECK-NEXT: [[RES:%.*]] = icmp eq i32 [[SEL]], 6 -; CHECK-NEXT: ret i1 [[RES]] +; CHECK-NEXT: ret i1 false ; CHECK: out: ; CHECK-NEXT: ret i1 false ; @@ -935,8 +934,7 @@ define i1 @clamp_high2_or_disjoint(i32 noundef %a) { ; CHECK-NEXT: [[SEL_CMP:%.*]] = icmp ne i32 [[A]], 5 ; CHECK-NEXT: [[ADD:%.*]] = or disjoint i32 [[A]], 1 ; CHECK-NEXT: [[SEL:%.*]] = select i1 [[SEL_CMP]], i32 [[ADD]], i32 5 -; CHECK-NEXT: [[RES:%.*]] = icmp eq i32 [[SEL]], 6 -; CHECK-NEXT: ret i1 [[RES]] +; CHECK-NEXT: ret i1 false ; CHECK: out: ; CHECK-NEXT: ret i1 false ; diff --git a/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll b/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll index b534e3f..b5337b9 100644 --- a/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll +++ b/llvm/test/Transforms/CorrelatedValuePropagation/icmp.ll @@ -593,8 +593,7 @@ define i1 @test_assume_cmp_with_offset_or(i64 %idx, i1 %other) { ; CHECK-NEXT: [[CMP1:%.*]] = icmp ugt i64 [[IDX_OFF1]], 10 ; CHECK-NEXT: br i1 [[CMP1]], label [[T:%.*]], label [[F:%.*]] ; CHECK: T: -; CHECK-NEXT: [[CMP3:%.*]] = icmp ugt i64 [[IDX]], 2 -; CHECK-NEXT: ret i1 [[CMP3]] +; CHECK-NEXT: ret i1 true ; CHECK: F: ; CHECK-NEXT: ret i1 [[CMP2:%.*]] ; |