[SPIR-V] Remove FuncParamKindINTEL and FuncParamDescINTEL

These decorations doesn't present in https://github.com/KhronosGroup/SPIRV-LLVM-Translator

Signed-off-by: Dmitry Sidorov <[email protected]>

Author: MrSidims

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

@@ -4124,20 +4124,8 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) {
                                       std::to_string(Kind));
       F->addAttribute(ArgNo + 1, Attr);
     }
-    if (BA->hasDecorate(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)) {
-      auto Desc =
-          BA->getDecorationStringLiteral(DecorationFuncParamDescINTEL).front();
-      Attribute Attr =
-          Attribute::get(*Context, kVCMetadata::VCArgumentDesc, Desc);
-      F->addAttribute(ArgNo + 1, Attr);
-    }
   }
 
   // Do not add float control if there is no any

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -687,19 +687,6 @@ void LLVMToSPIRV::transVectorComputeMetadata(Function *F) {
              "This decoration is valid only for Scalar or Pointer types");
       BA->addDecorate(DecorationSingleElementVectorINTEL);
     }
-    if (Attrs.hasAttribute(ArgNo + 1, kVCMetadata::VCArgumentKind)) {
-      SPIRVWord Kind;
-      Attrs.getAttribute(ArgNo + 1, kVCMetadata::VCArgumentKind)
-          .getValueAsString()
-          .getAsInteger(0, Kind);
-      BA->addDecorate(DecorationFuncParamKindINTEL, Kind);
-    }
-    if (Attrs.hasAttribute(ArgNo + 1, kVCMetadata::VCArgumentDesc)) {
-      StringRef Desc =
-          Attrs.getAttribute(ArgNo + 1, kVCMetadata::VCArgumentDesc)
-              .getValueAsString();
-      BA->addDecorate(new SPIRVDecorateFuncParamDescAttr(BA, Desc.str()));
-    }
   }
   if (!isKernel(F) &&
       BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_float_controls2) &&

llvm-spirv/lib/SPIRV/VectorComputeUtil.h

@@ -108,8 +108,6 @@ const static char VCGlobalVariable[] = "VCGlobalVariable";
 const static char VCVolatile[] = "VCVolatile";
 const static char VCByteOffset[] = "VCByteOffset";
 const static char VCSIMTCall[] = "VCSIMTCall";
-const static char VCArgumentKind[] = "VCArgumentKind";
-const static char VCArgumentDesc[] = "VCArgumentDesc";
 const static char VCCallable[] = "VCCallable";
 const static char VCSingleElementVector[] = "VCSingleElementVector";
 const static char VCFCEntry[] = "VCFCEntry";

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

@@ -113,9 +113,6 @@ void SPIRVDecorate::encode(spv_ostream &O) const {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
     break;
-  case DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
-    break;
   default:
     Encoder << Literals;
   }
@@ -142,9 +139,6 @@ void SPIRVDecorate::decode(std::istream &I) {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
     break;
-  case DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
-    break;
   default:
     Decoder >> Literals;
   }
@@ -164,9 +158,6 @@ void SPIRVMemberDecorate::encode(spv_ostream &O) const {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::encodeLiterals(Encoder, Literals);
     break;
-  case DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::encodeLiterals(Encoder, Literals);
-    break;
   default:
     Encoder << Literals;
   }
@@ -190,9 +181,6 @@ void SPIRVMemberDecorate::decode(std::istream &I) {
   case DecorationUserSemantic:
     SPIRVDecorateUserSemanticAttr::decodeLiterals(Decoder, Literals);
     break;
-  case DecorationFuncParamDescINTEL:
-    SPIRVDecorateFuncParamDescAttr::decodeLiterals(Decoder, Literals);
-    break;
   default:
     Decoder >> Literals;
   }

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

@@ -453,15 +453,6 @@ class SPIRVDecorateUserSemanticAttr
       : SPIRVDecorateStrAttrBase(TheTarget, AnnotateString) {}
 };
 
-class SPIRVDecorateFuncParamDescAttr
-    : public SPIRVDecorateStrAttrBase<DecorationFuncParamDescINTEL> {
-public:
-  //  Complete constructor for UserSemantic decoration
-  SPIRVDecorateFuncParamDescAttr(SPIRVEntry *TheTarget,
-                                 const std::string &AnnotateString)
-      : SPIRVDecorateStrAttrBase(TheTarget, AnnotateString) {}
-};
-
 class SPIRVDecorateMergeINTELAttr : public SPIRVDecorate {
 public:
   // Complete constructor for MergeINTEL decoration

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

@@ -398,8 +398,6 @@ template <> inline void SPIRVMap<Decoration, SPIRVCapVec>::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(DecorationBurstCoalesceINTEL,
                {CapabilityFPGAMemoryAccessesINTEL});
   ADD_VEC_INIT(DecorationCacheSizeINTEL, {CapabilityFPGAMemoryAccessesINTEL});

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

@@ -158,8 +158,6 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
   add(DecorationCacheSizeINTEL, "CacheSizeINTEL");
   add(DecorationDontStaticallyCoalesceINTEL, "DontStaticallyCoalesceINTEL");
   add(DecorationPrefetchINTEL, "PrefetchINTEL");
-  add(DecorationFuncParamKindINTEL, "FuncParamKindINTEL");
-  add(DecorationFuncParamDescINTEL, "FuncParamDescINTEL");
   add(DecorationBufferLocationINTEL, "BufferLocationINTEL");
   add(DecorationIOPipeStorageINTEL, "IOPipeStorageINTEL");
   add(DecorationFunctionFloatingPointModeINTEL,

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

@@ -509,8 +509,6 @@ enum Decoration {
     DecorationRestrictPointerEXT = 5355,
     DecorationAliasedPointer = 5356,
     DecorationAliasedPointerEXT = 5356,
-    DecorationFuncParamKindINTEL = 9624,
-    DecorationFuncParamDescINTEL = 9625,
     DecorationSIMTCallINTEL = 5599,
     DecorationReferencedIndirectlyINTEL = 5602,
     DecorationClobberINTEL = 5607,