Add infrastructure for SPV_INTEL_vector_compute extension

Extension is published at intel/llvm#1612

Change-Id: I145ca21c3f99ec11cfe0c4758e205564af5cff6f
Co-Authored-By: Aleksandr Bezzubikov  <[email protected]>
Co-Authored-By: Aleksander Us         <[email protected]>
Co-Authored-By: Alexey Sachkov        <[email protected]>
Co-Authored-By: Alexey Sotkin         <[email protected]>
Co-Authored-By: Anton Sidorenko       <[email protected]>
Co-Authored-By: Gang Chen             <[email protected]>
Co-Authored-By: Kai Chen              <[email protected]>
Co-Authored-By: Konstantin Vladimirov <[email protected]>
Co-Authored-By: Wei Pan               <[email protected]>

Author: 10 people

include/LLVMSPIRVExtensions.inc

@@ -17,3 +17,4 @@ EXT(SPV_INTEL_function_pointers)
 EXT(SPV_INTEL_kernel_attributes)
 EXT(SPV_INTEL_inline_assembly)
 EXT(SPV_INTEL_float_controls2)
+EXT(SPV_INTEL_vector_compute)

lib/SPIRV/SPIRVWriter.cpp

@@ -2287,6 +2287,14 @@ bool LLVMToSPIRV::transExecutionMode() {
           BM->addCapability(CapabilityFPGAKernelAttributesINTEL);
         }
       } break;
+      case spv::ExecutionModeSharedLocalMemorySizeINTEL: {
+        if (!BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_vector_compute))
+          break;
+        unsigned SLMSize;
+        N.get(SLMSize);
+        BF->addExecutionMode(new SPIRVExecutionMode(
+            BF, static_cast<ExecutionMode>(EMode), SLMSize));
+      } break;
 
       case spv::ExecutionModeDenormPreserve:
       case spv::ExecutionModeDenormFlushToZero:

lib/SPIRV/libSPIRV/SPIRVEntry.cpp

