[AMDGPU] Skip lowerNonKernelLDSAccesses if function is declaration. #106975
Conversation
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
|
@llvm/pr-subscribers-backend-amdgpu Author: Chaitanya (skc7) ChangesThis PR skips lowering non-kernel LDS i.e lowerNonKernelLDSAccesses, when function is a declaration or there are no lds globals to process. Full diff: https://github.com/llvm/llvm-project/pull/106975.diff 1 Files Affected:
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSwLowerLDS.cpp b/llvm/lib/Target/AMDGPU/AMDGPUSwLowerLDS.cpp
index b2ab7e9c03e528..b85cc9cbbc02de 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSwLowerLDS.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSwLowerLDS.cpp
@@ -1218,6 +1218,7 @@ bool AMDGPUSwLowerLDS::run() {
for (auto &K : FuncLDSAccessInfo.NonKernelToLDSAccessMap) {
Function *Func = K.first;
DenseSet<GlobalVariable *> &LDSGlobals = K.second;
+ if (Func->isDeclaration() || LDSGlobals.empty()) continue;
SetVector<GlobalVariable *> OrderedLDSGlobals = sortByName(
std::vector<GlobalVariable *>(LDSGlobals.begin(), LDSGlobals.end()));
lowerNonKernelLDSAccesses(Func, OrderedLDSGlobals, NKLDSParams);
@@ -1226,6 +1227,7 @@ bool AMDGPUSwLowerLDS::run() {
auto &K = FuncLDSAccessInfo.NonKernelToLDSAccessMap;
if (K.find(Func) != K.end())
continue;
+ if (Func->isDeclaration()) continue;
SetVector<llvm::GlobalVariable *> Vec;
lowerNonKernelLDSAccesses(Func, Vec, NKLDSParams);
}
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
skc7
force-pushed
the
skc7/swlds_func_decl
branch
from
c035663 to
010b278
Compare
arsenm
reviewed
Sep 4, 2024
Comment on lines
1231
to
1232
| if (Func->isDeclaration()) | ||
| continue; |
There was a problem hiding this comment.
Do this first before the map lookup
There was a problem hiding this comment.
Fixed this in latest commit. Skipped adding function to map if its a declaration.
| @@ -1218,6 +1218,8 @@ bool AMDGPUSwLowerLDS::run() { | |||
| for (auto &K : FuncLDSAccessInfo.NonKernelToLDSAccessMap) { | |||
| Function *Func = K.first; | |||
| DenseSet<GlobalVariable *> &LDSGlobals = K.second; | |||
| if (Func->isDeclaration() || LDSGlobals.empty()) | |||
There was a problem hiding this comment.
How would a declaration end up in this set to begin with? Does this ever fire?
There was a problem hiding this comment.
Fixed this in latest commit. Skipped adding function to map if its a declaration.
arsenm
reviewed
Sep 4, 2024
Comment on lines
277
to
276
| if (CalledFunc->isDeclaration()) | ||
| continue; |
There was a problem hiding this comment.
Can pull this into the previous condition
| @@ -300,7 +302,8 @@ void AMDGPUSwLowerLDS::getUsesOfLDSByNonKernels() { | |||
| for (User *V : GV->users()) { | |||
| if (auto *I = dyn_cast<Instruction>(V)) { | |||
| Function *F = I->getFunction(); | |||
| if (!isKernelLDS(F) && F->hasFnAttribute(Attribute::SanitizeAddress)) | |||
| if (!isKernelLDS(F) && F->hasFnAttribute(Attribute::SanitizeAddress) && | |||
| !(F->isDeclaration())) | |||
arsenm
reviewed
Sep 4, 2024
Comment on lines
+303
to
+304
| if (!isKernelLDS(F) && F->hasFnAttribute(Attribute::SanitizeAddress) && | ||
| !F->isDeclaration()) |
arsenm
reviewed
Sep 6, 2024
| ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --version 5 | ||
| ; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgcn-amd-amdhsa | FileCheck %s | ||
| @lds = external addrspace(3) global [5 x i8], align 8 | ||
| declare void @kernel_declaration() sanitize_address |
There was a problem hiding this comment.
Don't call this kernel_declaration, it's not a kernel
There was a problem hiding this comment.
updated in latest commit.
| @@ -0,0 +1,97 @@ | |||
| ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --version 5 | |||
| ; RUN: opt < %s -passes=amdgpu-sw-lower-lds -S -mtriple=amdgcn-amd-amdhsa | FileCheck %s | |||
There was a problem hiding this comment.
Thanks for feedback. updated in latest commit.
arsenm
approved these changes
Sep 6, 2024
skc7
force-pushed
the
skc7/swlds_func_decl
branch
from
da60e95 to
622a53a
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/76/builds/2578 Here is the relevant piece of the build log for the reference |
searlmc1
pushed a commit
to ROCm/llvm-project
that referenced
this pull request
Nov 22, 2024
…lvm#106975) This PR skips lowering non-kernel LDS i.e lowerNonKernelLDSAccesses, when function is a declaration or there are no lds globals to process. Change-Id: I20e4653b0f62fe108e65e55c9e66585ded2a8795
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR skips lowering non-kernel LDS i.e lowerNonKernelLDSAccesses, when function is a declaration or there are no lds globals to process.