From a777c2a4584a7e6c26d4b4fe816f4572ca090296 Mon Sep 17 00:00:00 2001 From: Artem Gindinson Date: Mon, 19 Jul 2021 15:49:44 +0300 Subject: [PATCH] [NFC] Move non-upstreamed FuncParam decorations into internal:: Signed-off-by: Artem Gindinson --- llvm-spirv/lib/SPIRV/SPIRVReader.cpp | 7 ++++--- llvm-spirv/lib/SPIRV/SPIRVWriter.cpp | 2 +- llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp | 16 ++++++++-------- llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h | 2 +- llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h | 6 ++++-- llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h | 4 ++-- llvm-spirv/lib/SPIRV/libSPIRV/spirv.hpp | 2 -- llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp | 8 +++++++- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/llvm-spirv/lib/SPIRV/SPIRVReader.cpp b/llvm-spirv/lib/SPIRV/SPIRVReader.cpp index c138d793f1f0e..0e612d94917cd 100644 --- a/llvm-spirv/lib/SPIRV/SPIRVReader.cpp +++ b/llvm-spirv/lib/SPIRV/SPIRVReader.cpp @@ -4316,16 +4316,17 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) { std::to_string(Kind)); F->addAttribute(ArgNo + 1, Attr); } - if (BA->hasDecorate(DecorationFuncParamKindINTEL, 0, &Kind)) { + if (BA->hasDecorate(internal::DecorationFuncParamKindINTEL, 0, &Kind)) { Attribute Attr = Attribute::get(*Context, kVCMetadata::VCArgumentKind, std::to_string(Kind)); F->addAttribute(ArgNo + 1, Attr); } if (BA->hasDecorate(DecorationSingleElementVectorINTEL)) F->addAttribute(ArgNo + 1, SEVAttr); - if (BA->hasDecorate(DecorationFuncParamDescINTEL)) { + if (BA->hasDecorate(internal::DecorationFuncParamDescINTEL)) { auto Desc = - BA->getDecorationStringLiteral(DecorationFuncParamDescINTEL).front(); + BA->getDecorationStringLiteral(internal::DecorationFuncParamDescINTEL) + .front(); Attribute Attr = Attribute::get(*Context, kVCMetadata::VCArgumentDesc, Desc); F->addAttribute(ArgNo + 1, Attr); diff --git a/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp b/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp index c1962893dcbc0..27c8e2077d488 100644 --- a/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp +++ b/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp @@ -753,7 +753,7 @@ void LLVMToSPIRVBase::transVectorComputeMetadata(Function *F) { Attrs.getAttribute(ArgNo + 1, kVCMetadata::VCArgumentKind) .getValueAsString() .getAsInteger(0, Kind); - BA->addDecorate(DecorationFuncParamKindINTEL, Kind); + BA->addDecorate(internal::DecorationFuncParamKindINTEL, Kind); } if (Attrs.hasAttribute(ArgNo + 1, kVCMetadata::VCArgumentDesc)) { StringRef Desc = diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp index fc97169418223..adf3274f3936b 100644 --- a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp +++ b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp @@ -101,7 +101,7 @@ size_t SPIRVDecorateGeneric::getLiteralCount() const { return Literals.size(); } void SPIRVDecorate::encode(spv_ostream &O) const { SPIRVEncoder Encoder = getEncoder(O); Encoder << Target << Dec; - switch (Dec) { + switch (static_cast(Dec)) { case DecorationLinkageAttributes: SPIRVDecorateLinkageAttr::encodeLiterals(Encoder, Literals); break; @@ -114,7 +114,7 @@ void SPIRVDecorate::encode(spv_ostream &O) const { case DecorationUserSemantic: SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals); break; - case DecorationFuncParamDescINTEL: + case internal::DecorationFuncParamDescINTEL: SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals); break; default: @@ -130,7 +130,7 @@ void SPIRVDecorate::setWordCount(SPIRVWord Count) { void SPIRVDecorate::decode(std::istream &I) { SPIRVDecoder Decoder = getDecoder(I); Decoder >> Target >> Dec; - switch (Dec) { + switch (static_cast(Dec)) { case DecorationLinkageAttributes: SPIRVDecorateLinkageAttr::decodeLiterals(Decoder, Literals); break; @@ -143,7 +143,7 @@ void SPIRVDecorate::decode(std::istream &I) { case DecorationUserSemantic: SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals); break; - case DecorationFuncParamDescINTEL: + case internal::DecorationFuncParamDescINTEL: SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals); break; default: @@ -171,7 +171,7 @@ void SPIRVDecorateId::decode(std::istream &I) { void SPIRVMemberDecorate::encode(spv_ostream &O) const { SPIRVEncoder Encoder = getEncoder(O); Encoder << Target << MemberNumber << Dec; - switch (Dec) { + switch (static_cast(Dec)) { case DecorationMemoryINTEL: SPIRVDecorateMemoryINTELAttr::encodeLiterals(Encoder, Literals); break; @@ -181,7 +181,7 @@ void SPIRVMemberDecorate::encode(spv_ostream &O) const { case DecorationUserSemantic: SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals); break; - case DecorationFuncParamDescINTEL: + case internal::DecorationFuncParamDescINTEL: SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals); break; default: @@ -197,7 +197,7 @@ void SPIRVMemberDecorate::setWordCount(SPIRVWord Count) { void SPIRVMemberDecorate::decode(std::istream &I) { SPIRVDecoder Decoder = getDecoder(I); Decoder >> Target >> MemberNumber >> Dec; - switch (Dec) { + switch (static_cast(Dec)) { case DecorationMemoryINTEL: SPIRVDecorateMemoryINTELAttr::decodeLiterals(Decoder, Literals); break; @@ -207,7 +207,7 @@ void SPIRVMemberDecorate::decode(std::istream &I) { case DecorationUserSemantic: SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals); break; - case DecorationFuncParamDescINTEL: + case internal::DecorationFuncParamDescINTEL: SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals); break; default: diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h index dbfbe61784f1f..fd07f479c1f1f 100644 --- a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h +++ b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDecorate.h @@ -500,7 +500,7 @@ class SPIRVDecorateUserSemanticAttr }; class SPIRVDecorateFuncParamDescAttr - : public SPIRVDecorateStrAttrBase { + : public SPIRVDecorateStrAttrBase { public: // Complete constructor for UserSemantic decoration SPIRVDecorateFuncParamDescAttr(SPIRVEntry *TheTarget, diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h index 93032131c2fbe..154cf721d6836 100644 --- a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h +++ b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEnum.h @@ -405,8 +405,10 @@ template <> inline void SPIRVMap::init() { ADD_VEC_INIT(DecorationFuncParamIOKindINTEL, {CapabilityVectorComputeINTEL}); ADD_VEC_INIT(DecorationStackCallINTEL, {CapabilityVectorComputeINTEL}); ADD_VEC_INIT(DecorationSIMTCallINTEL, {CapabilityVectorComputeINTEL}); - ADD_VEC_INIT(DecorationFuncParamKindINTEL, {CapabilityVectorComputeINTEL}); - ADD_VEC_INIT(DecorationFuncParamDescINTEL, {CapabilityVectorComputeINTEL}); + ADD_VEC_INIT(internal::DecorationFuncParamKindINTEL, + {CapabilityVectorComputeINTEL}); + ADD_VEC_INIT(internal::DecorationFuncParamDescINTEL, + {CapabilityVectorComputeINTEL}); ADD_VEC_INIT(DecorationBurstCoalesceINTEL, {CapabilityFPGAMemoryAccessesINTEL}); ADD_VEC_INIT(DecorationCacheSizeINTEL, {CapabilityFPGAMemoryAccessesINTEL}); diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h index 2f58a82b0db3b..12520c34115b0 100644 --- a/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h +++ b/llvm-spirv/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h @@ -160,8 +160,6 @@ template <> inline void SPIRVMap::init() { add(DecorationCacheSizeINTEL, "CacheSizeINTEL"); add(DecorationDontStaticallyCoalesceINTEL, "DontStaticallyCoalesceINTEL"); add(DecorationPrefetchINTEL, "PrefetchINTEL"); - add(DecorationFuncParamKindINTEL, "FuncParamKindINTEL"); - add(DecorationFuncParamDescINTEL, "FuncParamDescINTEL"); add(DecorationStallEnableINTEL, "StallEnableINTEL"); add(DecorationFuseLoopsInFunctionINTEL, "FuseLoopsInFunctionINTEL"); add(DecorationBufferLocationINTEL, "BufferLocationINTEL"); @@ -173,6 +171,8 @@ template <> inline void SPIRVMap::init() { "VectorComputeCallableFunctionINTEL"); // From spirv_internal.hpp + add(internal::DecorationFuncParamKindINTEL, "FuncParamKindINTEL"); + add(internal::DecorationFuncParamDescINTEL, "FuncParamDescINTEL"); add(internal::DecorationCallableFunctionINTEL, "CallableFunctionINTEL"); add(internal::DecorationMathOpDSPModeINTEL, "MathOpDSPModeINTEL"); add(internal::DecorationAliasScopeINTEL, "AliasScopeINTEL"); diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/spirv.hpp b/llvm-spirv/lib/SPIRV/libSPIRV/spirv.hpp index f25aa267844b2..9fd645132f6dc 100644 --- a/llvm-spirv/lib/SPIRV/libSPIRV/spirv.hpp +++ b/llvm-spirv/lib/SPIRV/libSPIRV/spirv.hpp @@ -499,8 +499,6 @@ enum Decoration { DecorationRestrictPointerEXT = 5355, DecorationAliasedPointer = 5356, DecorationAliasedPointerEXT = 5356, - DecorationFuncParamKindINTEL = 9624, - DecorationFuncParamDescINTEL = 9625, DecorationSIMTCallINTEL = 5599, DecorationReferencedIndirectlyINTEL = 5602, DecorationClobberINTEL = 5607, diff --git a/llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp b/llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp index d89b8e20df463..9a919a5be4a69 100644 --- a/llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp +++ b/llvm-spirv/lib/SPIRV/libSPIRV/spirv_internal.hpp @@ -56,7 +56,9 @@ enum InternalDecoration { IDecMaxConcurrencyINTEL = 5918, IDecPipelineEnableINTEL = 5919, IDecRuntimeAlignedINTEL = 5940, - IDecCallableFunctionINTEL = 6087 + IDecCallableFunctionINTEL = 6087, + IDecFuncParamKindINTEL = 9624, + IDecFuncParamDescINTEL = 9625 }; enum InternalCapability { @@ -112,6 +114,10 @@ constexpr Decoration DecorationCallableFunctionINTEL = static_cast(IDecCallableFunctionINTEL); constexpr Decoration DecorationRuntimeAlignedINTEL = static_cast(IDecRuntimeAlignedINTEL); +constexpr Decoration DecorationFuncParamKindINTEL = + static_cast(IDecFuncParamKindINTEL); +constexpr Decoration DecorationFuncParamDescINTEL = + static_cast(IDecFuncParamDescINTEL); constexpr Capability CapabilityOptimizationHintsINTEL = static_cast(ICapOptimizationHintsINTEL);