Skip to content

Commit d59d905

Browse files
MrSidimssys-ce-bb
authored andcommitted
Revert "Finish renaming of SPV_INTEL_tensor_float32_conversion (#3033)"
This reverts commit f3e8eac185cdd74d3803ba5d65f3d17a000eaf8b. Original commit: KhronosGroup/SPIRV-LLVM-Translator@34eee90adfd62fa
1 parent a167fcd commit d59d905

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

llvm-spirv/include/LLVMSPIRVExtensions.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ EXT(SPV_INTEL_global_variable_fpga_decorations)
6363
EXT(SPV_INTEL_complex_float_mul_div)
6464
EXT(SPV_INTEL_split_barrier)
6565
EXT(SPV_INTEL_masked_gather_scatter)
66+
EXT(SPV_INTEL_tensor_float32_conversion) // TODO: to remove old extension
6667
EXT(SPV_INTEL_tensor_float32_rounding)
6768
EXT(SPV_EXT_relaxed_printf_string_address_space)
6869
EXT(SPV_INTEL_fpga_argument_interfaces)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3993,7 +3993,7 @@ class SPIRVTensorFloat32RoundingINTELInstBase : public SPIRVUnaryInst<OC> {
39933993
SPIRVType *ResCompTy = this->getType();
39943994
if (ResCompTy->isTypeCooperativeMatrixKHR())
39953995
this->getModule()->addExtension(ExtensionID::SPV_INTEL_joint_matrix);
3996-
return ExtensionID::SPV_INTEL_tensor_float32_rounding;
3996+
return ExtensionID::SPV_INTEL_tensor_float32_conversion;
39973997
}
39983998

39993999
void validate() const override {

llvm-spirv/test/extensions/INTEL/SPV_INTEL_joint_matrix/tf32_conversion_instructions.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
; RUN: llvm-as < %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_cooperative_matrix,+SPV_INTEL_joint_matrix,+SPV_INTEL_tensor_float32_rounding -o %t.spv
2+
; RUN: llvm-spirv %t.bc --spirv-ext=+SPV_KHR_cooperative_matrix,+SPV_INTEL_joint_matrix,+SPV_INTEL_tensor_float32_conversion -o %t.spv
33
; RUN: llvm-spirv %t.spv -to-text -o %t.spt
44
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
55

66
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
77
; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
88

9-
; RUN: not llvm-spirv %t.bc --spirv-ext=+SPV_KHR_cooperative_matrix,+SPV_INTEL_tensor_float32_rounding 2>&1 \
9+
; RUN: not llvm-spirv %t.bc --spirv-ext=+SPV_KHR_cooperative_matrix,+SPV_INTEL_tensor_float32_conversion 2>&1 \
1010
; RUN: | FileCheck %s --check-prefix=CHECK-ERROR
1111

1212
; CHECK-ERROR: InvalidInstruction: Can't translate llvm instruction:
@@ -16,7 +16,7 @@
1616
; CHECK-SPIRV-DAG: Capability CooperativeMatrixKHR
1717
; CHECK-SPIRV-DAG: Capability TensorFloat32RoundingINTEL
1818
; CHECK-SPIRV-DAG: Capability JointMatrixTF32ComponentTypeINTEL
19-
; CHECK-SPIRV-DAG: Extension "SPV_INTEL_tensor_float32_rounding"
19+
; CHECK-SPIRV-DAG: Extension "SPV_INTEL_tensor_float32_conversion"
2020
; CHECK-SPIRV-DAG: Extension "SPV_KHR_cooperative_matrix"
2121
; CHECK-SPIRV-DAG: Extension "SPV_INTEL_joint_matrix"
2222
; CHECK-SPIRV-DAG: TypeFloat [[#FP32Ty:]] 32

llvm-spirv/test/extensions/INTEL/SPV_INTEL_tensor_float32_conversion/convert_tensor_float32.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; RUN: llvm-as %s -o %t.bc
2-
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_INTEL_tensor_float32_rounding
2+
; RUN: llvm-spirv %t.bc -o %t.spv --spirv-ext=+SPV_INTEL_tensor_float32_conversion
33
; RUN: llvm-spirv %t.spv -o %t.spt --to-text
44
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV
55
; RUN: llvm-spirv %t.spv -o %t.rev.bc -r --spirv-target-env=SPV-IR
@@ -8,13 +8,13 @@
88

99
; RUN: not llvm-spirv %t.bc 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
1010
; CHECK-ERROR: RequiresExtension: Feature requires the following SPIR-V extension:
11-
; CHECK-ERROR-NEXT: SPV_INTEL_tensor_float32_rounding
11+
; CHECK-ERROR-NEXT: SPV_INTEL_tensor_float32_conversion
1212

1313
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"
1414
target triple = "spir64-unknown-unknown"
1515

1616
; CHECK-SPIRV: Capability TensorFloat32RoundingINTEL
17-
; CHECK-SPIRV: Extension "SPV_INTEL_tensor_float32_rounding"
17+
; CHECK-SPIRV: Extension "SPV_INTEL_tensor_float32_conversion"
1818
; CHECK-SPIRV: TypeFloat [[#FP32Ty:]] 32
1919
; CHECK-SPIRV: TypeVector [[#FP32v8Ty:]] [[#FP32Ty]] 8
2020
; CHECK-SPIRV: Constant [[#FP32Ty]] [[#CONST:]] 1065353216

0 commit comments

Comments
 (0)