shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[NFC][SPIRV] Avoid temporary SmallVector by using make_early_inc_range (#174748)

Browse Source 
Follow-up of https://github.com/llvm/llvm-project/pull/174734

Merge the 2 loops and avoid the temporary `SmallVector` by using
`make_early_inc_range`.
This commit is contained in:
Juan Manuel Martinez Caamaño 2026-01-08 11:45:42 +01:00 committed by GitHub
parent d60601bbf5
commit f525ac8be2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp
View File

@ -24,45 +24,42 @@
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/IntrinsicsSPIRV.h"
#include "llvm/IR/Module.h"
#include "llvm/IR/ReplaceConstant.h"
#define DEBUG_TYPE "spirv-pushconstant-access"
using namespace llvm;
static bool replacePushConstantAccesses(Module &M, SPIRVGlobalRegistry *GR) {
SmallVector<GlobalVariable *> PushConstants;
for (GlobalVariable &GV : M.globals()) {
bool Changed = false;
for (GlobalVariable &GV : make_early_inc_range(M.globals())) {
if (GV.getAddressSpace() !=
storageClassToAddressSpace(SPIRV::StorageClass::PushConstant))
continue;
GV.removeDeadConstantUsers();
PushConstants.push_back(&GV);
}
for (GlobalVariable *GV : PushConstants) {
Type *PCType = llvm::TargetExtType::get(
M.getContext(), "spirv.PushConstant", {GV->getValueType()});
GlobalVariable *NewGV = new GlobalVariable(
M, PCType, GV->isConstant(), GV->getLinkage(),
/* initializer= */ nullptr, GV->getName(),
/* InsertBefore= */ GV, GV->getThreadLocalMode(), GV->getAddressSpace(),
GV->isExternallyInitialized());
M.getContext(), "spirv.PushConstant", {GV.getValueType()});
GlobalVariable *NewGV =
new GlobalVariable(M, PCType, GV.isConstant(), GV.getLinkage(),
/* initializer= */ nullptr, GV.getName(),
/* InsertBefore= */ &GV, GV.getThreadLocalMode(),
GV.getAddressSpace(), GV.isExternallyInitialized());
for (User *U : make_early_inc_range(GV->users())) {
for (User *U : make_early_inc_range(GV.users())) {
Instruction *I = cast<Instruction>(U);
IRBuilder<> Builder(I);
Value *GetPointerCall = Builder.CreateIntrinsic(
NewGV->getType(), Intrinsic::spv_pushconstant_getpointer, {NewGV});
GR->buildAssignPtr(Builder, GV->getValueType(), GetPointerCall);
GR->buildAssignPtr(Builder, GV.getValueType(), GetPointerCall);
I->replaceUsesOfWith(GV, GetPointerCall);
I->replaceUsesOfWith(&GV, GetPointerCall);
}
GV->eraseFromParent();
GV.eraseFromParent();
Changed = true;
}
return !PushConstants.empty();
return Changed;
}
PreservedAnalyses SPIRVPushConstantAccess::run(Module &M,