Skip to content

Commit 4f88a10

Browse files
vmaksimosys-ce-bb
vmaksimo
authored and
sys-ce-bb
committed
Remove internal values for SPV_INTEL_maximum_registers (#2387)
The Headers for this extension were published so we should use them instead: KhronosGroup/SPIRV-Headers@b73e168 Original commit: KhronosGroup/SPIRV-LLVM-Translator@7d7e0ac5303f93d
1 parent 7dfc12d commit 4f88a10

File tree

11 files changed

+34
-53
lines changed

11 files changed

+34
-53
lines changed

‎llvm-spirv/lib/SPIRV/SPIRVReader.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4235,8 +4235,7 @@ bool SPIRVToLLVM::transMetadata() {
42354235
F->setMetadata(kSPIR2MD::IntelFPGAIPInterface,
42364236
MDNode::get(*Context, InterfaceMDVec));
42374237
}
4238-
if (auto *EM = BF->getExecutionMode(
4239-
internal::ExecutionModeMaximumRegistersINTEL)) {
4238+
if (auto *EM = BF->getExecutionMode(ExecutionModeMaximumRegistersINTEL)) {
42404239
NamedMDNode *ExecModeMD =
42414240
M->getOrInsertNamedMetadata(kSPIRVMD::ExecutionMode);
42424241

@@ -4248,8 +4247,7 @@ bool SPIRVToLLVM::transMetadata() {
42484247
ConstantAsMetadata::get(getUInt32(M, EM->getLiterals()[0])));
42494248
ExecModeMD->addOperand(MDNode::get(*Context, ValueVec));
42504249
}
4251-
if (auto *EM = BF->getExecutionMode(
4252-
internal::ExecutionModeMaximumRegistersIdINTEL)) {
4250+
if (auto *EM = BF->getExecutionMode(ExecutionModeMaximumRegistersIdINTEL)) {
42534251
NamedMDNode *ExecModeMD =
42544252
M->getOrInsertNamedMetadata(kSPIRVMD::ExecutionMode);
42554253

@@ -4264,8 +4262,8 @@ bool SPIRVToLLVM::transMetadata() {
42644262
transValue(ExecOp, nullptr, nullptr)))));
42654263
ExecModeMD->addOperand(MDNode::get(*Context, ValueVec));
42664264
}
4267-
if (auto *EM = BF->getExecutionMode(
4268-
internal::ExecutionModeNamedMaximumRegistersINTEL)) {
4265+
if (auto *EM =
4266+
BF->getExecutionMode(ExecutionModeNamedMaximumRegistersINTEL)) {
42694267
NamedMDNode *ExecModeMD =
42704268
M->getOrInsertNamedMetadata(kSPIRVMD::ExecutionMode);
42714269

‎llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,24 +1148,24 @@ void LLVMToSPIRVBase::transFunctionMetadataAsExecutionMode(SPIRVFunction *BF,
11481148
auto *RegisterAllocMode = RegisterAllocModeMDs[I]->getOperand(0).get();
11491149
if (isa<MDString>(RegisterAllocMode)) {
11501150
StringRef Str = getMDOperandAsString(RegisterAllocModeMDs[I], 0);
1151-
internal::InternalNamedMaximumNumberOfRegisters NamedValue =
1151+
NamedMaximumNumberOfRegisters NamedValue =
11521152
SPIRVNamedMaximumNumberOfRegistersNameMap::rmap(Str.str());
11531153
BF->addExecutionMode(BM->add(new SPIRVExecutionMode(
1154-
OpExecutionMode, BF,
1155-
internal::ExecutionModeNamedMaximumRegistersINTEL, NamedValue)));
1154+
OpExecutionMode, BF, ExecutionModeNamedMaximumRegistersINTEL,
1155+
NamedValue)));
11561156
} else if (isa<MDNode>(RegisterAllocMode)) {
11571157
auto *RegisterAllocNodeMDOp =
11581158
getMDOperandAsMDNode(RegisterAllocModeMDs[I], 0);
11591159
int Num = getMDOperandAsInt(RegisterAllocNodeMDOp, 0);
11601160
auto *Const =
11611161
BM->addConstant(transType(Type::getInt32Ty(F->getContext())), Num);
11621162
BF->addExecutionMode(BM->add(new SPIRVExecutionModeId(
1163-
BF, internal::ExecutionModeMaximumRegistersIdINTEL, Const->getId())));
1163+
BF, ExecutionModeMaximumRegistersIdINTEL, Const->getId())));
11641164
} else {
11651165
int64_t RegisterAllocVal =
11661166
mdconst::dyn_extract<ConstantInt>(RegisterAllocMode)->getZExtValue();
11671167
BF->addExecutionMode(BM->add(new SPIRVExecutionMode(
1168-
OpExecutionMode, BF, internal::ExecutionModeMaximumRegistersINTEL,
1168+
OpExecutionMode, BF, ExecutionModeMaximumRegistersINTEL,
11691169
RegisterAllocVal)));
11701170
}
11711171
}

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEntry.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ void SPIRVExecutionMode::decode(std::istream &I) {
661661
case ExecutionModeRegisterMapInterfaceINTEL:
662662
case ExecutionModeStreamingInterfaceINTEL:
663663
case spv::internal::ExecutionModeNamedSubgroupSizeINTEL:
664-
case internal::ExecutionModeMaximumRegistersINTEL:
665-
case internal::ExecutionModeMaximumRegistersIdINTEL:
666-
case internal::ExecutionModeNamedMaximumRegistersINTEL:
664+
case ExecutionModeMaximumRegistersINTEL:
665+
case ExecutionModeMaximumRegistersIdINTEL:
666+
case ExecutionModeNamedMaximumRegistersINTEL:
667667
WordLiterals.resize(1);
668668
break;
669669
default:

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEntry.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -698,9 +698,9 @@ class SPIRVExecutionMode : public SPIRVAnnotation {
698698

699699
std::optional<ExtensionID> getRequiredExtension() const override {
700700
switch (static_cast<unsigned>(ExecMode)) {
701-
case internal::ExecutionModeMaximumRegistersINTEL:
702-
case internal::ExecutionModeMaximumRegistersIdINTEL:
703-
case internal::ExecutionModeNamedMaximumRegistersINTEL:
701+
case ExecutionModeMaximumRegistersINTEL:
702+
case ExecutionModeMaximumRegistersIdINTEL:
703+
case ExecutionModeNamedMaximumRegistersINTEL:
704704
return ExtensionID::SPV_INTEL_maximum_registers;
705705
default:
706706
return {};
@@ -769,9 +769,9 @@ class SPIRVComponentExecutionModes {
769769
IsOtherFP(EMK);
770770
};
771771
auto IsMaxRegisters = [&](auto EMK) {
772-
return EMK == internal::ExecutionModeMaximumRegistersINTEL ||
773-
EMK == internal::ExecutionModeMaximumRegistersIdINTEL ||
774-
EMK == internal::ExecutionModeNamedMaximumRegistersINTEL;
772+
return EMK == ExecutionModeMaximumRegistersINTEL ||
773+
EMK == ExecutionModeMaximumRegistersIdINTEL ||
774+
EMK == ExecutionModeNamedMaximumRegistersINTEL;
775775
};
776776
auto IsCompatible = [&](SPIRVExecutionMode *EM0, SPIRVExecutionMode *EM1) {
777777
if (EM0->getTargetId() != EM1->getTargetId())

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,12 @@ template <> inline void SPIRVMap<SPIRVExecutionModeKind, SPIRVCapVec>::init() {
293293
{CapabilityVectorComputeINTEL});
294294
ADD_VEC_INIT(internal::ExecutionModeNamedSubgroupSizeINTEL,
295295
{internal::CapabilitySubgroupRequirementsINTEL});
296-
ADD_VEC_INIT(internal::ExecutionModeMaximumRegistersINTEL,
297-
{internal::CapabilityRegisterLimitsINTEL});
298-
ADD_VEC_INIT(internal::ExecutionModeMaximumRegistersIdINTEL,
299-
{internal::CapabilityRegisterLimitsINTEL});
300-
ADD_VEC_INIT(internal::ExecutionModeNamedMaximumRegistersINTEL,
301-
{internal::CapabilityRegisterLimitsINTEL});
296+
ADD_VEC_INIT(ExecutionModeMaximumRegistersINTEL,
297+
{CapabilityRegisterLimitsINTEL});
298+
ADD_VEC_INIT(ExecutionModeMaximumRegistersIdINTEL,
299+
{CapabilityRegisterLimitsINTEL});
300+
ADD_VEC_INIT(ExecutionModeNamedMaximumRegistersINTEL,
301+
{CapabilityRegisterLimitsINTEL});
302302
}
303303

304304
template <> inline void SPIRVMap<SPIRVMemoryModelKind, SPIRVCapVec>::init() {

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVIsValidEnum.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ inline bool isValid(spv::ExecutionModel V) {
7373
case ExecutionModelCallableKHR:
7474
case ExecutionModeRegisterMapInterfaceINTEL:
7575
case ExecutionModeStreamingInterfaceINTEL:
76-
case internal::ExecutionModeMaximumRegistersINTEL:
77-
case internal::ExecutionModeMaximumRegistersIdINTEL:
78-
case internal::ExecutionModeNamedMaximumRegistersINTEL:
76+
case ExecutionModeMaximumRegistersINTEL:
77+
case ExecutionModeMaximumRegistersIdINTEL:
78+
case ExecutionModeNamedMaximumRegistersINTEL:
7979
return true;
8080
default:
8181
return false;

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
654654
add(CapabilityFPGAArgumentInterfacesINTEL, "FPGAArgumentInterfacesINTEL");
655655
add(CapabilityFPGALatencyControlINTEL, "FPGALatencyControlINTEL");
656656
add(CapabilityFPMaxErrorINTEL, "FPMaxErrorINTEL");
657+
add(CapabilityRegisterLimitsINTEL, "RegisterLimitsINTEL");
657658
// From spirv_internal.hpp
658659
add(internal::CapabilityFastCompositeINTEL, "FastCompositeINTEL");
659660
add(internal::CapabilityOptNoneINTEL, "OptNoneINTEL");
@@ -688,7 +689,6 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
688689
add(internal::CapabilitySubgroupRequirementsINTEL,
689690
"SubgroupRequirementsINTEL");
690691
add(internal::CapabilityTaskSequenceINTEL, "TaskSequenceINTEL");
691-
add(internal::CapabilityRegisterLimitsINTEL, "RegisterLimitsINTEL");
692692
}
693693
SPIRV_DEF_NAMEMAP(Capability, SPIRVCapabilityNameMap)
694694

@@ -713,11 +713,10 @@ template <> inline void SPIRVMap<HostAccessQualifier, std::string>::init() {
713713
SPIRV_DEF_NAMEMAP(HostAccessQualifier, SPIRVHostAccessQualifierNameMap)
714714

715715
template <>
716-
inline void
717-
SPIRVMap<internal::InternalNamedMaximumNumberOfRegisters, std::string>::init() {
718-
add(internal::NamedMaximumNumberOfRegistersAutoINTEL, "AutoINTEL");
716+
inline void SPIRVMap<NamedMaximumNumberOfRegisters, std::string>::init() {
717+
add(NamedMaximumNumberOfRegistersAutoINTEL, "AutoINTEL");
719718
}
720-
SPIRV_DEF_NAMEMAP(internal::InternalNamedMaximumNumberOfRegisters,
719+
SPIRV_DEF_NAMEMAP(NamedMaximumNumberOfRegisters,
721720
SPIRVNamedMaximumNumberOfRegistersNameMap);
722721

723722
} /* namespace SPIRV */

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVStream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ SPIRV_DEF_ENCDEC(SPIRVDebugExtOpKind)
147147
SPIRV_DEF_ENCDEC(NonSemanticAuxDataOpKind)
148148
SPIRV_DEF_ENCDEC(InitializationModeQualifier)
149149
SPIRV_DEF_ENCDEC(HostAccessQualifier)
150-
SPIRV_DEF_ENCDEC(internal::InternalNamedMaximumNumberOfRegisters)
150+
SPIRV_DEF_ENCDEC(NamedMaximumNumberOfRegisters)
151151
SPIRV_DEF_ENCDEC(LinkageType)
152152

153153
// Read a string with padded 0's at the end so that they form a stream of

‎llvm-spirv/lib/SPIRV/libSPIRV/SPIRVStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ SPIRV_DEC_ENCDEC(SPIRVDebugExtOpKind)
231231
SPIRV_DEC_ENCDEC(NonSemanticAuxDataOpKind)
232232
SPIRV_DEC_ENCDEC(InitializationModeQualifier)
233233
SPIRV_DEC_ENCDEC(HostAccessQualifier)
234-
SPIRV_DEC_ENCDEC(internal::InternalNamedMaximumNumberOfRegisters)
234+
SPIRV_DEC_ENCDEC(NamedMaximumNumberOfRegisters)
235235
SPIRV_DEC_ENCDEC(LinkageType)
236236

237237
const SPIRVEncoder &operator<<(const SPIRVEncoder &O, const std::string &Str);

‎llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,13 @@ enum InternalCapability {
125125
ICapabilityJointMatrixPackedInt4ComponentTypeINTEL = 6439,
126126
ICapabilityCacheControlsINTEL = 6441,
127127
ICapabilitySubgroupRequirementsINTEL = 6445,
128-
ICapRegisterLimitsINTEL = 6460
129128
};
130129

131130
enum InternalFunctionControlMask { IFunctionControlOptNoneINTELMask = 0x10000 };
132131

133132
enum InternalExecutionMode {
134133
IExecModeFastCompositeKernelINTEL = 6088,
135134
IExecModeNamedSubgroupSizeINTEL = 6446,
136-
IExecModeMaximumRegistersINTEL = 6461,
137-
IExecModeMaximumRegistersIdINTEL = 6462,
138-
IExecModeNamedMaximumRegistersINTEL = 6463
139135
};
140136

141137
constexpr LinkageType LinkageTypeInternal =
@@ -163,10 +159,6 @@ enum InternalBuiltIn {
163159
IBuiltInGlobalHWThreadIDINTEL = 6136,
164160
};
165161

166-
enum InternalNamedMaximumNumberOfRegisters {
167-
NamedMaximumNumberOfRegistersAutoINTEL = 0,
168-
};
169-
170162
#define _SPIRV_OP(x, y) constexpr x x##y = static_cast<x>(I##x##y);
171163
_SPIRV_OP(Capability, JointMatrixINTEL)
172164
_SPIRV_OP(Capability, JointMatrixWIInstructionsINTEL)
@@ -300,20 +292,12 @@ constexpr Capability CapabilityBfloat16ConversionINTEL =
300292
static_cast<Capability>(ICapBfloat16ConversionINTEL);
301293
constexpr Capability CapabilityGlobalVariableDecorationsINTEL =
302294
static_cast<Capability>(ICapGlobalVariableDecorationsINTEL);
303-
constexpr Capability CapabilityRegisterLimitsINTEL =
304-
static_cast<Capability>(ICapRegisterLimitsINTEL);
305295

306296
constexpr FunctionControlMask FunctionControlOptNoneINTELMask =
307297
static_cast<FunctionControlMask>(IFunctionControlOptNoneINTELMask);
308298

309299
constexpr ExecutionMode ExecutionModeFastCompositeKernelINTEL =
310300
static_cast<ExecutionMode>(IExecModeFastCompositeKernelINTEL);
311-
constexpr ExecutionMode ExecutionModeMaximumRegistersINTEL =
312-
static_cast<ExecutionMode>(IExecModeMaximumRegistersINTEL);
313-
constexpr ExecutionMode ExecutionModeMaximumRegistersIdINTEL =
314-
static_cast<ExecutionMode>(IExecModeMaximumRegistersIdINTEL);
315-
constexpr ExecutionMode ExecutionModeNamedMaximumRegistersINTEL =
316-
static_cast<ExecutionMode>(IExecModeNamedMaximumRegistersINTEL);
317301

318302
constexpr ExecutionMode ExecutionModeNamedSubgroupSizeINTEL =
319303
static_cast<ExecutionMode>(IExecModeNamedSubgroupSizeINTEL);

‎llvm-spirv/spirv-headers-tag.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1c6bb2743599e6eb6f37b2969acc0aef812e32e3
1+
b73e168ca5e123dcf3dea8a34b19a5130f421ae1

0 commit comments

Comments
 (0)