[FunctionAttrs] Determine underlying object by getUnderlyingObjectAggressive#100102
Merged
[FunctionAttrs] Determine underlying object by getUnderlyingObjectAggressive#100102
getUnderlyingObjectAggressive#100102Conversation
Member
|
@llvm/pr-subscribers-llvm-transforms Author: DianQK (DianQK) ChangesThanks to #99509, we can fix rust-lang/rust#119573 too. Full diff: https://github.com/llvm/llvm-project/pull/100102.diff 2 Files Affected:
diff --git a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp
index 7b419d0f098b5..c9ce73d9a5795 100644
--- a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp
+++ b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp
@@ -118,7 +118,7 @@ static void addLocAccess(MemoryEffects &ME, const MemoryLocation &Loc,
if (isNoModRef(MR))
return;
- const Value *UO = getUnderlyingObject(Loc.Ptr);
+ const Value *UO = getUnderlyingObjectAggressive(Loc.Ptr);
assert(!isa<AllocaInst>(UO) &&
"Should have been handled by getModRefInfoMask()");
if (isa<Argument>(UO)) {
diff --git a/llvm/test/Transforms/FunctionAttrs/argmemonly.ll b/llvm/test/Transforms/FunctionAttrs/argmemonly.ll
index ea6392714bf6f..5c68824b63b79 100644
--- a/llvm/test/Transforms/FunctionAttrs/argmemonly.ll
+++ b/llvm/test/Transforms/FunctionAttrs/argmemonly.ll
@@ -489,3 +489,127 @@ define void @test_scc_argmem_read_2(ptr %p) {
call void @test_scc_argmem_read_1(ptr %p)
ret void
}
+
+define i64 @select_same_obj(i1 %c, ptr %p, i64 %x) {
+; FNATTRS: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: read)
+; FNATTRS-LABEL: define i64 @select_same_obj
+; FNATTRS-SAME: (i1 [[C:%.*]], ptr nocapture readonly [[P:%.*]], i64 [[X:%.*]]) #[[ATTR1]] {
+; FNATTRS-NEXT: entry:
+; FNATTRS-NEXT: [[P2:%.*]] = getelementptr i8, ptr [[P]], i64 [[X]]
+; FNATTRS-NEXT: [[P3:%.*]] = select i1 [[C]], ptr [[P]], ptr [[P2]]
+; FNATTRS-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; FNATTRS-NEXT: ret i64 [[R]]
+;
+; ATTRIBUTOR: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+; ATTRIBUTOR-LABEL: define i64 @select_same_obj
+; ATTRIBUTOR-SAME: (i1 [[C:%.*]], ptr nocapture nofree readonly [[P:%.*]], i64 [[X:%.*]]) #[[ATTR0]] {
+; ATTRIBUTOR-NEXT: entry:
+; ATTRIBUTOR-NEXT: [[P2:%.*]] = getelementptr i8, ptr [[P]], i64 [[X]]
+; ATTRIBUTOR-NEXT: [[P3:%.*]] = select i1 [[C]], ptr [[P]], ptr [[P2]]
+; ATTRIBUTOR-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; ATTRIBUTOR-NEXT: ret i64 [[R]]
+;
+entry:
+ %p2 = getelementptr i8, ptr %p, i64 %x
+ %p3 = select i1 %c, ptr %p, ptr %p2
+ %r = load i64, ptr %p3
+ ret i64 %r
+}
+
+; FIXME: This could be `memory(argmem: read)`.
+define i64 @select_different_obj(i1 %c, ptr %p, ptr %p2) {
+; FNATTRS: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(read, inaccessiblemem: none)
+; FNATTRS-LABEL: define i64 @select_different_obj
+; FNATTRS-SAME: (i1 [[C:%.*]], ptr nocapture readonly [[P:%.*]], ptr nocapture readonly [[P2:%.*]]) #[[ATTR3]] {
+; FNATTRS-NEXT: entry:
+; FNATTRS-NEXT: [[P3:%.*]] = select i1 [[C]], ptr [[P]], ptr [[P2]]
+; FNATTRS-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; FNATTRS-NEXT: ret i64 [[R]]
+;
+; ATTRIBUTOR: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
+; ATTRIBUTOR-LABEL: define i64 @select_different_obj
+; ATTRIBUTOR-SAME: (i1 [[C:%.*]], ptr nocapture nofree readonly [[P:%.*]], ptr nocapture nofree readonly [[P2:%.*]]) #[[ATTR0]] {
+; ATTRIBUTOR-NEXT: entry:
+; ATTRIBUTOR-NEXT: [[P3:%.*]] = select i1 [[C]], ptr [[P]], ptr [[P2]]
+; ATTRIBUTOR-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; ATTRIBUTOR-NEXT: ret i64 [[R]]
+;
+entry:
+ %p3 = select i1 %c, ptr %p, ptr %p2
+ %r = load i64, ptr %p3
+ ret i64 %r
+}
+
+define i64 @phi_same_obj(i1 %c, ptr %p, i64 %x) {
+; FNATTRS: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: read)
+; FNATTRS-LABEL: define i64 @phi_same_obj
+; FNATTRS-SAME: (i1 [[C:%.*]], ptr nocapture readonly [[P:%.*]], i64 [[X:%.*]]) #[[ATTR1]] {
+; FNATTRS-NEXT: entry:
+; FNATTRS-NEXT: [[P2:%.*]] = getelementptr i8, ptr [[P]], i64 [[X]]
+; FNATTRS-NEXT: br i1 [[C]], label [[IF:%.*]], label [[JOIN:%.*]]
+; FNATTRS: if:
+; FNATTRS-NEXT: br label [[JOIN]]
+; FNATTRS: join:
+; FNATTRS-NEXT: [[P3:%.*]] = phi ptr [ [[P]], [[IF]] ], [ [[P2]], [[ENTRY:%.*]] ]
+; FNATTRS-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; FNATTRS-NEXT: ret i64 [[R]]
+;
+; ATTRIBUTOR: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: read)
+; ATTRIBUTOR-LABEL: define i64 @phi_same_obj
+; ATTRIBUTOR-SAME: (i1 [[C:%.*]], ptr nocapture nofree readonly [[P:%.*]], i64 [[X:%.*]]) #[[ATTR1]] {
+; ATTRIBUTOR-NEXT: entry:
+; ATTRIBUTOR-NEXT: [[P2:%.*]] = getelementptr i8, ptr [[P]], i64 [[X]]
+; ATTRIBUTOR-NEXT: br i1 [[C]], label [[IF:%.*]], label [[JOIN:%.*]]
+; ATTRIBUTOR: if:
+; ATTRIBUTOR-NEXT: br label [[JOIN]]
+; ATTRIBUTOR: join:
+; ATTRIBUTOR-NEXT: [[P3:%.*]] = phi ptr [ [[P]], [[IF]] ], [ [[P2]], [[ENTRY:%.*]] ]
+; ATTRIBUTOR-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; ATTRIBUTOR-NEXT: ret i64 [[R]]
+;
+entry:
+ %p2 = getelementptr i8, ptr %p, i64 %x
+ br i1 %c, label %if, label %join
+if:
+ br label %join
+join:
+ %p3 = phi ptr [ %p, %if ], [ %p2, %entry ]
+ %r = load i64, ptr %p3
+ ret i64 %r
+}
+
+; FIXME: This could be `memory(argmem: read)`.
+define i64 @phi_different_obj(i1 %c, ptr %p, ptr %p2) {
+; FNATTRS: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(read, inaccessiblemem: none)
+; FNATTRS-LABEL: define i64 @phi_different_obj
+; FNATTRS-SAME: (i1 [[C:%.*]], ptr nocapture readonly [[P:%.*]], ptr nocapture readonly [[P2:%.*]]) #[[ATTR3]] {
+; FNATTRS-NEXT: entry:
+; FNATTRS-NEXT: br i1 [[C]], label [[IF:%.*]], label [[JOIN:%.*]]
+; FNATTRS: if:
+; FNATTRS-NEXT: br label [[JOIN]]
+; FNATTRS: join:
+; FNATTRS-NEXT: [[P3:%.*]] = phi ptr [ [[P]], [[IF]] ], [ [[P2]], [[ENTRY:%.*]] ]
+; FNATTRS-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; FNATTRS-NEXT: ret i64 [[R]]
+;
+; ATTRIBUTOR: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: read)
+; ATTRIBUTOR-LABEL: define i64 @phi_different_obj
+; ATTRIBUTOR-SAME: (i1 [[C:%.*]], ptr nocapture nofree readonly [[P:%.*]], ptr nocapture nofree readonly [[P2:%.*]]) #[[ATTR1]] {
+; ATTRIBUTOR-NEXT: entry:
+; ATTRIBUTOR-NEXT: br i1 [[C]], label [[IF:%.*]], label [[JOIN:%.*]]
+; ATTRIBUTOR: if:
+; ATTRIBUTOR-NEXT: br label [[JOIN]]
+; ATTRIBUTOR: join:
+; ATTRIBUTOR-NEXT: [[P3:%.*]] = phi ptr [ [[P]], [[IF]] ], [ [[P2]], [[ENTRY:%.*]] ]
+; ATTRIBUTOR-NEXT: [[R:%.*]] = load i64, ptr [[P3]], align 4
+; ATTRIBUTOR-NEXT: ret i64 [[R]]
+;
+entry:
+ br i1 %c, label %if, label %join
+if:
+ br label %join
+join:
+ %p3 = phi ptr [ %p, %if ], [ %p2, %entry ]
+ %r = load i64, ptr %p3
+ ret i64 %r
+}
|
dtcxzyw
added a commit
to dtcxzyw/llvm-opt-benchmark
that referenced
this pull request
Jul 23, 2024
dtcxzyw
reviewed
Jul 23, 2024
| return; | ||
|
|
||
| const Value *UO = getUnderlyingObject(Loc.Ptr); | ||
| const Value *UO = getUnderlyingObjectAggressive(Loc.Ptr); |
Member
There was a problem hiding this comment.
dtcxzyw
approved these changes
Jul 23, 2024
Member
dtcxzyw
left a comment
dtcxzyw
left a comment
There was a problem hiding this comment.
LGTM if the original rust issue can be fixed :)
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/140/builds/2795 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/30/builds/2631 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/6/builds/1677 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/2446 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/70/builds/1857 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/133/builds/2066 Here is the relevant piece of the build log for the reference: |
nikic
reviewed
Jul 23, 2024
| const Value *UO = getUnderlyingObject(Loc.Ptr); | ||
| const Value *UO = getUnderlyingObjectAggressive(Loc.Ptr); | ||
| assert(!isa<AllocaInst>(UO) && | ||
| "Should have been handled by getModRefInfoMask()"); |
Contributor
There was a problem hiding this comment.
Should convert this into if(isa<AllocaInst>(UO)) return.
Member
Author
There was a problem hiding this comment.
Thanks! I see it in the logs now. It doesn't seem to require additional test cases, so I will submit it directly later.
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
…gressive` (#100102) Summary: Thanks to #99509, we can fix rust-lang/rust#119573 too. Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60251024
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
…ObjectAggressive` (#100102)" Summary: This reverts commit a213edd. Assertion failures on buildbots. Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60251266
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
…gObjectAggressive` (#100102)" Summary: Added handling for `AllocaInst`. This reverts commit 1ee686a. Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60250590
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thanks to #99509, we can fix rust-lang/rust#119573 too.