From 56202c51d4473617b4d19205dfa90fd5a9098153 Mon Sep 17 00:00:00 2001 From: Jon Chesterfield Date: Wed, 9 Nov 2022 16:54:20 +0000 Subject: [PATCH] Revert "[amdgpu][lds] Use the same isKernel predicate consistently" Looks like this composed poorly with a nominally independent patch, will fix This reverts commit 0ba0398517778514eb44cb7ba9bf9d4d20a856e0. --- llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp | 2 +- llvm/lib/Target/AMDGPU/Utils/AMDGPUMemoryUtils.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp index 81222a2..be5ac67 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp @@ -259,7 +259,7 @@ public: IRBuilder<> Builder(Ctx); for (Function &Func : M.functions()) { - if (!Func.isDeclaration() && AMDGPU::isKernel(Func.getCallingConv())) { + if (!Func.isDeclaration() && AMDGPU::isKernelCC(&Func)) { const CallGraphNode *N = CG[&Func]; const bool CalleesRequireModuleLDS = N->size() > 0; diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDGPUMemoryUtils.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDGPUMemoryUtils.cpp index 65722dd..b141825 100644 --- a/llvm/lib/Target/AMDGPU/Utils/AMDGPUMemoryUtils.cpp +++ b/llvm/lib/Target/AMDGPU/Utils/AMDGPUMemoryUtils.cpp @@ -41,7 +41,7 @@ static bool shouldLowerLDSToStruct(const GlobalVariable &GV, SmallPtrSet Visited; SmallVector Stack(GV.users()); - assert(!F || isKernel(F->getCallingConv())); + assert(!F || isKernelCC(F)); while (!Stack.empty()) { const User *V = Stack.pop_back_val(); @@ -62,7 +62,7 @@ static bool shouldLowerLDSToStruct(const GlobalVariable &GV, } else if (!F) { // For module LDS lowering, lowering is required if the user instruction // is from non-kernel function. - Ret |= !isKernel(UF->getCallingConv()); + Ret |= !isKernelCC(UF); } continue; } -- 2.7.4