Skip to content

Commit 66ef4eb

Browse files
author
Artem Gindinson
authored
[SPIR-V][NFC] Move non-upstreamed FuncParam decorations into internal:: (#4138)
The decorations do not exist in KhronosGroup/SPIRV-LLVM-Translator, however will interfere with the forthcoming pulldown of SPIR-V Headers changes. Therefore, the decorations should be moved into the dedicated internal header. Signed-off-by: Artem Gindinson [email protected]
1 parent 63ba1ce commit 66ef4eb

File tree

8 files changed

+27
-20
lines changed

8 files changed

+27
-20
lines changed

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4316,16 +4316,17 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) {
43164316
std::to_string(Kind));
43174317
F->addAttribute(ArgNo + 1, Attr);
43184318
}
4319-
if (BA->hasDecorate(DecorationFuncParamKindINTEL, 0, &Kind)) {
4319+
if (BA->hasDecorate(internal::DecorationFuncParamKindINTEL, 0, &Kind)) {
43204320
Attribute Attr = Attribute::get(*Context, kVCMetadata::VCArgumentKind,
43214321
std::to_string(Kind));
43224322
F->addAttribute(ArgNo + 1, Attr);
43234323
}
43244324
if (BA->hasDecorate(DecorationSingleElementVectorINTEL))
43254325
F->addAttribute(ArgNo + 1, SEVAttr);
4326-
if (BA->hasDecorate(DecorationFuncParamDescINTEL)) {
4326+
if (BA->hasDecorate(internal::DecorationFuncParamDescINTEL)) {
43274327
auto Desc =
4328-
BA->getDecorationStringLiteral(DecorationFuncParamDescINTEL).front();
4328+
BA->getDecorationStringLiteral(internal::DecorationFuncParamDescINTEL)
4329+
.front();
43294330
Attribute Attr =
43304331
Attribute::get(*Context, kVCMetadata::VCArgumentDesc, Desc);
43314332
F->addAttribute(ArgNo + 1, Attr);

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ void LLVMToSPIRVBase::transVectorComputeMetadata(Function *F) {
753753
Attrs.getAttribute(ArgNo + 1, kVCMetadata::VCArgumentKind)
754754
.getValueAsString()
755755
.getAsInteger(0, Kind);
756-
BA->addDecorate(DecorationFuncParamKindINTEL, Kind);
756+
BA->addDecorate(internal::DecorationFuncParamKindINTEL, Kind);
757757
}
758758
if (Attrs.hasAttribute(ArgNo + 1, kVCMetadata::VCArgumentDesc)) {
759759
StringRef Desc =

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ size_t SPIRVDecorateGeneric::getLiteralCount() const { return Literals.size(); }
101101
void SPIRVDecorate::encode(spv_ostream &O) const {
102102
SPIRVEncoder Encoder = getEncoder(O);
103103
Encoder << Target << Dec;
104-
switch (Dec) {
104+
switch (static_cast<size_t>(Dec)) {
105105
case DecorationLinkageAttributes:
106106
SPIRVDecorateLinkageAttr::encodeLiterals(Encoder, Literals);
107107
break;
@@ -114,7 +114,7 @@ void SPIRVDecorate::encode(spv_ostream &O) const {
114114
case DecorationUserSemantic:
115115
SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
116116
break;
117-
case DecorationFuncParamDescINTEL:
117+
case internal::DecorationFuncParamDescINTEL:
118118
SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
119119
break;
120120
default:
@@ -130,7 +130,7 @@ void SPIRVDecorate::setWordCount(SPIRVWord Count) {
130130
void SPIRVDecorate::decode(std::istream &I) {
131131
SPIRVDecoder Decoder = getDecoder(I);
132132
Decoder >> Target >> Dec;
133-
switch (Dec) {
133+
switch (static_cast<size_t>(Dec)) {
134134
case DecorationLinkageAttributes:
135135
SPIRVDecorateLinkageAttr::decodeLiterals(Decoder, Literals);
136136
break;
@@ -143,7 +143,7 @@ void SPIRVDecorate::decode(std::istream &I) {
143143
case DecorationUserSemantic:
144144
SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
145145
break;
146-
case DecorationFuncParamDescINTEL:
146+
case internal::DecorationFuncParamDescINTEL:
147147
SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
148148
break;
149149
default:
@@ -171,7 +171,7 @@ void SPIRVDecorateId::decode(std::istream &I) {
171171
void SPIRVMemberDecorate::encode(spv_ostream &O) const {
172172
SPIRVEncoder Encoder = getEncoder(O);
173173
Encoder << Target << MemberNumber << Dec;
174-
switch (Dec) {
174+
switch (static_cast<size_t>(Dec)) {
175175
case DecorationMemoryINTEL:
176176
SPIRVDecorateMemoryINTELAttr::encodeLiterals(Encoder, Literals);
177177
break;
@@ -181,7 +181,7 @@ void SPIRVMemberDecorate::encode(spv_ostream &O) const {
181181
case DecorationUserSemantic:
182182
SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
183183
break;
184-
case DecorationFuncParamDescINTEL:
184+
case internal::DecorationFuncParamDescINTEL:
185185
SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
186186
break;
187187
default:
@@ -197,7 +197,7 @@ void SPIRVMemberDecorate::setWordCount(SPIRVWord Count) {
197197
void SPIRVMemberDecorate::decode(std::istream &I) {
198198
SPIRVDecoder Decoder = getDecoder(I);
199199
Decoder >> Target >> MemberNumber >> Dec;
200-
switch (Dec) {
200+
switch (static_cast<size_t>(Dec)) {
201201
case DecorationMemoryINTEL:
202202
SPIRVDecorateMemoryINTELAttr::decodeLiterals(Decoder, Literals);
203203
break;
@@ -207,7 +207,7 @@ void SPIRVMemberDecorate::decode(std::istream &I) {
207207
case DecorationUserSemantic:
208208
SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
209209
break;
210-
case DecorationFuncParamDescINTEL:
210+
case internal::DecorationFuncParamDescINTEL:
211211
SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
212212
break;
213213
default:

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ class SPIRVDecorateUserSemanticAttr
500500
};
501501

502502
class SPIRVDecorateFuncParamDescAttr
503-
: public SPIRVDecorateStrAttrBase<DecorationFuncParamDescINTEL> {
503+
: public SPIRVDecorateStrAttrBase<internal::DecorationFuncParamDescINTEL> {
504504
public:
505505
// Complete constructor for UserSemantic decoration
506506
SPIRVDecorateFuncParamDescAttr(SPIRVEntry *TheTarget,

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,10 @@ template <> inline void SPIRVMap<Decoration, SPIRVCapVec>::init() {
405405
ADD_VEC_INIT(DecorationFuncParamIOKindINTEL, {CapabilityVectorComputeINTEL});
406406
ADD_VEC_INIT(DecorationStackCallINTEL, {CapabilityVectorComputeINTEL});
407407
ADD_VEC_INIT(DecorationSIMTCallINTEL, {CapabilityVectorComputeINTEL});
408-
ADD_VEC_INIT(DecorationFuncParamKindINTEL, {CapabilityVectorComputeINTEL});
409-
ADD_VEC_INIT(DecorationFuncParamDescINTEL, {CapabilityVectorComputeINTEL});
408+
ADD_VEC_INIT(internal::DecorationFuncParamKindINTEL,
409+
{CapabilityVectorComputeINTEL});
410+
ADD_VEC_INIT(internal::DecorationFuncParamDescINTEL,
411+
{CapabilityVectorComputeINTEL});
410412
ADD_VEC_INIT(DecorationBurstCoalesceINTEL,
411413
{CapabilityFPGAMemoryAccessesINTEL});
412414
ADD_VEC_INIT(DecorationCacheSizeINTEL, {CapabilityFPGAMemoryAccessesINTEL});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
160160
add(DecorationCacheSizeINTEL, "CacheSizeINTEL");
161161
add(DecorationDontStaticallyCoalesceINTEL, "DontStaticallyCoalesceINTEL");
162162
add(DecorationPrefetchINTEL, "PrefetchINTEL");
163-
add(DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
164-
add(DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
165163
add(DecorationStallEnableINTEL, "StallEnableINTEL");
166164
add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL");
167165
add(DecorationBufferLocationINTEL, "BufferLocationINTEL");
@@ -173,6 +171,8 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
173171
"VectorComputeCallableFunctionINTEL");
174172

175173
// From spirv_internal.hpp
174+
add(internal::DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
175+
add(internal::DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
176176
add(internal::DecorationCallableFunctionINTEL, "CallableFunctionINTEL");
177177
add(internal::DecorationMathOpDSPModeINTEL, "MathOpDSPModeINTEL");
178178
add(internal::DecorationAliasScopeINTEL, "AliasScopeINTEL");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ enum Decoration {
499499
DecorationRestrictPointerEXT = 5355,
500500
DecorationAliasedPointer = 5356,
501501
DecorationAliasedPointerEXT = 5356,
502-
DecorationFuncParamKindINTEL = 9624,
503-
DecorationFuncParamDescINTEL = 9625,
504502
DecorationSIMTCallINTEL = 5599,
505503
DecorationReferencedIndirectlyINTEL = 5602,
506504
DecorationClobberINTEL = 5607,

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ enum InternalDecoration {
5656
IDecMaxConcurrencyINTEL = 5918,
5757
IDecPipelineEnableINTEL = 5919,
5858
IDecRuntimeAlignedINTEL = 5940,
59-
IDecCallableFunctionINTEL = 6087
59+
IDecCallableFunctionINTEL = 6087,
60+
IDecFuncParamKindINTEL = 9624,
61+
IDecFuncParamDescINTEL = 9625
6062
};
6163

6264
enum InternalCapability {
@@ -112,6 +114,10 @@ constexpr Decoration DecorationCallableFunctionINTEL =
112114
static_cast<Decoration>(IDecCallableFunctionINTEL);
113115
constexpr Decoration DecorationRuntimeAlignedINTEL =
114116
static_cast<Decoration>(IDecRuntimeAlignedINTEL);
117+
constexpr Decoration DecorationFuncParamKindINTEL =
118+
static_cast<Decoration>(IDecFuncParamKindINTEL);
119+
constexpr Decoration DecorationFuncParamDescINTEL =
120+
static_cast<Decoration>(IDecFuncParamDescINTEL);
115121

116122
constexpr Capability CapabilityOptimizationHintsINTEL =
117123
static_cast<Capability>(ICapOptimizationHintsINTEL);

0 commit comments

Comments
 (0)