[mlir][spirv] Add lowering of multiple math trig/hypb functions #143604
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir-spirv Author: Darren Wihandi (fairywreath) ChangesAdd Math to SPIRV lowering for tan, asin, acos, sinh, cosh, asinh, acosh and atanh. This completes the lowering of all trigonometric and hyperbolic functions from math to SPIRV. Full diff: https://github.com/llvm/llvm-project/pull/143604.diff 3 Files Affected:
diff --git a/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp b/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp
index 1b83794b5f450..501bfa223fb18 100644
--- a/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp
+++ b/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp
@@ -509,7 +509,15 @@ void populateMathToSPIRVPatterns(const SPIRVTypeConverter &typeConverter,
CheckedElementwiseOpPattern<math::RsqrtOp, spirv::GLInverseSqrtOp>,
CheckedElementwiseOpPattern<math::SinOp, spirv::GLSinOp>,
CheckedElementwiseOpPattern<math::SqrtOp, spirv::GLSqrtOp>,
- CheckedElementwiseOpPattern<math::TanhOp, spirv::GLTanhOp>>(
+ CheckedElementwiseOpPattern<math::TanhOp, spirv::GLTanhOp>,
+ CheckedElementwiseOpPattern<math::TanOp, spirv::GLTanOp>,
+ CheckedElementwiseOpPattern<math::AsinOp, spirv::GLAsinOp>,
+ CheckedElementwiseOpPattern<math::AcosOp, spirv::GLAcosOp>,
+ CheckedElementwiseOpPattern<math::SinhOp, spirv::GLSinhOp>,
+ CheckedElementwiseOpPattern<math::CoshOp, spirv::GLCoshOp>,
+ CheckedElementwiseOpPattern<math::AsinhOp, spirv::GLAsinhOp>,
+ CheckedElementwiseOpPattern<math::AcoshOp, spirv::GLAcoshOp>,
+ CheckedElementwiseOpPattern<math::AtanhOp, spirv::GLAtanhOp>>(
typeConverter, patterns.getContext());
// OpenCL patterns
@@ -533,7 +541,15 @@ void populateMathToSPIRVPatterns(const SPIRVTypeConverter &typeConverter,
CheckedElementwiseOpPattern<math::RsqrtOp, spirv::CLRsqrtOp>,
CheckedElementwiseOpPattern<math::SinOp, spirv::CLSinOp>,
CheckedElementwiseOpPattern<math::SqrtOp, spirv::CLSqrtOp>,
- CheckedElementwiseOpPattern<math::TanhOp, spirv::CLTanhOp>>(
+ CheckedElementwiseOpPattern<math::TanhOp, spirv::CLTanhOp>,
+ CheckedElementwiseOpPattern<math::TanOp, spirv::CLTanOp>,
+ CheckedElementwiseOpPattern<math::AsinOp, spirv::CLAsinOp>,
+ CheckedElementwiseOpPattern<math::AcosOp, spirv::CLAcosOp>,
+ CheckedElementwiseOpPattern<math::SinhOp, spirv::CLSinhOp>,
+ CheckedElementwiseOpPattern<math::CoshOp, spirv::CLCoshOp>,
+ CheckedElementwiseOpPattern<math::AsinhOp, spirv::CLAsinhOp>,
+ CheckedElementwiseOpPattern<math::AcoshOp, spirv::CLAcoshOp>,
+ CheckedElementwiseOpPattern<math::AtanhOp, spirv::CLAtanhOp>>(
typeConverter, patterns.getContext());
}
diff --git a/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir b/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir
index 5c6561c104389..b8e001c9f6950 100644
--- a/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir
+++ b/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir
@@ -46,6 +46,22 @@ func.func @float32_unary_scalar(%arg0: f32) {
%14 = math.ceil %arg0 : f32
// CHECK: spirv.GL.Floor %{{.*}}: f32
%15 = math.floor %arg0 : f32
+ // CHECK: spirv.GL.Tan %{{.*}}: f32
+ %16 = math.tan %arg0 : f32
+ // CHECK: spirv.GL.Asin %{{.*}}: f32
+ %17 = math.asin %arg0 : f32
+ // CHECK: spirv.GL.Acos %{{.*}}: f32
+ %18 = math.acos %arg0 : f32
+ // CHECK: spirv.GL.Sinh %{{.*}}: f32
+ %19 = math.sinh %arg0 : f32
+ // CHECK: spirv.GL.Cosh %{{.*}}: f32
+ %20 = math.cosh %arg0 : f32
+ // CHECK: spirv.GL.Asinh %{{.*}}: f32
+ %21 = math.asinh %arg0 : f32
+ // CHECK: spirv.GL.Acosh %{{.*}}: f32
+ %22 = math.acosh %arg0 : f32
+ // CHECK: spirv.GL.Atanh %{{.*}}: f32
+ %23 = math.atanh %arg0 : f32
return
}
@@ -85,6 +101,22 @@ func.func @float32_unary_vector(%arg0: vector<3xf32>) {
%11 = math.tanh %arg0 : vector<3xf32>
// CHECK: spirv.GL.Sin %{{.*}}: vector<3xf32>
%12 = math.sin %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Tan %{{.*}}: vector<3xf32>
+ %13 = math.tan %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Asin %{{.*}}: vector<3xf32>
+ %14 = math.asin %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Acos %{{.*}}: vector<3xf32>
+ %15 = math.acos %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Sinh %{{.*}}: vector<3xf32>
+ %16 = math.sinh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Cosh %{{.*}}: vector<3xf32>
+ %17 = math.cosh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Asinh %{{.*}}: vector<3xf32>
+ %18 = math.asinh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Acosh %{{.*}}: vector<3xf32>
+ %19 = math.acosh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Atanh %{{.*}}: vector<3xf32>
+ %20 = math.atanh %arg0 : vector<3xf32>
return
}
diff --git a/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir b/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir
index 393a910c1fb1d..56a0d4dafec8c 100644
--- a/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir
+++ b/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir
@@ -48,6 +48,22 @@ func.func @float32_unary_scalar(%arg0: f32) {
%16 = math.erf %arg0 : f32
// CHECK: spirv.CL.round %{{.*}}: f32
%17 = math.round %arg0 : f32
+ // CHECK: spirv.CL.tan %{{.*}}: f32
+ %18 = math.tan %arg0 : f32
+ // CHECK: spirv.CL.asin %{{.*}}: f32
+ %19 = math.asin %arg0 : f32
+ // CHECK: spirv.CL.acos %{{.*}}: f32
+ %20 = math.acos %arg0 : f32
+ // CHECK: spirv.CL.sinh %{{.*}}: f32
+ %21 = math.sinh %arg0 : f32
+ // CHECK: spirv.CL.cosh %{{.*}}: f32
+ %22 = math.cosh %arg0 : f32
+ // CHECK: spirv.CL.asinh %{{.*}}: f32
+ %23 = math.asinh %arg0 : f32
+ // CHECK: spirv.CL.acosh %{{.*}}: f32
+ %24 = math.acosh %arg0 : f32
+ // CHECK: spirv.CL.atanh %{{.*}}: f32
+ %25 = math.atanh %arg0 : f32
return
}
@@ -87,6 +103,22 @@ func.func @float32_unary_vector(%arg0: vector<3xf32>) {
%11 = math.tanh %arg0 : vector<3xf32>
// CHECK: spirv.CL.sin %{{.*}}: vector<3xf32>
%12 = math.sin %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.tan %{{.*}}: vector<3xf32>
+ %13 = math.tan %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.asin %{{.*}}: vector<3xf32>
+ %14 = math.asin %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.acos %{{.*}}: vector<3xf32>
+ %15 = math.acos %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.sinh %{{.*}}: vector<3xf32>
+ %16 = math.sinh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.cosh %{{.*}}: vector<3xf32>
+ %17 = math.cosh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.asinh %{{.*}}: vector<3xf32>
+ %18 = math.asinh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.acosh %{{.*}}: vector<3xf32>
+ %19 = math.acosh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.atanh %{{.*}}: vector<3xf32>
+ %20 = math.atanh %arg0 : vector<3xf32>
return
}
|
|
@llvm/pr-subscribers-mlir Author: Darren Wihandi (fairywreath) ChangesAdd Math to SPIRV lowering for tan, asin, acos, sinh, cosh, asinh, acosh and atanh. This completes the lowering of all trigonometric and hyperbolic functions from math to SPIRV. Full diff: https://github.com/llvm/llvm-project/pull/143604.diff 3 Files Affected:
diff --git a/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp b/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp
index 1b83794b5f450..501bfa223fb18 100644
--- a/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp
+++ b/mlir/lib/Conversion/MathToSPIRV/MathToSPIRV.cpp
@@ -509,7 +509,15 @@ void populateMathToSPIRVPatterns(const SPIRVTypeConverter &typeConverter,
CheckedElementwiseOpPattern<math::RsqrtOp, spirv::GLInverseSqrtOp>,
CheckedElementwiseOpPattern<math::SinOp, spirv::GLSinOp>,
CheckedElementwiseOpPattern<math::SqrtOp, spirv::GLSqrtOp>,
- CheckedElementwiseOpPattern<math::TanhOp, spirv::GLTanhOp>>(
+ CheckedElementwiseOpPattern<math::TanhOp, spirv::GLTanhOp>,
+ CheckedElementwiseOpPattern<math::TanOp, spirv::GLTanOp>,
+ CheckedElementwiseOpPattern<math::AsinOp, spirv::GLAsinOp>,
+ CheckedElementwiseOpPattern<math::AcosOp, spirv::GLAcosOp>,
+ CheckedElementwiseOpPattern<math::SinhOp, spirv::GLSinhOp>,
+ CheckedElementwiseOpPattern<math::CoshOp, spirv::GLCoshOp>,
+ CheckedElementwiseOpPattern<math::AsinhOp, spirv::GLAsinhOp>,
+ CheckedElementwiseOpPattern<math::AcoshOp, spirv::GLAcoshOp>,
+ CheckedElementwiseOpPattern<math::AtanhOp, spirv::GLAtanhOp>>(
typeConverter, patterns.getContext());
// OpenCL patterns
@@ -533,7 +541,15 @@ void populateMathToSPIRVPatterns(const SPIRVTypeConverter &typeConverter,
CheckedElementwiseOpPattern<math::RsqrtOp, spirv::CLRsqrtOp>,
CheckedElementwiseOpPattern<math::SinOp, spirv::CLSinOp>,
CheckedElementwiseOpPattern<math::SqrtOp, spirv::CLSqrtOp>,
- CheckedElementwiseOpPattern<math::TanhOp, spirv::CLTanhOp>>(
+ CheckedElementwiseOpPattern<math::TanhOp, spirv::CLTanhOp>,
+ CheckedElementwiseOpPattern<math::TanOp, spirv::CLTanOp>,
+ CheckedElementwiseOpPattern<math::AsinOp, spirv::CLAsinOp>,
+ CheckedElementwiseOpPattern<math::AcosOp, spirv::CLAcosOp>,
+ CheckedElementwiseOpPattern<math::SinhOp, spirv::CLSinhOp>,
+ CheckedElementwiseOpPattern<math::CoshOp, spirv::CLCoshOp>,
+ CheckedElementwiseOpPattern<math::AsinhOp, spirv::CLAsinhOp>,
+ CheckedElementwiseOpPattern<math::AcoshOp, spirv::CLAcoshOp>,
+ CheckedElementwiseOpPattern<math::AtanhOp, spirv::CLAtanhOp>>(
typeConverter, patterns.getContext());
}
diff --git a/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir b/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir
index 5c6561c104389..b8e001c9f6950 100644
--- a/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir
+++ b/mlir/test/Conversion/MathToSPIRV/math-to-gl-spirv.mlir
@@ -46,6 +46,22 @@ func.func @float32_unary_scalar(%arg0: f32) {
%14 = math.ceil %arg0 : f32
// CHECK: spirv.GL.Floor %{{.*}}: f32
%15 = math.floor %arg0 : f32
+ // CHECK: spirv.GL.Tan %{{.*}}: f32
+ %16 = math.tan %arg0 : f32
+ // CHECK: spirv.GL.Asin %{{.*}}: f32
+ %17 = math.asin %arg0 : f32
+ // CHECK: spirv.GL.Acos %{{.*}}: f32
+ %18 = math.acos %arg0 : f32
+ // CHECK: spirv.GL.Sinh %{{.*}}: f32
+ %19 = math.sinh %arg0 : f32
+ // CHECK: spirv.GL.Cosh %{{.*}}: f32
+ %20 = math.cosh %arg0 : f32
+ // CHECK: spirv.GL.Asinh %{{.*}}: f32
+ %21 = math.asinh %arg0 : f32
+ // CHECK: spirv.GL.Acosh %{{.*}}: f32
+ %22 = math.acosh %arg0 : f32
+ // CHECK: spirv.GL.Atanh %{{.*}}: f32
+ %23 = math.atanh %arg0 : f32
return
}
@@ -85,6 +101,22 @@ func.func @float32_unary_vector(%arg0: vector<3xf32>) {
%11 = math.tanh %arg0 : vector<3xf32>
// CHECK: spirv.GL.Sin %{{.*}}: vector<3xf32>
%12 = math.sin %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Tan %{{.*}}: vector<3xf32>
+ %13 = math.tan %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Asin %{{.*}}: vector<3xf32>
+ %14 = math.asin %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Acos %{{.*}}: vector<3xf32>
+ %15 = math.acos %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Sinh %{{.*}}: vector<3xf32>
+ %16 = math.sinh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Cosh %{{.*}}: vector<3xf32>
+ %17 = math.cosh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Asinh %{{.*}}: vector<3xf32>
+ %18 = math.asinh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Acosh %{{.*}}: vector<3xf32>
+ %19 = math.acosh %arg0 : vector<3xf32>
+ // CHECK: spirv.GL.Atanh %{{.*}}: vector<3xf32>
+ %20 = math.atanh %arg0 : vector<3xf32>
return
}
diff --git a/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir b/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir
index 393a910c1fb1d..56a0d4dafec8c 100644
--- a/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir
+++ b/mlir/test/Conversion/MathToSPIRV/math-to-opencl-spirv.mlir
@@ -48,6 +48,22 @@ func.func @float32_unary_scalar(%arg0: f32) {
%16 = math.erf %arg0 : f32
// CHECK: spirv.CL.round %{{.*}}: f32
%17 = math.round %arg0 : f32
+ // CHECK: spirv.CL.tan %{{.*}}: f32
+ %18 = math.tan %arg0 : f32
+ // CHECK: spirv.CL.asin %{{.*}}: f32
+ %19 = math.asin %arg0 : f32
+ // CHECK: spirv.CL.acos %{{.*}}: f32
+ %20 = math.acos %arg0 : f32
+ // CHECK: spirv.CL.sinh %{{.*}}: f32
+ %21 = math.sinh %arg0 : f32
+ // CHECK: spirv.CL.cosh %{{.*}}: f32
+ %22 = math.cosh %arg0 : f32
+ // CHECK: spirv.CL.asinh %{{.*}}: f32
+ %23 = math.asinh %arg0 : f32
+ // CHECK: spirv.CL.acosh %{{.*}}: f32
+ %24 = math.acosh %arg0 : f32
+ // CHECK: spirv.CL.atanh %{{.*}}: f32
+ %25 = math.atanh %arg0 : f32
return
}
@@ -87,6 +103,22 @@ func.func @float32_unary_vector(%arg0: vector<3xf32>) {
%11 = math.tanh %arg0 : vector<3xf32>
// CHECK: spirv.CL.sin %{{.*}}: vector<3xf32>
%12 = math.sin %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.tan %{{.*}}: vector<3xf32>
+ %13 = math.tan %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.asin %{{.*}}: vector<3xf32>
+ %14 = math.asin %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.acos %{{.*}}: vector<3xf32>
+ %15 = math.acos %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.sinh %{{.*}}: vector<3xf32>
+ %16 = math.sinh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.cosh %{{.*}}: vector<3xf32>
+ %17 = math.cosh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.asinh %{{.*}}: vector<3xf32>
+ %18 = math.asinh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.acosh %{{.*}}: vector<3xf32>
+ %19 = math.acosh %arg0 : vector<3xf32>
+ // CHECK: spirv.CL.atanh %{{.*}}: vector<3xf32>
+ %20 = math.atanh %arg0 : vector<3xf32>
return
}
|
antiagainst
approved these changes
Jun 11, 2025
IgWod-IMG
approved these changes
Jun 11, 2025
kuhar
approved these changes
Jun 11, 2025
tomtor
pushed a commit
to tomtor/llvm-project
that referenced
this pull request
Jun 14, 2025
…#143604) Add Math to SPIRV lowering for tan, asin, acos, sinh, cosh, asinh, acosh and atanh. This completes the lowering of all trigonometric and hyperbolic functions from math to SPIRV.
akuhlens
pushed a commit
to akuhlens/llvm-project
that referenced
this pull request
Jun 24, 2025
…#143604) Add Math to SPIRV lowering for tan, asin, acos, sinh, cosh, asinh, acosh and atanh. This completes the lowering of all trigonometric and hyperbolic functions from math to SPIRV.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add Math to SPIRV lowering for tan, asin, acos, sinh, cosh, asinh, acosh and atanh. This completes the lowering of all trigonometric and hyperbolic functions from math to SPIRV.