From b8fb23840fe5604336335bba46ffb47cad30203a Mon Sep 17 00:00:00 2001 From: Dmitry Sidorov Date: Tue, 28 Mar 2023 21:58:02 +0200 Subject: [PATCH] Rename ConvertFToTF32INTEL to RoundFToTF32INTEL (#1913) Extension name will be preserved for a while for binary compatibility. Signed-off-by: Sidorov, Dmitry --- include/LLVMSPIRVExtensions.inc | 3 ++- lib/SPIRV/libSPIRV/SPIRVInstruction.h | 12 +++++----- lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h | 4 ++-- lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h | 2 +- lib/SPIRV/libSPIRV/spirv_internal.hpp | 8 +++---- .../convert_tensor_float32.ll | 24 +++++++++---------- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc index b46234ed49..5dc2bbc2f4 100644 --- a/include/LLVMSPIRVExtensions.inc +++ b/include/LLVMSPIRVExtensions.inc @@ -31,7 +31,8 @@ EXT(SPV_INTEL_memory_access_aliasing) EXT(SPV_INTEL_debug_module) EXT(SPV_INTEL_bfloat16_conversion) EXT(SPV_INTEL_masked_gather_scatter) -EXT(SPV_INTEL_tensor_float32_conversion) +EXT(SPV_INTEL_tensor_float32_conversion) // TODO: to remove old extension +EXT(SPV_INTEL_tensor_float32_rounding) EXT(SPV_INTEL_hw_thread_queries) EXT(SPV_EXT_relaxed_printf_string_address_space) EXT(SPV_INTEL_split_barrier) diff --git a/lib/SPIRV/libSPIRV/SPIRVInstruction.h b/lib/SPIRV/libSPIRV/SPIRVInstruction.h index e001e993a8..d62ae31173 100644 --- a/lib/SPIRV/libSPIRV/SPIRVInstruction.h +++ b/lib/SPIRV/libSPIRV/SPIRVInstruction.h @@ -3085,10 +3085,10 @@ _SPIRV_OP(MaskedScatter, false, 5) #undef _SPIRV_OP template -class SPIRVTensorFloat32ConversionINTELInstBase : public SPIRVUnaryInst { +class SPIRVTensorFloat32RoundingINTELInstBase : public SPIRVUnaryInst { protected: SPIRVCapVec getRequiredCapability() const override { - return getVec(internal::CapabilityTensorFloat32ConversionINTEL); + return getVec(internal::CapabilityTensorFloat32RoundingINTEL); } SPIRVExtSet getRequiredExtensions() const override { @@ -3109,8 +3109,8 @@ class SPIRVTensorFloat32ConversionINTELInstBase : public SPIRVUnaryInst { // because it may call a method of class Module that may modify LiteralMap // of Module field. That modification is not impacting validate method for // these instructions, so const_cast is safe here. - using SPVTF32ConvTy = SPIRVTensorFloat32ConversionINTELInstBase; - SPIRVValue *Input = const_cast(this)->getOperand(0); + using SPVTF32RoundTy = SPIRVTensorFloat32RoundingINTELInstBase; + SPIRVValue *Input = const_cast(this)->getOperand(0); SPIRVType *InCompTy = Input->getType(); SPIRVWord InCompCount = 1; @@ -3138,8 +3138,8 @@ class SPIRVTensorFloat32ConversionINTELInstBase : public SPIRVUnaryInst { }; #define _SPIRV_OP(x) \ - typedef SPIRVTensorFloat32ConversionINTELInstBase SPIRV##x; -_SPIRV_OP(ConvertFToTF32INTEL) + typedef SPIRVTensorFloat32RoundingINTELInstBase SPIRV##x; +_SPIRV_OP(RoundFToTF32INTEL) #undef _SPIRV_OP class SPIRVSplitBarrierINTELBase : public SPIRVInstTemplateBase { diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h index 0022bc8ddf..528d05696c 100644 --- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h +++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h @@ -577,8 +577,8 @@ template <> inline void SPIRVMap::init() { add(internal::CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL"); add(internal::CapabilityBfloat16ConversionINTEL, "Bfloat16ConversionINTEL"); add(internal::CapabilityMaskedGatherScatterINTEL, "MaskedGatherScatterINTEL"); - add(internal::CapabilityTensorFloat32ConversionINTEL, - "TensorFloat32ConversionINTEL"); + add(internal::CapabilityTensorFloat32RoundingINTEL, + "TensorFloat32RoundingINTEL"); add(internal::CapabilityHWThreadQueryINTEL, "HWThreadQueryINTEL"); add(CapabilitySplitBarrierINTEL, "SplitBarrierINTEL"); add(internal::CapabilityGlobalVariableDecorationsINTEL, diff --git a/lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h b/lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h index 32262b6142..88d279fd42 100644 --- a/lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h +++ b/lib/SPIRV/libSPIRV/SPIRVOpCodeEnumInternal.h @@ -8,4 +8,4 @@ _SPIRV_OP_INTERNAL(ConvertFToBF16INTEL, internal::OpConvertFToBF16INTEL) _SPIRV_OP_INTERNAL(ConvertBF16ToFINTEL, internal::OpConvertBF16ToFINTEL) _SPIRV_OP_INTERNAL(MaskedGatherINTEL, internal::OpMaskedGatherINTEL) _SPIRV_OP_INTERNAL(MaskedScatterINTEL, internal::OpMaskedScatterINTEL) -_SPIRV_OP_INTERNAL(ConvertFToTF32INTEL, internal::ConvertFToTF32INTEL) +_SPIRV_OP_INTERNAL(RoundFToTF32INTEL, internal::RoundFToTF32INTEL) diff --git a/lib/SPIRV/libSPIRV/spirv_internal.hpp b/lib/SPIRV/libSPIRV/spirv_internal.hpp index e61423dc69..6f60833cdf 100644 --- a/lib/SPIRV/libSPIRV/spirv_internal.hpp +++ b/lib/SPIRV/libSPIRV/spirv_internal.hpp @@ -40,7 +40,7 @@ enum InternalOp { IOpAliasScopeListDeclINTEL = 5913, IOpConvertFToBF16INTEL = 6116, IOpConvertBF16ToFINTEL = 6117, - IOpConvertFToTF32INTEL = 6426, + IOpRoundFToTF32INTEL = 6426, IOpMaskedGatherINTEL = 6428, IOpMaskedScatterINTEL = 6429, IOpPrev = OpMax - 2, @@ -59,7 +59,7 @@ enum InternalCapability { ICapMemoryAccessAliasingINTEL = 5910, ICapDebugInfoModuleINTEL = 6114, ICapBfloat16ConversionINTEL = 6115, - ICapabilityTensorFloat32ConversionINTEL = 6425, + ICapabilityTensorFloat32RoundingINTEL = 6425, ICapabilityMaskedGatherScatterINTEL = 6427, ICapabilityHWThreadQueryINTEL = 6134, ICapGlobalVariableDecorationsINTEL = 6146 @@ -78,8 +78,8 @@ _SPIRV_OP(Capability, MaskedGatherScatterINTEL) _SPIRV_OP(Op, MaskedGatherINTEL) _SPIRV_OP(Op, MaskedScatterINTEL) -_SPIRV_OP(Capability, TensorFloat32ConversionINTEL) -_SPIRV_OP(Op, ConvertFToTF32INTEL) +_SPIRV_OP(Capability, TensorFloat32RoundingINTEL) +_SPIRV_OP(Op, RoundFToTF32INTEL) enum InternalBuiltIn { IBuiltInSubDeviceIDINTEL = 6135, diff --git a/test/transcoding/SPV_INTEL_tensor_float32_conversion/convert_tensor_float32.ll b/test/transcoding/SPV_INTEL_tensor_float32_conversion/convert_tensor_float32.ll index 07b1965996..28be3e74e7 100644 --- a/test/transcoding/SPV_INTEL_tensor_float32_conversion/convert_tensor_float32.ll +++ b/test/transcoding/SPV_INTEL_tensor_float32_conversion/convert_tensor_float32.ll @@ -13,7 +13,7 @@ target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64" target triple = "spir64-unknown-unknown" -; CHECK-SPIRV: Capability TensorFloat32ConversionINTEL +; CHECK-SPIRV: Capability TensorFloat32RoundingINTEL ; CHECK-SPIRV: Extension "SPV_INTEL_tensor_float32_conversion" ; CHECK-SPIRV: TypeFloat [[#FP32Ty:]] 32 ; CHECK-SPIRV: TypeVector [[#FP32v8Ty:]] [[#FP32Ty]] 8 @@ -22,24 +22,24 @@ target triple = "spir64-unknown-unknown" ; CHECK-SPIRV: FunctionParameter [[#FP32Ty]] [[FP32ValId:.*]] ; CHECK-SPIRV: FunctionParameter [[#FP32v8Ty]] [[FP32v8ValId:.*]] -; CHECK-SPIRV: ConvertFToTF32INTEL [[#FP32Ty]] [[#IGNORE0:]] [[FP32ValId]] -; CHECK-SPIRV: ConvertFToTF32INTEL [[#FP32v8Ty]] [[#IGNORE1:]] [[FP32v8ValId]] -; CHECK-SPIRV: ConvertFToTF32INTEL [[#FP32Ty]] [[#IGNORE2:]] [[#CONST]] +; CHECK-SPIRV: RoundFToTF32INTEL [[#FP32Ty]] [[#IGNORE0:]] [[FP32ValId]] +; CHECK-SPIRV: RoundFToTF32INTEL [[#FP32v8Ty]] [[#IGNORE1:]] [[FP32v8ValId]] +; CHECK-SPIRV: RoundFToTF32INTEL [[#FP32Ty]] [[#IGNORE2:]] [[#CONST]] -; CHECK-LLVM: call spir_func float @_Z27__spirv_ConvertFToTF32INTELf(float -; CHECK-LLVM: call spir_func <8 x float> @_Z27__spirv_ConvertFToTF32INTELDv8_f(<8 x float> -; CHECK-LLVM: call spir_func float @_Z27__spirv_ConvertFToTF32INTELf(float 1.000000e+00) +; CHECK-LLVM: call spir_func float @_Z25__spirv_RoundFToTF32INTELf(float +; CHECK-LLVM: call spir_func <8 x float> @_Z25__spirv_RoundFToTF32INTELDv8_f(<8 x float> +; CHECK-LLVM: call spir_func float @_Z25__spirv_RoundFToTF32INTELf(float 1.000000e+00) define spir_func void @_Z2opffv8(float %a, <8 x float> %in) { - %1 = tail call spir_func float @_Z27__spirv_ConvertFToTF32INTELf(float %a) - %2 = tail call spir_func <8 x float> @_Z27__spirv_ConvertFToTF32INTELDv8_f(<8 x float> %in) - %3 = tail call spir_func float @_Z27__spirv_ConvertFToTF32INTELf(float 1.000000e+00) + %1 = tail call spir_func float @_Z25__spirv_RoundFToTF32INTELf(float %a) + %2 = tail call spir_func <8 x float> @_Z25__spirv_RoundFToTF32INTELDv8_f(<8 x float> %in) + %3 = tail call spir_func float @_Z25__spirv_RoundFToTF32INTELf(float 1.000000e+00) ret void } -declare spir_func float @_Z27__spirv_ConvertFToTF32INTELf(float) +declare spir_func float @_Z25__spirv_RoundFToTF32INTELf(float) -declare spir_func <8 x float> @_Z27__spirv_ConvertFToTF32INTELDv8_f(<8 x float>) +declare spir_func <8 x float> @_Z25__spirv_RoundFToTF32INTELDv8_f(<8 x float>) !opencl.spir.version = !{!0} !spirv.Source = !{!1}