Author: Justin Bogner Date: 2024-10-07T09:21:36-07:00 New Revision: 66c986aac6a28c130eff261228995989a044f6bc
URL: https://github.com/llvm/llvm-project/commit/66c986aac6a28c130eff261228995989a044f6bc DIFF: https://github.com/llvm/llvm-project/commit/66c986aac6a28c130eff261228995989a044f6bc.diff LOG: Revert "[SPIRV] Add radians intrinsic (#110800)" This reverts commit c0f8889774ce4926ed58e2bf379d8ba70adf79ae. Added: Modified: llvm/include/llvm/IR/IntrinsicsSPIRV.td llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp Removed: llvm/test/CodeGen/SPIRV/hlsl-intrinsics/radians.ll llvm/test/CodeGen/SPIRV/opencl/radians.ll ################################################################################ diff --git a/llvm/include/llvm/IR/IntrinsicsSPIRV.td b/llvm/include/llvm/IR/IntrinsicsSPIRV.td index 88059aa8378140..0567efd8a5d7af 100644 --- a/llvm/include/llvm/IR/IntrinsicsSPIRV.td +++ b/llvm/include/llvm/IR/IntrinsicsSPIRV.td @@ -84,5 +84,4 @@ let TargetPrefix = "spv" in { [IntrNoMem, Commutative] >; def int_spv_wave_is_first_lane : DefaultAttrsIntrinsic<[llvm_i1_ty], [], [IntrConvergent]>; def int_spv_sign : DefaultAttrsIntrinsic<[LLVMScalarOrSameVectorWidth<0, llvm_i32_ty>], [llvm_any_ty], [IntrNoMem]>; - def int_spv_radians : DefaultAttrsIntrinsic<[LLVMMatchType<0>], [llvm_anyfloat_ty], [IntrNoMem]>; } diff --git a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp index 468e34a365826a..3917ad180b87fc 100644 --- a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp +++ b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp @@ -2537,8 +2537,6 @@ bool SPIRVInstructionSelector::selectIntrinsic(Register ResVReg, } case Intrinsic::spv_step: return selectExtInst(ResVReg, ResType, I, CL::step, GL::Step); - case Intrinsic::spv_radians: - return selectExtInst(ResVReg, ResType, I, CL::radians, GL::Radians); // Discard intrinsics which we do not expect to actually represent code after // lowering or intrinsics which are not implemented but should not crash when // found in a customer's LLVM IR input. diff --git a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/radians.ll b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/radians.ll deleted file mode 100644 index 1fe8ab30ed9538..00000000000000 --- a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/radians.ll +++ /dev/null @@ -1,48 +0,0 @@ -; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s -; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - -filetype=obj | spirv-val %} - -; CHECK-DAG: %[[#op_ext_glsl:]] = OpExtInstImport "GLSL.std.450" - -; CHECK-DAG: %[[#float_32:]] = OpTypeFloat 32 -; CHECK-DAG: %[[#float_16:]] = OpTypeFloat 16 - -; CHECK-DAG: %[[#vec4_float_32:]] = OpTypeVector %[[#float_32]] 4 -; CHECK-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4 - -declare half @llvm.spv.radians.f16(half) -declare float @llvm.spv.radians.f32(float) - -declare <4 x float> @llvm.spv.radians.v4f32(<4 x float>) -declare <4 x half> @llvm.spv.radians.v4f16(<4 x half>) - -define noundef float @radians_float(float noundef %a) { -entry: -; CHECK: %[[#float_32_arg:]] = OpFunctionParameter %[[#float_32]] -; CHECK: %[[#]] = OpExtInst %[[#float_32]] %[[#op_ext_glsl]] Radians %[[#float_32_arg]] - %elt.radians = call float @llvm.spv.radians.f32(float %a) - ret float %elt.radians -} - -define noundef half @radians_half(half noundef %a) { -entry: -; CHECK: %[[#float_16_arg:]] = OpFunctionParameter %[[#float_16]] -; CHECK: %[[#]] = OpExtInst %[[#float_16]] %[[#op_ext_glsl]] Radians %[[#float_16_arg]] - %elt.radians = call half @llvm.spv.radians.f16(half %a) - ret half %elt.radians -} - -define noundef <4 x float> @radians_float_vector(<4 x float> noundef %a) { -entry: -; CHECK: %[[#vec4_float_32_arg:]] = OpFunctionParameter %[[#vec4_float_32]] -; CHECK: %[[#]] = OpExtInst %[[#vec4_float_32]] %[[#op_ext_glsl]] Radians %[[#vec4_float_32_arg]] - %elt.radians = call <4 x float> @llvm.spv.radians.v4f32(<4 x float> %a) - ret <4 x float> %elt.radians -} - -define noundef <4 x half> @radians_half_vector(<4 x half> noundef %a) { -entry: -; CHECK: %[[#vec4_float_16_arg:]] = OpFunctionParameter %[[#vec4_float_16]] -; CHECK: %[[#]] = OpExtInst %[[#vec4_float_16]] %[[#op_ext_glsl]] Radians %[[#vec4_float_16_arg]] - %elt.radians = call <4 x half> @llvm.spv.radians.v4f16(<4 x half> %a) - ret <4 x half> %elt.radians -} diff --git a/llvm/test/CodeGen/SPIRV/opencl/radians.ll b/llvm/test/CodeGen/SPIRV/opencl/radians.ll deleted file mode 100644 index f7bb8d5226cd19..00000000000000 --- a/llvm/test/CodeGen/SPIRV/opencl/radians.ll +++ /dev/null @@ -1,51 +0,0 @@ -; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s -; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s -; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %} -; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %} - -; CHECK-DAG: %[[#op_ext_glsl:]] = OpExtInstImport "OpenCL.std" - -; CHECK-DAG: %[[#float_32:]] = OpTypeFloat 32 -; CHECK-DAG: %[[#float_16:]] = OpTypeFloat 16 - -; CHECK-DAG: %[[#vec4_float_32:]] = OpTypeVector %[[#float_32]] 4 -; CHECK-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4 - -declare half @llvm.spv.radians.f16(half) -declare float @llvm.spv.radians.f32(float) - -declare <4 x float> @llvm.spv.radians.v4f32(<4 x float>) -declare <4 x half> @llvm.spv.radians.v4f16(<4 x half>) - -define noundef float @radians_float(float noundef %a) { -entry: -; CHECK: %[[#float_32_arg:]] = OpFunctionParameter %[[#float_32]] -; CHECK: %[[#]] = OpExtInst %[[#float_32]] %[[#op_ext_glsl]] radians %[[#float_32_arg]] - %elt.radians = call float @llvm.spv.radians.f32(float %a) - ret float %elt.radians -} - -define noundef half @radians_half(half noundef %a) { -entry: -; CHECK: %[[#float_16_arg:]] = OpFunctionParameter %[[#float_16]] -; CHECK: %[[#]] = OpExtInst %[[#float_16]] %[[#op_ext_glsl]] radians %[[#float_16_arg]] - %elt.radians = call half @llvm.spv.radians.f16(half %a) - ret half %elt.radians -} - -define noundef <4 x float> @radians_float_vector(<4 x float> noundef %a) { -entry: -; CHECK: %[[#vec4_float_32_arg:]] = OpFunctionParameter %[[#vec4_float_32]] -; CHECK: %[[#]] = OpExtInst %[[#vec4_float_32]] %[[#op_ext_glsl]] radians %[[#vec4_float_32_arg]] - %elt.radians = call <4 x float> @llvm.spv.radians.v4f32(<4 x float> %a) - ret <4 x float> %elt.radians -} - -define noundef <4 x half> @radians_half_vector(<4 x half> noundef %a) { -entry: -; CHECK: %[[#vec4_float_16_arg:]] = OpFunctionParameter %[[#vec4_float_16]] -; CHECK: %[[#]] = OpExtInst %[[#vec4_float_16]] %[[#op_ext_glsl]] radians %[[#vec4_float_16_arg]] - %elt.radians = call <4 x half> @llvm.spv.radians.v4f16(<4 x half> %a) - ret <4 x half> %elt.radians -} - _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
