[llvm] cfb88ee - [StrictFP][IPSCCP] Constant fold intrinsics with metadata arguments
Kevin P. Neal via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 24 08:43:33 PDT 2022
Author: Kevin P. Neal
Date: 2022-10-24T11:43:20-04:00
New Revision: cfb88ee3ba703ed0c469bb09dfe1cc9235579dfc
URL: https://github.com/llvm/llvm-project/commit/cfb88ee3ba703ed0c469bb09dfe1cc9235579dfc
DIFF: https://github.com/llvm/llvm-project/commit/cfb88ee3ba703ed0c469bb09dfe1cc9235579dfc.diff
LOG: [StrictFP][IPSCCP] Constant fold intrinsics with metadata arguments
This teaches the SCCP Solver how to constant fold more intrinsics. Constant
folding appears to be just as good as D115737 but much, much lower in code
change impact as suggested by nikic.
The constrained floating-point intrinsics all take at least one metadata
argument and were the motivation for the change.
Differential Revision: https://reviews.llvm.org/D136466
Added:
Modified:
llvm/lib/Transforms/Utils/SCCPSolver.cpp
llvm/test/Transforms/SCCP/strictfp-phis-fcmp.ll
llvm/test/Transforms/SCCP/strictfp-phis-fcmps.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Utils/SCCPSolver.cpp b/llvm/lib/Transforms/Utils/SCCPSolver.cpp
index 09a83f1ea094d..044e46f09821f 100644
--- a/llvm/lib/Transforms/Utils/SCCPSolver.cpp
+++ b/llvm/lib/Transforms/Utils/SCCPSolver.cpp
@@ -1191,6 +1191,8 @@ void SCCPInstVisitor::handleCallOverdefined(CallBase &CB) {
for (const Use &A : CB.args()) {
if (A.get()->getType()->isStructTy())
return markOverdefined(&CB); // Can't handle struct args.
+ if (A.get()->getType()->isMetadataTy())
+ continue; // Carried in CB, not allowed in Operands.
ValueLatticeElement State = getValueState(A);
if (State.isUnknownOrUndef())
diff --git a/llvm/test/Transforms/SCCP/strictfp-phis-fcmp.ll b/llvm/test/Transforms/SCCP/strictfp-phis-fcmp.ll
index fe17cd353e02e..3bf7d9578b560 100644
--- a/llvm/test/Transforms/SCCP/strictfp-phis-fcmp.ll
+++ b/llvm/test/Transforms/SCCP/strictfp-phis-fcmp.ll
@@ -8,8 +8,7 @@ define i1 @float.1.defaultenv(i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.ignore") #[[ATTR0:[0-9]+]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 true
;
entry:
@@ -32,8 +31,7 @@ define i1 @float.1.maytrap(i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.maytrap") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 true
;
entry:
@@ -56,8 +54,8 @@ define i1 @float.1.strict(i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.strict") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.strict") #[[ATTR0:[0-9]+]]
+; CHECK-NEXT: ret i1 true
;
entry:
@@ -224,8 +222,7 @@ define i1 @float.4_unreachable.defaultenv(float %f, i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"une", metadata !"fpexcept.ignore") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 false
;
entry:
@@ -250,8 +247,7 @@ define i1 @float.4_unreachable.maytrap(float %f, i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"une", metadata !"fpexcept.maytrap") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 false
;
entry:
@@ -278,7 +274,7 @@ define i1 @float.4_unreachable.strict(float %f, i1 %cmp) #0 {
; CHECK-NEXT: br label [[END]]
; CHECK: end:
; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmp.f32(float 1.000000e+00, float 1.000000e+00, metadata !"une", metadata !"fpexcept.strict") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 false
;
entry:
diff --git a/llvm/test/Transforms/SCCP/strictfp-phis-fcmps.ll b/llvm/test/Transforms/SCCP/strictfp-phis-fcmps.ll
index 61e20ef70b0ec..6db1f47ccca99 100644
--- a/llvm/test/Transforms/SCCP/strictfp-phis-fcmps.ll
+++ b/llvm/test/Transforms/SCCP/strictfp-phis-fcmps.ll
@@ -8,8 +8,7 @@ define i1 @float.1.defaultenv(i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.ignore") #[[ATTR0:[0-9]+]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 true
;
entry:
@@ -32,8 +31,7 @@ define i1 @float.1.maytrap(i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.maytrap") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 true
;
entry:
@@ -56,8 +54,8 @@ define i1 @float.1.strict(i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.strict") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"ueq", metadata !"fpexcept.strict") #[[ATTR0:[0-9]+]]
+; CHECK-NEXT: ret i1 true
;
entry:
@@ -224,8 +222,7 @@ define i1 @float.4_unreachable.defaultenv(float %f, i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"une", metadata !"fpexcept.ignore") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 false
;
entry:
@@ -250,8 +247,7 @@ define i1 @float.4_unreachable.maytrap(float %f, i1 %cmp) #0 {
; CHECK: if.true:
; CHECK-NEXT: br label [[END]]
; CHECK: end:
-; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"une", metadata !"fpexcept.maytrap") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 false
;
entry:
@@ -278,7 +274,7 @@ define i1 @float.4_unreachable.strict(float %f, i1 %cmp) #0 {
; CHECK-NEXT: br label [[END]]
; CHECK: end:
; CHECK-NEXT: [[C:%.*]] = call i1 @llvm.experimental.constrained.fcmps.f32(float 1.000000e+00, float 1.000000e+00, metadata !"une", metadata !"fpexcept.strict") #[[ATTR0]]
-; CHECK-NEXT: ret i1 [[C]]
+; CHECK-NEXT: ret i1 false
;
entry:
More information about the llvm-commits
mailing list