[llvm] b066505 - [ArgPromotion] Require noundef to copy poison-generating metadata
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 5 05:34:42 PDT 2023
Author: Nikita Popov
Date: 2023-04-05T14:34:33+02:00
New Revision: b066505d8835e263e19c13f2cd718b6eb8db4470
URL: https://github.com/llvm/llvm-project/commit/b066505d8835e263e19c13f2cd718b6eb8db4470
DIFF: https://github.com/llvm/llvm-project/commit/b066505d8835e263e19c13f2cd718b6eb8db4470.diff
LOG: [ArgPromotion] Require noundef to copy poison-generating metadata
For poison-generating (rather than IUB) metadata, only copy it
from the dominating must-exec load if it is combined with !noundef.
This could be further extended by additionall intersecting the
metadata from all loads, which does not require !noundef.
Added:
Modified:
llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
llvm/test/Transforms/ArgumentPromotion/metadata.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
index 3b1a174f5cc63..fc170299ca469 100644
--- a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
+++ b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
@@ -249,11 +249,18 @@ doPromotion(Function *F, FunctionAnalysisManager &FAM,
if (Pair.second.MustExecInstr) {
LI->setAAMetadata(Pair.second.MustExecInstr->getAAMetadata());
LI->copyMetadata(*Pair.second.MustExecInstr,
- {LLVMContext::MD_range, LLVMContext::MD_nonnull,
- LLVMContext::MD_dereferenceable,
+ {LLVMContext::MD_dereferenceable,
LLVMContext::MD_dereferenceable_or_null,
- LLVMContext::MD_align, LLVMContext::MD_noundef,
+ LLVMContext::MD_noundef,
LLVMContext::MD_nontemporal});
+ // Only transfer poison-generating metadata if we also have
+ // !noundef.
+ // TODO: Without !noundef, we could merge this metadata across
+ // all promoted loads.
+ if (LI->hasMetadata(LLVMContext::MD_noundef))
+ LI->copyMetadata(*Pair.second.MustExecInstr,
+ {LLVMContext::MD_range, LLVMContext::MD_nonnull,
+ LLVMContext::MD_align});
}
Args.push_back(LI);
ArgAttrVec.push_back(AttributeSet());
diff --git a/llvm/test/Transforms/ArgumentPromotion/metadata.ll b/llvm/test/Transforms/ArgumentPromotion/metadata.ll
index a25d7a1e8ae31..b3f9fb0c5510e 100644
--- a/llvm/test/Transforms/ArgumentPromotion/metadata.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/metadata.ll
@@ -4,51 +4,63 @@
declare void @use.i32(i32)
declare void @use.p32(ptr)
-define internal void @callee(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7) {
+define internal void @callee(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7, ptr %p8, ptr %p9, ptr %p10) {
; CHECK-LABEL: define {{[^@]+}}@callee
-; CHECK-SAME: (i32 [[P1_0_VAL:%.*]], ptr [[P2_0_VAL:%.*]], ptr [[P3_0_VAL:%.*]], ptr [[P4_0_VAL:%.*]], ptr [[P5_0_VAL:%.*]], ptr [[P6_0_VAL:%.*]], ptr [[P7_0_VAL:%.*]]) {
-; CHECK-NEXT: [[TMP1:%.*]] = icmp ne ptr [[P2_0_VAL]], null
+; CHECK-SAME: (i32 [[P1_0_VAL:%.*]], i32 [[P2_0_VAL:%.*]], ptr [[P3_0_VAL:%.*]], ptr [[P4_0_VAL:%.*]], ptr [[P5_0_VAL:%.*]], ptr [[P6_0_VAL:%.*]], ptr [[P7_0_VAL:%.*]], ptr [[P8_0_VAL:%.*]], ptr [[P9_0_VAL:%.*]], ptr [[P10_0_VAL:%.*]]) {
+; CHECK-NEXT: [[TMP1:%.*]] = icmp ne ptr [[P4_0_VAL]], null
; CHECK-NEXT: call void @llvm.assume(i1 [[TMP1]])
; CHECK-NEXT: call void @use.i32(i32 [[P1_0_VAL]])
-; CHECK-NEXT: call void @use.p32(ptr [[P2_0_VAL]])
+; CHECK-NEXT: call void @use.i32(i32 [[P2_0_VAL]])
; CHECK-NEXT: call void @use.p32(ptr [[P3_0_VAL]])
; CHECK-NEXT: call void @use.p32(ptr [[P4_0_VAL]])
; CHECK-NEXT: call void @use.p32(ptr [[P5_0_VAL]])
; CHECK-NEXT: call void @use.p32(ptr [[P6_0_VAL]])
; CHECK-NEXT: call void @use.p32(ptr [[P7_0_VAL]])
+; CHECK-NEXT: call void @use.p32(ptr [[P8_0_VAL]])
+; CHECK-NEXT: call void @use.p32(ptr [[P9_0_VAL]])
+; CHECK-NEXT: call void @use.p32(ptr [[P10_0_VAL]])
; CHECK-NEXT: ret void
;
%v1 = load i32, ptr %p1, !range !0
- %v2 = load ptr, ptr %p2, !nonnull !1, !noundef !1
- %v3 = load ptr, ptr %p3, !dereferenceable !2
- %v4 = load ptr, ptr %p4, !dereferenceable_or_null !2
- %v5 = load ptr, ptr %p5, !align !3
- %v6 = load ptr, ptr %p6, !noundef !1
- %v7 = load ptr, ptr %p7, !nontemporal !4
+ %v2 = load i32, ptr %p2, !range !0, !noundef !1
+ %v3 = load ptr, ptr %p3, !nonnull !1
+ %v4 = load ptr, ptr %p4, !nonnull !1, !noundef !1
+ %v5 = load ptr, ptr %p5, !dereferenceable !2
+ %v6 = load ptr, ptr %p6, !dereferenceable_or_null !2
+ %v7 = load ptr, ptr %p7, !align !3
+ %v8 = load ptr, ptr %p8, !align !3, !noundef !1
+ %v9 = load ptr, ptr %p9, !noundef !1
+ %v10 = load ptr, ptr %p10, !nontemporal !4
call void @use.i32(i32 %v1)
- call void @use.p32(ptr %v2)
+ call void @use.i32(i32 %v2)
call void @use.p32(ptr %v3)
call void @use.p32(ptr %v4)
call void @use.p32(ptr %v5)
call void @use.p32(ptr %v6)
call void @use.p32(ptr %v7)
+ call void @use.p32(ptr %v8)
+ call void @use.p32(ptr %v9)
+ call void @use.p32(ptr %v10)
ret void
}
-define void @caller(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7) {
+define void @caller(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7, ptr %p8, ptr %p9, ptr %p10) {
; CHECK-LABEL: define {{[^@]+}}@caller
-; CHECK-SAME: (ptr [[P1:%.*]], ptr [[P2:%.*]], ptr [[P3:%.*]], ptr [[P4:%.*]], ptr [[P5:%.*]], ptr [[P6:%.*]], ptr [[P7:%.*]]) {
-; CHECK-NEXT: [[P1_VAL:%.*]] = load i32, ptr [[P1]], align 4, !range [[RNG0:![0-9]+]]
-; CHECK-NEXT: [[P2_VAL:%.*]] = load ptr, ptr [[P2]], align 8, !nonnull !1, !noundef !1
-; CHECK-NEXT: [[P3_VAL:%.*]] = load ptr, ptr [[P3]], align 8, !dereferenceable !2
-; CHECK-NEXT: [[P4_VAL:%.*]] = load ptr, ptr [[P4]], align 8, !dereferenceable_or_null !2
-; CHECK-NEXT: [[P5_VAL:%.*]] = load ptr, ptr [[P5]], align 8, !align !3
-; CHECK-NEXT: [[P6_VAL:%.*]] = load ptr, ptr [[P6]], align 8, !noundef !1
-; CHECK-NEXT: [[P7_VAL:%.*]] = load ptr, ptr [[P7]], align 8, !nontemporal !4
-; CHECK-NEXT: call void @callee(i32 [[P1_VAL]], ptr [[P2_VAL]], ptr [[P3_VAL]], ptr [[P4_VAL]], ptr [[P5_VAL]], ptr [[P6_VAL]], ptr [[P7_VAL]])
+; CHECK-SAME: (ptr [[P1:%.*]], ptr [[P2:%.*]], ptr [[P3:%.*]], ptr [[P4:%.*]], ptr [[P5:%.*]], ptr [[P6:%.*]], ptr [[P7:%.*]], ptr [[P8:%.*]], ptr [[P9:%.*]], ptr [[P10:%.*]]) {
+; CHECK-NEXT: [[P1_VAL:%.*]] = load i32, ptr [[P1]], align 4
+; CHECK-NEXT: [[P2_VAL:%.*]] = load i32, ptr [[P2]], align 4, !range [[RNG0:![0-9]+]], !noundef !1
+; CHECK-NEXT: [[P3_VAL:%.*]] = load ptr, ptr [[P3]], align 8
+; CHECK-NEXT: [[P4_VAL:%.*]] = load ptr, ptr [[P4]], align 8, !nonnull !1, !noundef !1
+; CHECK-NEXT: [[P5_VAL:%.*]] = load ptr, ptr [[P5]], align 8, !dereferenceable !2
+; CHECK-NEXT: [[P6_VAL:%.*]] = load ptr, ptr [[P6]], align 8, !dereferenceable_or_null !2
+; CHECK-NEXT: [[P7_VAL:%.*]] = load ptr, ptr [[P7]], align 8
+; CHECK-NEXT: [[P8_VAL:%.*]] = load ptr, ptr [[P8]], align 8, !align !3, !noundef !1
+; CHECK-NEXT: [[P9_VAL:%.*]] = load ptr, ptr [[P9]], align 8, !noundef !1
+; CHECK-NEXT: [[P10_VAL:%.*]] = load ptr, ptr [[P10]], align 8, !nontemporal !4
+; CHECK-NEXT: call void @callee(i32 [[P1_VAL]], i32 [[P2_VAL]], ptr [[P3_VAL]], ptr [[P4_VAL]], ptr [[P5_VAL]], ptr [[P6_VAL]], ptr [[P7_VAL]], ptr [[P8_VAL]], ptr [[P9_VAL]], ptr [[P10_VAL]])
; CHECK-NEXT: ret void
;
- call void @callee(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7)
+ call void @callee(ptr %p1, ptr %p2, ptr %p3, ptr %p4, ptr %p5, ptr %p6, ptr %p7, ptr %p8, ptr %p9, ptr %p10)
ret void
}
More information about the llvm-commits
mailing list