[llvm] 78b8f1f - [Attributor][FIX] Remove the visited set from AAInterFnReachability
Johannes Doerfert via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 23 11:48:31 PDT 2023
Author: Johannes Doerfert
Date: 2023-08-23T11:48:18-07:00
New Revision: 78b8f1f78f1203baf56b2b25a9dc41b90cf0957b
URL: https://github.com/llvm/llvm-project/commit/78b8f1f78f1203baf56b2b25a9dc41b90cf0957b
DIFF: https://github.com/llvm/llvm-project/commit/78b8f1f78f1203baf56b2b25a9dc41b90cf0957b.diff
LOG: [Attributor][FIX] Remove the visited set from AAInterFnReachability
The visited set was used to not visit the same function twice, however,
the (new) algorithm requires we do since we start the queries at
different call sites.
Added:
Modified:
llvm/include/llvm/Transforms/IPO/Attributor.h
llvm/lib/Transforms/IPO/AttributorAttributes.cpp
llvm/test/Transforms/Attributor/value-simplify-reachability.ll
llvm/test/Transforms/OpenMP/value-simplify-openmp-opt.ll
Removed:
################################################################################
diff --git a/llvm/include/llvm/Transforms/IPO/Attributor.h b/llvm/include/llvm/Transforms/IPO/Attributor.h
index 71692eb3719a39..0deb91fe02c306 100644
--- a/llvm/include/llvm/Transforms/IPO/Attributor.h
+++ b/llvm/include/llvm/Transforms/IPO/Attributor.h
@@ -5537,8 +5537,7 @@ struct AAInterFnReachability
/// See also AA::isPotentiallyReachable.
virtual bool instructionCanReach(
Attributor &A, const Instruction &Inst, const Function &Fn,
- const AA::InstExclusionSetTy *ExclusionSet = nullptr,
- SmallPtrSet<const Function *, 16> *Visited = nullptr) const = 0;
+ const AA::InstExclusionSetTy *ExclusionSet = nullptr) const = 0;
/// Create an abstract attribute view for the position \p IRP.
static AAInterFnReachability &createForPosition(const IRPosition &IRP,
diff --git a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
index acca1eb9674698..d7d87b41f3ef91 100644
--- a/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
+++ b/llvm/lib/Transforms/IPO/AttributorAttributes.cpp
@@ -10634,8 +10634,7 @@ struct AAInterFnReachabilityFunction
bool instructionCanReach(
Attributor &A, const Instruction &From, const Function &To,
- const AA::InstExclusionSetTy *ExclusionSet,
- SmallPtrSet<const Function *, 16> *Visited) const override {
+ const AA::InstExclusionSetTy *ExclusionSet) const override {
assert(From.getFunction() == getAnchorScope() && "Queried the wrong AA!");
auto *NonConstThis = const_cast<AAInterFnReachabilityFunction *>(this);
@@ -10656,13 +10655,9 @@ struct AAInterFnReachabilityFunction
const Instruction *EntryI =
&RQI.From->getFunction()->getEntryBlock().front();
if (EntryI != RQI.From &&
- !instructionCanReach(A, *EntryI, *RQI.To, nullptr, nullptr))
+ !instructionCanReach(A, *EntryI, *RQI.To, nullptr))
return rememberResult(A, RQITy::Reachable::No, RQI, false);
- SmallPtrSet<const Function *, 16> LocalVisited;
- if (!Visited)
- Visited = &LocalVisited;
-
auto CheckReachableCallBase = [&](CallBase *CB) {
auto *CBEdges = A.getAAFor<AACallEdges>(
*this, IRPosition::callsite_function(*CB), DepClassTy::OPTIONAL);
@@ -10675,8 +10670,7 @@ struct AAInterFnReachabilityFunction
for (Function *Fn : CBEdges->getOptimisticEdges()) {
if (Fn == RQI.To)
return false;
- if (!Visited->insert(Fn).second)
- continue;
+
if (Fn->isDeclaration()) {
if (Fn->hasFnAttribute(Attribute::NoCallback))
continue;
@@ -10697,7 +10691,7 @@ struct AAInterFnReachabilityFunction
const Instruction &FnFirstInst = Fn->getEntryBlock().front();
if (!InterFnReachability ||
InterFnReachability->instructionCanReach(A, FnFirstInst, *RQI.To,
- RQI.ExclusionSet, Visited))
+ RQI.ExclusionSet))
return false;
}
return true;
diff --git a/llvm/test/Transforms/Attributor/value-simplify-reachability.ll b/llvm/test/Transforms/Attributor/value-simplify-reachability.ll
index c25201d5d8cec9..18b6601c93f61d 100644
--- a/llvm/test/Transforms/Attributor/value-simplify-reachability.ll
+++ b/llvm/test/Transforms/Attributor/value-simplify-reachability.ll
@@ -49,7 +49,7 @@ define void @entry1(i1 %c, i32 %v) {
; TUNIT-SAME: (i1 [[C:%.*]], i32 [[V:%.*]]) #[[ATTR5:[0-9]+]] {
; TUNIT-NEXT: [[L0:%.*]] = load i32, ptr @GInt1, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L0]])
-; TUNIT-NEXT: call void @write1ToGInt1() #[[ATTR11:[0-9]+]]
+; TUNIT-NEXT: call void @write1ToGInt1() #[[ATTR12:[0-9]+]]
; TUNIT-NEXT: [[L1:%.*]] = load i32, ptr @GInt1, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L1]])
; TUNIT-NEXT: br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
@@ -61,7 +61,7 @@ define void @entry1(i1 %c, i32 %v) {
; TUNIT: F:
; TUNIT-NEXT: [[L3:%.*]] = load i32, ptr @GInt1, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L3]])
-; TUNIT-NEXT: call void @write1ToGInt1() #[[ATTR11]]
+; TUNIT-NEXT: call void @write1ToGInt1() #[[ATTR12]]
; TUNIT-NEXT: [[L4:%.*]] = load i32, ptr @GInt1, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L4]])
; TUNIT-NEXT: ret void
@@ -114,7 +114,7 @@ define void @entry2(i1 %c, i32 %v) {
; TUNIT-SAME: (i1 [[C:%.*]], i32 [[V:%.*]]) #[[ATTR5]] {
; TUNIT-NEXT: [[L0:%.*]] = load i32, ptr @GInt2, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L0]])
-; TUNIT-NEXT: call void @write1ToGInt2() #[[ATTR11]]
+; TUNIT-NEXT: call void @write1ToGInt2() #[[ATTR12]]
; TUNIT-NEXT: [[L1:%.*]] = load i32, ptr @GInt2, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L1]])
; TUNIT-NEXT: br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
@@ -126,7 +126,7 @@ define void @entry2(i1 %c, i32 %v) {
; TUNIT: F:
; TUNIT-NEXT: [[L3:%.*]] = load i32, ptr @GInt2, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L3]])
-; TUNIT-NEXT: call void @write1ToGInt2() #[[ATTR11]]
+; TUNIT-NEXT: call void @write1ToGInt2() #[[ATTR12]]
; TUNIT-NEXT: [[L4:%.*]] = load i32, ptr @GInt2, align 4
; TUNIT-NEXT: call void @useI32(i32 [[L4]])
; TUNIT-NEXT: ret void
@@ -794,11 +794,14 @@ define i32 @exclusion_set3(i1 %c) {
@B = global i32 0
define internal i32 @readI32(ptr %a) {
-; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(write, argmem: none)
+; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(readwrite, argmem: none)
; TUNIT-LABEL: define {{[^@]+}}@readI32
-; TUNIT-SAME: () #[[ATTR9:[0-9]+]] {
+; TUNIT-SAME: (i32 [[TMP0:%.*]]) #[[ATTR9:[0-9]+]] {
+; TUNIT-NEXT: [[A_PRIV:%.*]] = alloca i32, align 4
+; TUNIT-NEXT: store i32 [[TMP0]], ptr [[A_PRIV]], align 4
+; TUNIT-NEXT: [[R:%.*]] = load i32, ptr [[A_PRIV]], align 4
; TUNIT-NEXT: store i32 1, ptr @B, align 4
-; TUNIT-NEXT: ret i32 undef
+; TUNIT-NEXT: ret i32 [[R]]
;
; CGSCC: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn
; CGSCC-LABEL: define {{[^@]+}}@readI32
@@ -813,11 +816,14 @@ define internal i32 @readI32(ptr %a) {
}
define internal i32 @broker(ptr %a) {
-; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(write, argmem: none)
+; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(readwrite, argmem: none)
; TUNIT-LABEL: define {{[^@]+}}@broker
-; TUNIT-SAME: () #[[ATTR9]] {
-; TUNIT-NEXT: [[R:%.*]] = call i32 @readI32() #[[ATTR12:[0-9]+]]
-; TUNIT-NEXT: ret i32 undef
+; TUNIT-SAME: (i32 [[TMP0:%.*]]) #[[ATTR9]] {
+; TUNIT-NEXT: [[A_PRIV:%.*]] = alloca i32, align 4
+; TUNIT-NEXT: store i32 [[TMP0]], ptr [[A_PRIV]], align 4
+; TUNIT-NEXT: [[TMP2:%.*]] = load i32, ptr [[A_PRIV]], align 4
+; TUNIT-NEXT: [[R:%.*]] = call i32 @readI32(i32 [[TMP2]]) #[[ATTR13:[0-9]+]]
+; TUNIT-NEXT: ret i32 [[R]]
;
; CGSCC: Function Attrs: mustprogress nofree nosync nounwind willreturn memory(readwrite, argmem: none)
; CGSCC-LABEL: define {{[^@]+}}@broker
@@ -833,13 +839,17 @@ define internal i32 @broker(ptr %a) {
; FIXME: This function should return 1, not 0
define i32 @two_calls() {
-; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(write)
+; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn
; TUNIT-LABEL: define {{[^@]+}}@two_calls
-; TUNIT-SAME: () #[[ATTR4]] {
+; TUNIT-SAME: () #[[ATTR10:[0-9]+]] {
; TUNIT-NEXT: [[A:%.*]] = alloca i32, align 4
-; TUNIT-NEXT: [[D:%.*]] = call i32 @broker() #[[ATTR12]]
-; TUNIT-NEXT: [[R:%.*]] = call i32 @broker() #[[ATTR12]]
-; TUNIT-NEXT: ret i32 0
+; TUNIT-NEXT: store i32 0, ptr [[A]], align 4
+; TUNIT-NEXT: [[TMP1:%.*]] = load i32, ptr [[A]], align 4
+; TUNIT-NEXT: [[D:%.*]] = call i32 @broker(i32 [[TMP1]]) #[[ATTR13]]
+; TUNIT-NEXT: store i32 1, ptr [[A]], align 4
+; TUNIT-NEXT: [[TMP2:%.*]] = load i32, ptr [[A]], align 4
+; TUNIT-NEXT: [[R:%.*]] = call i32 @broker(i32 [[TMP2]]) #[[ATTR13]]
+; TUNIT-NEXT: ret i32 [[R]]
;
; CGSCC: Function Attrs: mustprogress nofree nosync nounwind willreturn
; CGSCC-LABEL: define {{[^@]+}}@two_calls
@@ -870,10 +880,11 @@ define i32 @two_calls() {
; TUNIT: attributes #[[ATTR6]] = { nocallback }
; TUNIT: attributes #[[ATTR7]] = { norecurse }
; TUNIT: attributes #[[ATTR8]] = { nosync }
-; TUNIT: attributes #[[ATTR9]] = { mustprogress nofree norecurse nosync nounwind willreturn memory(write, argmem: none) }
-; TUNIT: attributes #[[ATTR10:[0-9]+]] = { nocallback nofree nounwind willreturn memory(argmem: write) }
-; TUNIT: attributes #[[ATTR11]] = { nosync nounwind memory(write) }
-; TUNIT: attributes #[[ATTR12]] = { nofree nosync nounwind willreturn memory(write) }
+; TUNIT: attributes #[[ATTR9]] = { mustprogress nofree norecurse nosync nounwind willreturn memory(readwrite, argmem: none) }
+; TUNIT: attributes #[[ATTR10]] = { mustprogress nofree norecurse nosync nounwind willreturn }
+; TUNIT: attributes #[[ATTR11:[0-9]+]] = { nocallback nofree nounwind willreturn memory(argmem: write) }
+; TUNIT: attributes #[[ATTR12]] = { nosync nounwind memory(write) }
+; TUNIT: attributes #[[ATTR13]] = { nofree nosync nounwind willreturn }
;.
; CGSCC: attributes #[[ATTR0:[0-9]+]] = { nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: write) }
; CGSCC: attributes #[[ATTR1:[0-9]+]] = { nocallback nosync }
diff --git a/llvm/test/Transforms/OpenMP/value-simplify-openmp-opt.ll b/llvm/test/Transforms/OpenMP/value-simplify-openmp-opt.ll
index 0fc3aafb9a99f9..5f06f9104ae4aa 100644
--- a/llvm/test/Transforms/OpenMP/value-simplify-openmp-opt.ll
+++ b/llvm/test/Transforms/OpenMP/value-simplify-openmp-opt.ll
@@ -664,7 +664,7 @@ define void @kernel_unknown_and_aligned1(i1 %c) "kernel" {
; TUNIT-SAME: (i1 [[C:%.*]]) #[[ATTR1]] {
; TUNIT-NEXT: br i1 [[C]], label [[S:%.*]], label [[L:%.*]]
; TUNIT: L:
-; TUNIT-NEXT: call void @use1(i32 undef) #[[ATTR7]]
+; TUNIT-NEXT: call void @use1(i32 2) #[[ATTR7]]
; TUNIT-NEXT: ret void
; TUNIT: S:
; TUNIT-NEXT: call void @sync()
@@ -676,7 +676,7 @@ define void @kernel_unknown_and_aligned1(i1 %c) "kernel" {
; CGSCC-SAME: (i1 [[C:%.*]]) #[[ATTR1]] {
; CGSCC-NEXT: br i1 [[C]], label [[S:%.*]], label [[L:%.*]]
; CGSCC: L:
-; CGSCC-NEXT: call void @use1(i32 undef) #[[ATTR6]]
+; CGSCC-NEXT: call void @use1(i32 2) #[[ATTR6]]
; CGSCC-NEXT: ret void
; CGSCC: S:
; CGSCC-NEXT: call void @sync()
@@ -704,7 +704,7 @@ define void @kernel_unknown_and_aligned2(i1 %c) "kernel" {
; TUNIT-NEXT: br i1 [[C]], label [[S:%.*]], label [[L:%.*]]
; TUNIT: L:
; TUNIT-NEXT: call void @sync()
-; TUNIT-NEXT: call void @use1(i32 undef) #[[ATTR7]]
+; TUNIT-NEXT: call void @use1(i32 2) #[[ATTR7]]
; TUNIT-NEXT: ret void
; TUNIT: S:
; TUNIT-NEXT: call void @sync()
@@ -717,7 +717,7 @@ define void @kernel_unknown_and_aligned2(i1 %c) "kernel" {
; CGSCC-NEXT: br i1 [[C]], label [[S:%.*]], label [[L:%.*]]
; CGSCC: L:
; CGSCC-NEXT: call void @sync()
-; CGSCC-NEXT: call void @use1(i32 undef) #[[ATTR6]]
+; CGSCC-NEXT: call void @use1(i32 2) #[[ATTR6]]
; CGSCC-NEXT: ret void
; CGSCC: S:
; CGSCC-NEXT: call void @sync()
More information about the llvm-commits
mailing list