Migrate arithmetic fence tokens to spirv_internal.hpp

Signed-off-by: Artem Gindinson <[email protected]>

Author: Artem Gindinson

lib/SPIRV/SPIRVReader.cpp

@@ -2805,7 +2805,7 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     return mapValue(
         BV, transArbFloatInst(static_cast<SPIRVInstruction *>(BV), BB, true));
 
-  case OpArithmeticFenceINTEL: {
+  case internal::OpArithmeticFenceINTEL: {
     IRBuilder<> Builder(BB);
     auto *BC = static_cast<SPIRVUnary *>(BV);
     Type *RetTy = transType(BC->getType());

lib/SPIRV/SPIRVWriter.cpp

@@ -3032,9 +3032,9 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
     SPIRVType *Ty = transType(II->getType());
     SPIRVValue *Op = transValue(II->getArgOperand(0), BB);
     if (BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_arithmetic_fence)) {
-      BM->addCapability(CapabilityFPArithmeticFenceINTEL);
+      BM->addCapability(internal::CapabilityFPArithmeticFenceINTEL);
       BM->addExtension(ExtensionID::SPV_INTEL_arithmetic_fence);
-      return BM->addUnaryInst(OpArithmeticFenceINTEL, Ty, Op, BB);
+      return BM->addUnaryInst(internal::OpArithmeticFenceINTEL, Ty, Op, BB);
     }
     return Op;
   }

lib/SPIRV/libSPIRV/SPIRVInstruction.h

@@ -1556,8 +1556,10 @@ _SPIRV_OP(Any)
 _SPIRV_OP(All)
 _SPIRV_OP(BitCount)
 _SPIRV_OP(BitReverse)
-_SPIRV_OP(ArithmeticFenceINTEL)
 #undef _SPIRV_OP
+#define _SPIRV_OP_INTERNAL(x) typedef SPIRVUnaryInst<internal::Op##x> SPIRV##x;
+_SPIRV_OP_INTERNAL(ArithmeticFenceINTEL)
+#undef _SPIRV_OP_INTERNAL
 
 class SPIRVAccessChainBase : public SPIRVInstTemplateBase {
 public:

lib/SPIRV/libSPIRV/SPIRVOpCodeEnum.h

@@ -537,4 +537,3 @@ _SPIRV_OP(TypeBufferSurfaceINTEL, 6086)
 _SPIRV_OP(TypeStructContinuedINTEL, 6090)
 _SPIRV_OP(ConstantCompositeContinuedINTEL, 6091)
 _SPIRV_OP(SpecConstantCompositeContinuedINTEL, 6092)
-_SPIRV_OP(ArithmeticFenceINTEL, 6144)

lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h

@@ -5,3 +5,4 @@ _SPIRV_OP_INTERNAL(AliasDomainDeclINTEL, internal::OpAliasDomainDeclINTEL)
 _SPIRV_OP_INTERNAL(AliasScopeDeclINTEL, internal::OpAliasScopeDeclINTEL)
 _SPIRV_OP_INTERNAL(AliasScopeListDeclINTEL, internal::OpAliasScopeListDeclINTEL)
 _SPIRV_OP_INTERNAL(TypeTokenINTEL, internal::OpTypeTokenINTEL)
+_SPIRV_OP_INTERNAL(ArithmeticFenceINTEL, internal::OpArithmeticFenceINTEL)

lib/SPIRV/libSPIRV/spirv.hpp

@@ -1051,7 +1051,6 @@ enum Capability {
     CapabilityLongConstantCompositeINTEL = 6089,
     CapabilityAtomicFloat16AddEXT = 6095,
     CapabilityDebugInfoModuleINTEL = 6114,
-    CapabilityFPArithmeticFenceINTEL = 6144,
     CapabilityMax = 0x7fffffff,
 };
 
@@ -1794,7 +1793,6 @@ enum Op {
     OpTypeStructContinuedINTEL = 6090,
     OpConstantCompositeContinuedINTEL = 6091,
     OpSpecConstantCompositeContinuedINTEL = 6092,
-    OpArithmeticFenceINTEL = 6145,
     OpMax = 0x7fffffff,
 };
 

lib/SPIRV/libSPIRV/spirv_internal.hpp

@@ -39,6 +39,7 @@ enum InternalOp {
   IOpAliasScopeDeclINTEL = 5912,
   IOpAliasScopeListDeclINTEL = 5913,
   IOpTypeTokenINTEL = 6113,
+  IOpArithmeticFenceINTEL = 6145,
   IOpPrev = OpMax - 2,
   IOpForward
 };
@@ -85,6 +86,7 @@ constexpr Op OpAliasScopeDeclINTEL = static_cast<Op>(IOpAliasScopeDeclINTEL);
 constexpr Op OpAliasScopeListDeclINTEL =
     static_cast<Op>(IOpAliasScopeListDeclINTEL);
 constexpr Op OpTypeTokenINTEL = static_cast<Op>(IOpTypeTokenINTEL);
+constexpr Op OpArithmeticFenceINTEL = static_cast<Op>(IOpArithmeticFenceINTEL);
 
 constexpr Decoration DecorationAliasScopeINTEL =
     static_cast<Decoration>(IDecAliasScopeINTEL );