Remove ExecutionModeNamedBarrierCountINTEL from spirv_internal (#1604)

It was actually upstreamed to SPIR-V Headers already.

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

Original commit:
KhronosGroup/SPIRV-LLVM-Translator@3335c25

Author: MrSidims

llvm-spirv/lib/SPIRV/PreprocessMetadata.cpp

@@ -357,7 +357,7 @@ void PreprocessMetadataBase::preprocessVectorComputeMetadata(Module *M,
           .getAsInteger(0, NBarrierCnt);
       EM.addOp()
           .add(&F)
-          .add(spv::internal::ExecutionModeNamedBarrierCountINTEL)
+          .add(spv::ExecutionModeNamedBarrierCountINTEL)
           .add(NBarrierCnt)
           .done();
     }

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

@@ -4206,8 +4206,7 @@ bool SPIRVToLLVM::transVectorComputeMetadata(SPIRVFunction *BF) {
     F->addFnAttr(Attr);
   }
 
-  if (auto *EM =
-          BF->getExecutionMode(internal::ExecutionModeNamedBarrierCountINTEL)) {
+  if (auto *EM = BF->getExecutionMode(ExecutionModeNamedBarrierCountINTEL)) {
     unsigned int NBarrierCnt = EM->getLiterals()[0];
     Attribute Attr = Attribute::get(*Context, kVCMetadata::VCNamedBarrierCount,
                                     std::to_string(NBarrierCnt));

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -4572,7 +4572,7 @@ bool LLVMToSPIRVBase::transExecutionMode() {
         BF->addExecutionMode(BM->add(new SPIRVExecutionMode(
             BF, static_cast<ExecutionMode>(EMode), SLMSize)));
       } break;
-      case spv::internal::ExecutionModeNamedBarrierCountINTEL: {
+      case spv::ExecutionModeNamedBarrierCountINTEL: {
         if (!BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_vector_compute))
           break;
         unsigned NBarrierCnt = 0;

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

@@ -580,7 +580,7 @@ void SPIRVExecutionMode::decode(std::istream &I) {
   case ExecutionModeFloatingPointModeALTINTEL:
   case ExecutionModeFloatingPointModeIEEEINTEL:
   case ExecutionModeSharedLocalMemorySizeINTEL:
-  case internal::ExecutionModeNamedBarrierCountINTEL:
+  case ExecutionModeNamedBarrierCountINTEL:
   case ExecutionModeSubgroupSize:
   case ExecutionModeMaxWorkDimINTEL:
   case ExecutionModeNumSIMDWorkitemsINTEL:

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

@@ -263,7 +263,7 @@ template <> inline void SPIRVMap<SPIRVExecutionModeKind, SPIRVCapVec>::init() {
                {internal::CapabilityFastCompositeINTEL});
   ADD_VEC_INIT(internal::ExecutionModeStreamingInterfaceINTEL,
                {CapabilityFPGAKernelAttributesINTEL});
-  ADD_VEC_INIT(internal::ExecutionModeNamedBarrierCountINTEL,
+  ADD_VEC_INIT(ExecutionModeNamedBarrierCountINTEL,
                {CapabilityVectorComputeINTEL});
 }
 

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

@@ -85,8 +85,7 @@ enum InternalFunctionControlMask { IFunctionControlOptNoneINTELMask = 0x10000 };
 
 enum InternalExecutionMode {
   IExecModeFastCompositeKernelINTEL = 6088,
-  IExecModeStreamingInterfaceINTEL = 6154,
-  IExecModeNamedBarrierCountINTEL = 6417
+  IExecModeStreamingInterfaceINTEL = 6154
 };
 
 enum InternalLoopControlMask { ILoopControlLoopCountINTELMask = 0x1000000 };
@@ -185,9 +184,6 @@ constexpr ExecutionMode ExecutionModeFastCompositeKernelINTEL =
 constexpr ExecutionMode ExecutionModeStreamingInterfaceINTEL =
     static_cast<ExecutionMode>(IExecModeStreamingInterfaceINTEL);
 
-constexpr ExecutionMode ExecutionModeNamedBarrierCountINTEL =
-    static_cast<ExecutionMode>(IExecModeNamedBarrierCountINTEL);
-
 static const LoopControlMask LoopControlLoopCountINTELMask =
     static_cast<LoopControlMask>(ILoopControlLoopCountINTELMask);