[llvm] 202984f - [SPIR-V] Avoid rescanning use lists to check for Block decoration (#211320)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 11 06:18:38 PDT 2026
Author: Arseniy Obolenskiy
Date: 2026-08-11T15:18:33+02:00
New Revision: 202984f6ed724ee120da9bb61e5e677b3de3e176
URL: https://github.com/llvm/llvm-project/commit/202984f6ed724ee120da9bb61e5e677b3de3e176
DIFF: https://github.com/llvm/llvm-project/commit/202984f6ed724ee120da9bb61e5e677b3de3e176.diff
LOG: [SPIR-V] Avoid rescanning use lists to check for Block decoration (#211320)
isResourceType previously re-walked the use list of every struct type to
look for an OpDecorate Block, repeating the same scan whenever multiple
types shared a struct element
Record Block-decorated types at the point the decoration is emitted
instead
Added:
Modified:
llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
Removed:
################################################################################
diff --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
index 02cebafc6d462..a2a06748e75f4 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
@@ -1418,7 +1418,7 @@ bool SPIRVGlobalRegistry::isResourceType(SPIRVTypeInst Type) const {
case SPIRV::OpTypeSampledImage:
return true;
case SPIRV::OpTypeStruct:
- return hasBlockDecoration(Type);
+ return BlockDecoratedTypes.contains(Type);
default:
return false;
}
@@ -1558,6 +1558,7 @@ SPIRVTypeInst SPIRVGlobalRegistry::getOrCreateVulkanBufferType(
buildOpDecorate(BlockType->defs().begin()->getReg(), MIRBuilder,
SPIRV::Decoration::Block, {});
+ BlockDecoratedTypes.insert(BlockType);
if (!IsWritable) {
buildOpMemberDecorate(BlockType->defs().begin()->getReg(), MIRBuilder,
@@ -1598,6 +1599,7 @@ SPIRVTypeInst SPIRVGlobalRegistry::getOrCreateVulkanPushConstantType(
buildOpDecorate(BlockType->defs().begin()->getReg(), MIRBuilder,
SPIRV::Decoration::Block, {});
+ BlockDecoratedTypes.insert(BlockType);
SPIRVTypeInst R = BlockType;
add(Key, R);
return R;
@@ -2344,16 +2346,3 @@ void SPIRVGlobalRegistry::addArrayStrideDecorations(
buildOpDecorate(Reg, MIRBuilder, SPIRV::Decoration::ArrayStride,
{SizeInBytes});
}
-
-bool SPIRVGlobalRegistry::hasBlockDecoration(SPIRVTypeInst Type) const {
- Register Def = getSPIRVTypeID(Type);
- for (const MachineInstr &Use :
- Type->getMF()->getRegInfo().use_instructions(Def)) {
- if (Use.getOpcode() != SPIRV::OpDecorate)
- continue;
-
- if (Use.getOperand(1).getImm() == SPIRV::Decoration::Block)
- return true;
- }
- return false;
-}
diff --git a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
index d948e365ffebe..f70995355ede6 100644
--- a/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
+++ b/llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.h
@@ -20,6 +20,7 @@
#include "SPIRVIRMapping.h"
#include "SPIRVInstrInfo.h"
#include "SPIRVTypeInst.h"
+#include "llvm/ADT/DenseSet.h"
#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
#include "llvm/IR/Constant.h"
#include "llvm/IR/TypedPointerType.h"
@@ -60,6 +61,10 @@ class SPIRVGlobalRegistry : public SPIRVIRMapping {
SmallPtrSet<const Type *, 4> TypesInProcessing;
DenseMap<const Type *, SPIRVTypeInst> ForwardPointerTypes;
+ // Struct types decorated with Block, recorded at the point the decoration
+ // is emitted.
+ DenseSet<SPIRVTypeInst> BlockDecoratedTypes;
+
// Stores for each function the last inserted SPIR-V Type.
// See: SPIRVGlobalRegistry::createOpType.
DenseMap<const MachineFunction *, MachineInstr *> LastInsertedTypeMap;
@@ -535,7 +540,6 @@ class SPIRVGlobalRegistry : public SPIRVIRMapping {
MachineIRBuilder &MIRBuilder);
void addArrayStrideDecorations(Register Reg, Type *ElementType,
MachineIRBuilder &MIRBuilder);
- bool hasBlockDecoration(SPIRVTypeInst Type) const;
void constrainSelectedInstRegOperands(MachineInstrBuilder &MIB) const;
More information about the llvm-commits
mailing list