[llvm] 138fcc5 - [IRBuilder] Migrate icmp-folding to value-based FoldICmp.
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 12 04:38:06 PST 2022
Author: Florian Hahn
Date: 2022-01-12T12:37:46Z
New Revision: 138fcc5f7619b5f066b9529a41ed47695149c8df
URL: https://github.com/llvm/llvm-project/commit/138fcc5f7619b5f066b9529a41ed47695149c8df
DIFF: https://github.com/llvm/llvm-project/commit/138fcc5f7619b5f066b9529a41ed47695149c8df.diff
LOG: [IRBuilder] Migrate icmp-folding to value-based FoldICmp.
Depends on D116935.
Reviewed By: nikic, lebedev.ri
Differential Revision: https://reviews.llvm.org/D116969
Added:
Modified:
llvm/include/llvm/Analysis/InstSimplifyFolder.h
llvm/include/llvm/Analysis/TargetFolder.h
llvm/include/llvm/IR/ConstantFolder.h
llvm/include/llvm/IR/IRBuilder.h
llvm/include/llvm/IR/IRBuilderFolder.h
llvm/include/llvm/IR/NoFolder.h
llvm/test/Transforms/LoopVectorize/pr30654-phiscev-sext-trunc.ll
llvm/test/Transforms/LoopVersioning/lcssa.ll
Removed:
################################################################################
diff --git a/llvm/include/llvm/Analysis/InstSimplifyFolder.h b/llvm/include/llvm/Analysis/InstSimplifyFolder.h
index cd8028d65a643..28d88db2a839b 100644
--- a/llvm/include/llvm/Analysis/InstSimplifyFolder.h
+++ b/llvm/include/llvm/Analysis/InstSimplifyFolder.h
@@ -56,6 +56,10 @@ class InstSimplifyFolder final : public IRBuilderFolder {
return SimplifyOrInst(LHS, RHS, SQ);
}
+ Value *FoldICmp(CmpInst::Predicate P, Value *LHS, Value *RHS) const override {
+ return SimplifyICmpInst(P, LHS, RHS, SQ);
+ }
+
//===--------------------------------------------------------------------===//
// Binary Operators
//===--------------------------------------------------------------------===//
@@ -239,10 +243,6 @@ class InstSimplifyFolder final : public IRBuilderFolder {
// Compare Instructions
//===--------------------------------------------------------------------===//
- Value *CreateICmp(CmpInst::Predicate P, Constant *LHS,
- Constant *RHS) const override {
- return ConstFolder.CreateICmp(P, LHS, RHS);
- }
Value *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const override {
return ConstFolder.CreateFCmp(P, LHS, RHS);
diff --git a/llvm/include/llvm/Analysis/TargetFolder.h b/llvm/include/llvm/Analysis/TargetFolder.h
index 0b9e3e99cf134..d1f5d003e8a49 100644
--- a/llvm/include/llvm/Analysis/TargetFolder.h
+++ b/llvm/include/llvm/Analysis/TargetFolder.h
@@ -65,6 +65,14 @@ class TargetFolder final : public IRBuilderFolder {
return nullptr;
}
+ Value *FoldICmp(CmpInst::Predicate P, Value *LHS, Value *RHS) const override {
+ auto *LC = dyn_cast<Constant>(LHS);
+ auto *RC = dyn_cast<Constant>(RHS);
+ if (LC && RC)
+ return ConstantExpr::getCompare(P, LC, RC);
+ return nullptr;
+ }
+
//===--------------------------------------------------------------------===//
// Binary Operators
//===--------------------------------------------------------------------===//
@@ -247,10 +255,6 @@ class TargetFolder final : public IRBuilderFolder {
// Compare Instructions
//===--------------------------------------------------------------------===//
- Constant *CreateICmp(CmpInst::Predicate P, Constant *LHS,
- Constant *RHS) const override {
- return Fold(ConstantExpr::getCompare(P, LHS, RHS));
- }
Constant *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const override {
return Fold(ConstantExpr::getCompare(P, LHS, RHS));
diff --git a/llvm/include/llvm/IR/ConstantFolder.h b/llvm/include/llvm/IR/ConstantFolder.h
index ee248bc6056a7..b8450d422ab9d 100644
--- a/llvm/include/llvm/IR/ConstantFolder.h
+++ b/llvm/include/llvm/IR/ConstantFolder.h
@@ -54,6 +54,14 @@ class ConstantFolder final : public IRBuilderFolder {
return nullptr;
}
+ Value *FoldICmp(CmpInst::Predicate P, Value *LHS, Value *RHS) const override {
+ auto *LC = dyn_cast<Constant>(LHS);
+ auto *RC = dyn_cast<Constant>(RHS);
+ if (LC && RC)
+ return ConstantExpr::getCompare(P, LC, RC);
+ return nullptr;
+ }
+
//===--------------------------------------------------------------------===//
// Binary Operators
//===--------------------------------------------------------------------===//
@@ -254,11 +262,6 @@ class ConstantFolder final : public IRBuilderFolder {
// Compare Instructions
//===--------------------------------------------------------------------===//
- Constant *CreateICmp(CmpInst::Predicate P, Constant *LHS,
- Constant *RHS) const override {
- return ConstantExpr::getCompare(P, LHS, RHS);
- }
-
Constant *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const override {
return ConstantExpr::getCompare(P, LHS, RHS);
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index a40eb647f7f05..6fae6044dc18b 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -2219,9 +2219,8 @@ class IRBuilderBase {
Value *CreateICmp(CmpInst::Predicate P, Value *LHS, Value *RHS,
const Twine &Name = "") {
- if (auto *LC = dyn_cast<Constant>(LHS))
- if (auto *RC = dyn_cast<Constant>(RHS))
- return Insert(Folder.CreateICmp(P, LC, RC), Name);
+ if (auto *V = Folder.FoldICmp(P, LHS, RHS))
+ return V;
return Insert(new ICmpInst(P, LHS, RHS), Name);
}
diff --git a/llvm/include/llvm/IR/IRBuilderFolder.h b/llvm/include/llvm/IR/IRBuilderFolder.h
index 9107dff89202c..ff9bf4ff72c2e 100644
--- a/llvm/include/llvm/IR/IRBuilderFolder.h
+++ b/llvm/include/llvm/IR/IRBuilderFolder.h
@@ -35,6 +35,9 @@ class IRBuilderFolder {
bool HasNSW = false) const = 0;
virtual Value *FoldOr(Value *LHS, Value *RHS) const = 0;
+ virtual Value *FoldICmp(CmpInst::Predicate P, Value *LHS,
+ Value *RHS) const = 0;
+
//===--------------------------------------------------------------------===//
// Binary Operators
//===--------------------------------------------------------------------===//
@@ -121,8 +124,6 @@ class IRBuilderFolder {
// Compare Instructions
//===--------------------------------------------------------------------===//
- virtual Value *CreateICmp(CmpInst::Predicate P, Constant *LHS,
- Constant *RHS) const = 0;
virtual Value *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
Constant *RHS) const = 0;
diff --git a/llvm/include/llvm/IR/NoFolder.h b/llvm/include/llvm/IR/NoFolder.h
index e8a17b78742fe..d4a9198c368ee 100644
--- a/llvm/include/llvm/IR/NoFolder.h
+++ b/llvm/include/llvm/IR/NoFolder.h
@@ -50,6 +50,10 @@ class NoFolder final : public IRBuilderFolder {
Value *FoldOr(Value *LHS, Value *RHS) const override { return nullptr; }
+ Value *FoldICmp(CmpInst::Predicate P, Value *LHS, Value *RHS) const override {
+ return nullptr;
+ }
+
//===--------------------------------------------------------------------===//
// Binary Operators
//===--------------------------------------------------------------------===//
@@ -270,11 +274,6 @@ class NoFolder final : public IRBuilderFolder {
// Compare Instructions
//===--------------------------------------------------------------------===//
- Instruction *CreateICmp(CmpInst::Predicate P,
- Constant *LHS, Constant *RHS) const override {
- return new ICmpInst(P, LHS, RHS);
- }
-
Instruction *CreateFCmp(CmpInst::Predicate P,
Constant *LHS, Constant *RHS) const override {
return new FCmpInst(P, LHS, RHS);
diff --git a/llvm/test/Transforms/LoopVectorize/pr30654-phiscev-sext-trunc.ll b/llvm/test/Transforms/LoopVectorize/pr30654-phiscev-sext-trunc.ll
index d141c2b22709d..d5625d615b492 100644
--- a/llvm/test/Transforms/LoopVectorize/pr30654-phiscev-sext-trunc.ll
+++ b/llvm/test/Transforms/LoopVectorize/pr30654-phiscev-sext-trunc.ll
@@ -177,9 +177,8 @@ define void @doit2(i32 %n, i32 %step) local_unnamed_addr {
; CHECK-NEXT: [[MUL_RESULT:%.*]] = extractvalue { i8, i1 } [[MUL]], 0
; CHECK-NEXT: [[MUL_OVERFLOW:%.*]] = extractvalue { i8, i1 } [[MUL]], 1
; CHECK-NEXT: [[TMP7:%.*]] = sub i8 0, [[MUL_RESULT]]
-; CHECK-NEXT: [[TMP8:%.*]] = icmp ult i8 [[MUL_RESULT]], 0
; CHECK-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP7]], 0
-; CHECK-NEXT: [[TMP10:%.*]] = select i1 [[TMP3]], i1 [[TMP9]], i1 [[TMP8]]
+; CHECK-NEXT: [[TMP10:%.*]] = select i1 [[TMP3]], i1 [[TMP9]], i1 false
; CHECK-NEXT: [[TMP14:%.*]] = or i1 [[TMP10]], [[MUL_OVERFLOW]]
; CHECK-NEXT: [[TMP11:%.*]] = icmp ugt i64 [[TMP0]], 255
; CHECK-NEXT: [[TMP12:%.*]] = icmp ne i8 [[TMP1]], 0
diff --git a/llvm/test/Transforms/LoopVersioning/lcssa.ll b/llvm/test/Transforms/LoopVersioning/lcssa.ll
index 4a7b120744ccf..1416b1bf600fc 100644
--- a/llvm/test/Transforms/LoopVersioning/lcssa.ll
+++ b/llvm/test/Transforms/LoopVersioning/lcssa.ll
@@ -58,12 +58,8 @@ define void @fill_no_null_opt(i8** %ls1.20, i8** %ls2.21, i8* %cse3.22) #0 {
; CHECK-NEXT: [[FOUND_CONFLICT:%.*]] = and i1 [[BOUND0]], [[BOUND1]]
; CHECK-NEXT: [[SCEVGEP3:%.*]] = getelementptr i8, i8* [[LS1_20_PROMOTED]], i64 -1
; CHECK-NEXT: [[TMP0:%.*]] = getelementptr i8, i8* [[SCEVGEP3]], i64 0
-; CHECK-NEXT: [[TMP1:%.*]] = icmp ult i8* [[TMP0]], [[SCEVGEP3]]
; CHECK-NEXT: [[TMP2:%.*]] = getelementptr i8, i8* [[LS1_20_PROMOTED]], i64 0
-; CHECK-NEXT: [[TMP3:%.*]] = icmp ult i8* [[TMP2]], [[LS1_20_PROMOTED]]
-; CHECK-NEXT: [[TMP4:%.*]] = or i1 [[TMP1]], [[TMP3]]
-; CHECK-NEXT: [[LVER_SAFE:%.*]] = or i1 [[FOUND_CONFLICT]], [[TMP4]]
-; CHECK-NEXT: br i1 [[LVER_SAFE]], label %bb1.ph.lver.orig, label %bb1.ph
+; CHECK-NEXT: br i1 [[FOUND_CONFLICT]], label %bb1.ph.lver.orig, label %bb1.ph
; CHECK: bb1.ph.lver.orig:
;
bb1.ph:
More information about the llvm-commits
mailing list