Skip to content

Commit b5c4222

Browse files
asudarsasys-ce-bb
authored andcommitted
Revert "Support SPV_INTEL_complex_float_mul_div extension (#1442)" (#3034)
This reverts commit bc94b7c3a637446748072a9e7fd883724bd6b4e5. SPV_INTEL_complex_float_mul_div extension support is being removed from SPIR-V This PR cleans up the existing support in the translator. Thanks --------- Signed-off-by: Arvind Sudarsanam <[email protected]> Original commit: KhronosGroup/SPIRV-LLVM-Translator@78ab5f393362cf1
1 parent f25515a commit b5c4222

File tree

5 files changed

+0
-118
lines changed

5 files changed

+0
-118
lines changed

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

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3830,50 +3830,6 @@ _SPIRV_OP(GroupLogicalOr, true, 6, false, 1)
38303830
_SPIRV_OP(GroupLogicalXor, true, 6, false, 1)
38313831
#undef _SPIRV_OP
38323832

3833-
class SPIRVComplexFloat : public SPIRVInstTemplateBase {
3834-
protected:
3835-
void validate() const override {
3836-
SPIRVId Op1 = Ops[0];
3837-
SPIRVId Op2 = Ops[1];
3838-
SPIRVType *Op1Ty, *Op2Ty;
3839-
SPIRVInstruction::validate();
3840-
if (getValue(Op1)->isForward() || getValue(Op2)->isForward())
3841-
return;
3842-
if (getValueType(Op1)->isTypeVector()) {
3843-
Op1Ty = getValueType(Op1)->getVectorComponentType();
3844-
Op2Ty = getValueType(Op2)->getVectorComponentType();
3845-
assert(getValueType(Op1)->getVectorComponentCount() ==
3846-
getValueType(Op2)->getVectorComponentCount() &&
3847-
"Inconsistent Vector component width");
3848-
} else {
3849-
Op1Ty = getValueType(Op1);
3850-
Op2Ty = getValueType(Op2);
3851-
}
3852-
(void)Op1Ty;
3853-
(void)Op2Ty;
3854-
assert(Op1Ty->isTypeFloat() && "Invalid type for complex instruction");
3855-
assert(Op1Ty == Op2Ty && "Invalid type for complex instruction");
3856-
}
3857-
3858-
public:
3859-
SPIRVCapVec getRequiredCapability() const override {
3860-
return getVec(internal::CapabilityComplexFloatMulDivINTEL);
3861-
}
3862-
3863-
std::optional<ExtensionID> getRequiredExtension() const override {
3864-
return ExtensionID::SPV_INTEL_complex_float_mul_div;
3865-
}
3866-
};
3867-
3868-
template <Op OC>
3869-
class SPIRVComplexFloatInst
3870-
: public SPIRVInstTemplate<SPIRVComplexFloat, OC, true, 5, false> {};
3871-
3872-
#define _SPIRV_OP(x) typedef SPIRVComplexFloatInst<internal::Op##x> SPIRV##x;
3873-
_SPIRV_OP(ComplexFMulINTEL)
3874-
_SPIRV_OP(ComplexFDivINTEL)
3875-
#undef _SPIRV_OP
3876-
38773833
class SPIRVMaskedGatherScatterINTELInstBase : public SPIRVInstTemplateBase {
38783834
protected:
38793835
SPIRVCapVec getRequiredCapability() const override {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,6 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
669669
add(internal::CapabilityHWThreadQueryINTEL, "HWThreadQueryINTEL");
670670
add(internal::CapabilityGlobalVariableDecorationsINTEL,
671671
"GlobalVariableDecorationsINTEL");
672-
add(internal::CapabilityComplexFloatMulDivINTEL, "ComplexFloatMulDivINTEL");
673672
add(internal::CapabilityMaskedGatherScatterINTEL, "MaskedGatherScatterINTEL");
674673
add(internal::CapabilityTensorFloat32RoundingINTEL,
675674
"TensorFloat32RoundingINTEL");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ _SPIRV_OP_INTERNAL(CooperativeMatrixStoreOffsetINTEL,
2727
internal::OpCooperativeMatrixStoreOffsetINTEL)
2828
_SPIRV_OP_INTERNAL(CooperativeMatrixApplyFunctionINTEL,
2929
internal::OpCooperativeMatrixApplyFunctionINTEL)
30-
_SPIRV_OP_INTERNAL(ComplexFMulINTEL, internal::ComplexFMulINTEL)
31-
_SPIRV_OP_INTERNAL(ComplexFDivINTEL, internal::ComplexFDivINTEL)
3230
_SPIRV_OP_INTERNAL(MaskedGatherINTEL, internal::OpMaskedGatherINTEL)
3331
_SPIRV_OP_INTERNAL(MaskedScatterINTEL, internal::OpMaskedScatterINTEL)
3432
_SPIRV_OP_INTERNAL(RoundFToTF32INTEL, internal::RoundFToTF32INTEL)

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ enum InternalOp {
7878
IOpCooperativeMatrixStoreOffsetINTEL = 6240,
7979
IOpJointMatrixWorkItemLengthINTEL = 6410,
8080
IOpTypeTaskSequenceINTEL = 6199,
81-
IOpComplexFMulINTEL = 6415,
82-
IOpComplexFDivINTEL = 6416,
8381
IOpRoundFToTF32INTEL = 6426,
8482
IOpMaskedGatherINTEL = 6428,
8583
IOpMaskedScatterINTEL = 6429,
@@ -113,7 +111,6 @@ enum InternalCapability {
113111
ICapabilityCooperativeMatrixCheckedInstructionsINTEL = 6192,
114112
ICapabilityCooperativeMatrixOffsetInstructionsINTEL = 6238,
115113
ICapabilityCooperativeMatrixPrefetchINTEL = 6411,
116-
ICapabilityComplexFloatMulDivINTEL = 6414,
117114
ICapabilityTensorFloat32RoundingINTEL = 6425,
118115
ICapabilityMaskedGatherScatterINTEL = 6427,
119116
ICapabilityJointMatrixWIInstructionsINTEL = 6435,
@@ -196,10 +193,6 @@ _SPIRV_OP(Capability, HWThreadQueryINTEL)
196193
_SPIRV_OP(BuiltIn, SubDeviceIDINTEL)
197194
_SPIRV_OP(BuiltIn, GlobalHWThreadIDINTEL)
198195

199-
_SPIRV_OP(Capability, ComplexFloatMulDivINTEL)
200-
_SPIRV_OP(Op, ComplexFMulINTEL)
201-
_SPIRV_OP(Op, ComplexFDivINTEL)
202-
203196
_SPIRV_OP(Capability, MaskedGatherScatterINTEL)
204197
_SPIRV_OP(Op, MaskedGatherINTEL)
205198
_SPIRV_OP(Op, MaskedScatterINTEL)

llvm-spirv/test/extensions/INTEL/SPV_INTEL_complex_float_mul_div/complex-operations.ll

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)