@@ -491,6 +491,7 @@ void SPIRVExecutionMode::decode(std::istream &I) {
   case ExecutionModeRoundingModeRTNINTEL:
   case ExecutionModeFloatingPointModeALTINTEL:
   case ExecutionModeFloatingPointModeIEEEINTEL:
+  case ExecutionModeSharedLocalMemorySizeINTEL:
   case ExecutionModeSubgroupSize:
   case ExecutionModeMaxWorkDimINTEL:
   case ExecutionModeNumSIMDWorkitemsINTEL:

lib/SPIRV/libSPIRV/SPIRVEntry.h

@@ -503,7 +503,8 @@ class SPIRVEntryPoint : public SPIRVAnnotation<OpEntryPoint> {
   SPIRVEntryPoint(SPIRVModule *TheModule, SPIRVExecutionModelKind,
                   SPIRVId TheId, const std::string &TheName,
                   std::vector<SPIRVId> Variables);
-  SPIRVEntryPoint() : ExecModel(ExecutionModelKernel) {}
+  SPIRVEntryPoint() {}
+
   _SPIRV_DCL_ENCDEC
 protected:
   SPIRVExecutionModelKind ExecModel;
@@ -825,6 +826,9 @@ class SPIRVCapability : public SPIRVEntryNoId<OpCapability> {
     case CapabilityRoundToInfinityINTEL:
     case CapabilityFloatingPointModeINTEL:
       return getSet(ExtensionID::SPV_INTEL_float_controls2);
+    case CapabilityVectorComputeINTEL:
+    case CapabilityVectorAnyINTEL:
+      return getSet(ExtensionID::SPV_INTEL_vector_compute);
     default:
       return SPIRVExtSet();
     }

lib/SPIRV/libSPIRV/SPIRVEnum.h

@@ -252,6 +252,8 @@ template <> inline void SPIRVMap<SPIRVExecutionModeKind, SPIRVCapVec>::init() {
                {CapabilityFloatingPointModeINTEL});
   ADD_VEC_INIT(ExecutionModeFloatingPointModeIEEEINTEL,
                {CapabilityFloatingPointModeINTEL});
+  ADD_VEC_INIT(ExecutionModeSharedLocalMemorySizeINTEL,
+               {CapabilityVectorComputeINTEL});
 }
 
 template <> inline void SPIRVMap<SPIRVMemoryModelKind, SPIRVCapVec>::init() {
@@ -263,7 +265,8 @@ template <> inline void SPIRVMap<SPIRVMemoryModelKind, SPIRVCapVec>::init() {
 template <> inline void SPIRVMap<SPIRVStorageClassKind, SPIRVCapVec>::init() {
   ADD_VEC_INIT(StorageClassUniform, {CapabilityShader});
   ADD_VEC_INIT(StorageClassOutput, {CapabilityShader});
-  ADD_VEC_INIT(StorageClassPrivate, {CapabilityShader});
+  ADD_VEC_INIT(StorageClassPrivate,
+               {CapabilityShader, CapabilityVectorComputeINTEL});
   ADD_VEC_INIT(StorageClassGeneric, {CapabilityGenericPointer});
   ADD_VEC_INIT(StorageClassPushConstant, {CapabilityShader});
   ADD_VEC_INIT(StorageClassAtomicCounter, {CapabilityAtomicStorage});
@@ -381,6 +384,14 @@ template <> inline void SPIRVMap<Decoration, SPIRVCapVec>::init() {
   ADD_VEC_INIT(DecorationReferencedIndirectlyINTEL,
                {CapabilityIndirectReferencesINTEL});
   ADD_VEC_INIT(DecorationSideEffectsINTEL, {CapabilityAsmINTEL});
+  ADD_VEC_INIT(DecorationVectorComputeFunctionINTEL,
+               {CapabilityVectorComputeINTEL});
+  ADD_VEC_INIT(DecorationVectorComputeVariableINTEL,
+               {CapabilityVectorComputeINTEL});
+  ADD_VEC_INIT(DecorationGlobalVariableOffsetINTEL,
+               {CapabilityVectorComputeINTEL});
+  ADD_VEC_INIT(DecorationFuncParamIOKind, {CapabilityVectorComputeINTEL});
+  ADD_VEC_INIT(DecorationStackCallINTEL, {CapabilityVectorComputeINTEL});
 }
 
 template <> inline void SPIRVMap<BuiltIn, SPIRVCapVec>::init() {

lib/SPIRV/libSPIRV/SPIRVIsValidEnum.h

@@ -152,6 +152,7 @@ inline bool isValid(spv::ExecutionMode V) {
   case ExecutionModeRoundingModeRTNINTEL:
   case ExecutionModeFloatingPointModeALTINTEL:
   case ExecutionModeFloatingPointModeIEEEINTEL:
+  case ExecutionModeSharedLocalMemorySizeINTEL:
     return true;
   default:
     return false;
@@ -419,6 +420,11 @@ inline bool isValid(spv::Decoration V) {
   case DecorationDoublepumpINTEL:
   case DecorationBankBitsINTEL:
   case DecorationReferencedIndirectlyINTEL:
+  case DecorationVectorComputeFunctionINTEL:
+  case DecorationStackCallINTEL:
+  case DecorationVectorComputeVariableINTEL:
+  case DecorationGlobalVariableOffsetINTEL:
+  case DecorationFuncParamIOKind:
     return true;
   default:
     return false;
@@ -590,6 +596,8 @@ inline bool isValid(spv::Capability V) {
   case CapabilityRoundingModeRTZ:
   case CapabilityRoundToInfinityINTEL:
   case CapabilityFloatingPointModeINTEL:
+  case CapabilityVectorComputeINTEL:
+  case CapabilityVectorAnyINTEL:
   case CapabilityFPGAMemoryAttributesINTEL:
   case CapabilityFPGALoopControlsINTEL:
   case CapabilityBlockingPipesINTEL:

lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h

@@ -132,6 +132,7 @@ template <> inline void SPIRVMap<ExecutionMode, std::string>::init() {
   add(ExecutionModeRoundingModeRTNINTEL, "RoundingModeRTNINTEL");
   add(ExecutionModeFloatingPointModeALTINTEL, "FloatingPointModeALTINTEL");
   add(ExecutionModeFloatingPointModeIEEEINTEL, "FloatingPointModeIEEEINTEL");
+  add(ExecutionModeSharedLocalMemorySizeINTEL, "SharedLocalMemorySizeINTEL");
 }
 SPIRV_DEF_NAMEMAP(ExecutionMode, SPIRVExecutionModeNameMap)
 
@@ -358,6 +359,11 @@ template <> inline void SPIRVMap<Decoration, std::string>::init() {
   add(DecorationMergeINTEL, "MergeINTEL");
   add(DecorationBankBitsINTEL, "BankBitsINTEL");
   add(DecorationReferencedIndirectlyINTEL, "ReferencedIndirectlyINTEL");
+  add(DecorationVectorComputeFunctionINTEL, "VectorComputeFunctionINTEL");
+  add(DecorationStackCallINTEL, "StackCallINTEL");
+  add(DecorationVectorComputeVariableINTEL, "VectorComputeVariableINTEL");
+  add(DecorationGlobalVariableOffsetINTEL, "GlobalVariableOffsetINTEL");
+  add(DecorationFuncParamIOKind, "FuncParamIOKind");
 }
 SPIRV_DEF_NAMEMAP(Decoration, SPIRVDecorationNameMap)
 
@@ -509,6 +515,8 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
   add(CapabilitySubgroupImageMediaBlockIOINTEL,
       "SubgroupImageMediaBlockIOINTEL");
   add(CapabilityAsmINTEL, "AsmINTEL");
+  add(CapabilityVectorComputeINTEL, "VectorComputeINTEL");
+  add(CapabilityVectorAnyINTEL, "VectorAnyINTEL");
   add(CapabilityRoundToInfinityINTEL, "RoundToInfinityINTEL");
   add(CapabilityFloatingPointModeINTEL, "FloatingPointModeINTEL");
   add(CapabilitySubgroupAvcMotionEstimationINTEL,

lib/SPIRV/libSPIRV/SPIRVType.h

@@ -292,6 +292,11 @@ class SPIRVTypeVector : public SPIRVType {
     // usage of 8-component or 16-component vectors.
     if (CompCount == 8 || CompCount == 16)
       V.push_back(CapabilityVector16);
+
+    if (Module->isAllowedToUseExtension(ExtensionID::SPV_INTEL_vector_compute))
+      if (CompCount == 1 || (CompCount > 4 && CompCount < 8) ||
+          (CompCount > 8 && CompCount < 16) || CompCount > 16)
+        V.push_back(CapabilityVectorAnyINTEL);
     return V;
   }
 
@@ -304,8 +309,13 @@ class SPIRVTypeVector : public SPIRVType {
   void validate() const override {
     SPIRVEntry::validate();
     CompType->validate();
-    assert(CompCount == 2 || CompCount == 3 || CompCount == 4 ||
-           CompCount == 8 || CompCount == 16);
+#ifndef NDEBUG
+    if (!(Module->isAllowedToUseExtension(
+            ExtensionID::SPV_INTEL_vector_compute))) {
+      assert(CompCount == 2 || CompCount == 3 || CompCount == 4 ||
+             CompCount == 8 || CompCount == 16);
+    }
+#endif // !NDEBUG
   }
 
 private:

lib/SPIRV/libSPIRV/spirv.hpp

@@ -162,6 +162,7 @@ enum ExecutionMode {
     ExecutionModeSampleInterlockUnorderedEXT = 5369,
     ExecutionModeShadingRateInterlockOrderedEXT = 5370,
     ExecutionModeShadingRateInterlockUnorderedEXT = 5371,
+    ExecutionModeSharedLocalMemorySizeINTEL = 5618,
     ExecutionModeRoundingModeRTPINTEL = 5620,
     ExecutionModeRoundingModeRTNINTEL = 5621,
     ExecutionModeFloatingPointModeALTINTEL = 5622,
@@ -476,6 +477,11 @@ enum Decoration {
   DecorationAliasedPointerEXT = 5356,
   DecorationReferencedIndirectlyINTEL = 5602,
   DecorationSideEffectsINTEL = 5608,
+  DecorationVectorComputeVariableINTEL = 5624,
+  DecorationFuncParamIOKind = 5625,
+  DecorationVectorComputeFunctionINTEL = 5626,
+  DecorationStackCallINTEL = 5627,
+  DecorationGlobalVariableOffsetINTEL = 5628,
   DecorationCounterBuffer = 5634,
   DecorationHlslCounterBufferGOOGLE = 5634,
   DecorationHlslSemanticGOOGLE = 5635,
@@ -927,6 +933,8 @@ enum Capability {
   CapabilityFunctionPointersINTEL = 5603,
   CapabilityIndirectReferencesINTEL = 5604,
   CapabilityAsmINTEL = 5606,
+  CapabilityVectorComputeINTEL = 5617,
+  CapabilityVectorAnyINTEL = 5619,
   CapabilitySubgroupAvcMotionEstimationINTEL = 5696,
   CapabilitySubgroupAvcMotionEstimationIntraINTEL = 5697,
   CapabilitySubgroupAvcMotionEstimationChromaINTEL = 5698,