Skip to content

Commit 4e0ba80

Browse files
Revert "[amdgpu][lds] Simplify error diag path - lds variable names are no longer special"
Test case didn't run locally, investigating This reverts commit 7bad469.
1 parent 7bad469 commit 4e0ba80

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,6 +1508,7 @@ SDValue AMDGPUTargetLowering::LowerGlobalAddress(AMDGPUMachineFunction* MFI,
15081508
if (G->getAddressSpace() == AMDGPUAS::LOCAL_ADDRESS ||
15091509
G->getAddressSpace() == AMDGPUAS::REGION_ADDRESS) {
15101510
if (!MFI->isModuleEntryFunction() &&
1511+
GV->getName() != "llvm.amdgcn.module.lds" &&
15111512
!AMDGPU::isNamedBarrier(*cast<GlobalVariable>(GV))) {
15121513
SDLoc DL(Op);
15131514
const Function &Fn = DAG.getMachineFunction().getFunction();

llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2978,6 +2978,7 @@ bool AMDGPULegalizerInfo::legalizeGlobalValue(
29782978

29792979
if (AS == AMDGPUAS::LOCAL_ADDRESS || AS == AMDGPUAS::REGION_ADDRESS) {
29802980
if (!MFI->isModuleEntryFunction() &&
2981+
GV->getName() != "llvm.amdgcn.module.lds" &&
29812982
!AMDGPU::isNamedBarrier(*cast<GlobalVariable>(GV))) {
29822983
const Function &Fn = MF.getFunction();
29832984
DiagnosticInfoUnsupported BadLDSDecl(

0 commit comments

Comments
 (0)