[Mlir-commits] [mlir] 22d9ea1 - [mlir][spirv] Add definition for GL Length (#144041)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Mon Jun 16 09:41:57 PDT 2025
Author: Igor Wodiany
Date: 2025-06-16T17:41:52+01:00
New Revision: 22d9ea1b636d2c72a24fb0a8ce5216d609164635
URL: https://github.com/llvm/llvm-project/commit/22d9ea1b636d2c72a24fb0a8ce5216d609164635
DIFF: https://github.com/llvm/llvm-project/commit/22d9ea1b636d2c72a24fb0a8ce5216d609164635.diff
LOG: [mlir][spirv] Add definition for GL Length (#144041)
A canonicalization pattern from `spirv.GL.Length` to `spirv.GL.FAbs` for scalar operands is also added.
Added:
Modified:
mlir/include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
mlir/lib/Dialect/SPIRV/IR/SPIRVCanonicalization.td
mlir/lib/Dialect/SPIRV/IR/SPIRVGLCanonicalization.cpp
mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
mlir/test/Dialect/SPIRV/Transforms/gl-canonicalize.mlir
mlir/test/Target/SPIRV/gl-ops.mlir
Removed:
################################################################################
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
index 2ec61758ba8ef..8c4da9b2dce18 100644
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
@@ -1160,6 +1160,46 @@ def SPIRV_GLFMixOp :
// -----
+def SPIRV_GLLengthOp : SPIRV_GLOp<"Length", 66, [
+ Pure,
+ TypesMatchWith<"result type must match operand element type",
+ "operand", "result",
+ "::mlir::getElementTypeOrSelf($_self)">
+ ]> {
+ let summary = "Return the length of a vector x";
+
+ let description = [{
+ Result is the length of vector x, i.e., sqrt(x[0]**2 + x[1]**2 + ...).
+
+ The operand x must be a scalar or vector whose component type is floating-point.
+
+ Result Type must be a scalar of the same type as the component type of x.
+
+ #### Example:
+
+ ```mlir
+ %2 = spirv.GL.Length %0 : vector<3xf32> -> f32
+ %3 = spirv.GL.Length %1 : f32 -> f32
+ ```
+ }];
+
+ let arguments = (ins
+ SPIRV_ScalarOrVectorOf<SPIRV_Float>:$operand
+ );
+
+ let results = (outs
+ SPIRV_Float:$result
+ );
+
+ let assemblyFormat = [{
+ $operand attr-dict `:` type($operand) `->` type($result)
+ }];
+
+ let hasVerifier = 0;
+}
+
+// -----
+
def SPIRV_GLDistanceOp : SPIRV_GLOp<"Distance", 67, [
Pure,
AllTypesMatch<["p0", "p1"]>,
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVCanonicalization.td b/mlir/lib/Dialect/SPIRV/IR/SPIRVCanonicalization.td
index e8d2274d29aa0..39fbab8f37a2e 100644
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVCanonicalization.td
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVCanonicalization.td
@@ -75,3 +75,11 @@ def ConvertComparisonIntoClamp2_#CmpClampPair[0] : Pat<
)),
(CmpClampPair[1] $input, $min, $max)>;
}
+
+//===----------------------------------------------------------------------===//
+// spirv.GL.Length -> spirv.GL.FAbs
+//===----------------------------------------------------------------------===//
+
+def ConvertGLLengthToGLFAbs : Pat<
+ (SPIRV_GLLengthOp SPIRV_Float:$operand),
+ (SPIRV_GLFAbsOp $operand)>;
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVGLCanonicalization.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVGLCanonicalization.cpp
index 3ad8057a58dc9..46acb8c156fc6 100644
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVGLCanonicalization.cpp
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVGLCanonicalization.cpp
@@ -34,8 +34,8 @@ void populateSPIRVGLCanonicalizationPatterns(RewritePatternSet &results) {
ConvertComparisonIntoClamp2_SPIRV_SLessThanOp,
ConvertComparisonIntoClamp2_SPIRV_SLessThanEqualOp,
ConvertComparisonIntoClamp2_SPIRV_ULessThanOp,
- ConvertComparisonIntoClamp2_SPIRV_ULessThanEqualOp>(
- results.getContext());
+ ConvertComparisonIntoClamp2_SPIRV_ULessThanEqualOp,
+ ConvertGLLengthToGLFAbs>(results.getContext());
}
} // namespace spirv
} // namespace mlir
diff --git a/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir b/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
index 642346cc40b0d..5c5d94c40e573 100644
--- a/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
+++ b/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
@@ -1000,3 +1000,69 @@ func.func @unpack_half_2x16_scalar_out(%arg0 : i32) -> () {
%0 = spirv.GL.UnpackHalf2x16 %arg0 : i32 -> f32
return
}
+
+// -----
+
+//===----------------------------------------------------------------------===//
+// spirv.GL.Length
+//===----------------------------------------------------------------------===//
+
+func.func @length(%arg0 : f32) -> () {
+ // CHECK: spirv.GL.Length {{%.*}} : f32 -> f32
+ %0 = spirv.GL.Length %arg0 : f32 -> f32
+ return
+}
+
+func.func @lengthvec(%arg0 : vector<3xf32>) -> () {
+ // CHECK: spirv.GL.Length {{%.*}} : vector<3xf32> -> f32
+ %0 = spirv.GL.Length %arg0 : vector<3xf32> -> f32
+ return
+}
+
+// -----
+
+func.func @length_i32_in(%arg0 : i32) -> () {
+ // expected-error @+1 {{op operand #0 must be 16/32/64-bit float or vector of 16/32/64-bit float values of length 2/3/4/8/16, but got 'i32'}}
+ %0 = spirv.GL.Length %arg0 : i32 -> f32
+ return
+}
+
+// -----
+
+func.func @length_f16_in(%arg0 : f16) -> () {
+ // expected-error @+1 {{op failed to verify that result type must match operand element type}}
+ %0 = spirv.GL.Length %arg0 : f16 -> f32
+ return
+}
+
+// -----
+
+func.func @length_i32vec_in(%arg0 : vector<3xi32>) -> () {
+ // expected-error @+1 {{op operand #0 must be 16/32/64-bit float or vector of 16/32/64-bit float values of length 2/3/4/8/16, but got 'vector<3xi32>'}}
+ %0 = spirv.GL.Length %arg0 : vector<3xi32> -> f32
+ return
+}
+
+// -----
+
+func.func @length_f16vec_in(%arg0 : vector<3xf16>) -> () {
+ // expected-error @+1 {{op failed to verify that result type must match operand element type}}
+ %0 = spirv.GL.Length %arg0 : vector<3xf16> -> f32
+ return
+}
+
+// -----
+
+func.func @length_i32_out(%arg0 : vector<3xf32>) -> () {
+ // expected-error @+1 {{op result #0 must be 16/32/64-bit float, but got 'i32'}}
+ %0 = spirv.GL.Length %arg0 : vector<3xf32> -> i32
+ return
+}
+
+// -----
+
+func.func @length_vec_out(%arg0 : vector<3xf32>) -> () {
+ // expected-error @+1 {{op result #0 must be 16/32/64-bit float, but got 'vector<3xf32>'}}
+ %0 = spirv.GL.Length %arg0 : vector<3xf32> -> vector<3xf32>
+ return
+}
diff --git a/mlir/test/Dialect/SPIRV/Transforms/gl-canonicalize.mlir b/mlir/test/Dialect/SPIRV/Transforms/gl-canonicalize.mlir
index c1447b38f0a48..33b877667512e 100644
--- a/mlir/test/Dialect/SPIRV/Transforms/gl-canonicalize.mlir
+++ b/mlir/test/Dialect/SPIRV/Transforms/gl-canonicalize.mlir
@@ -177,3 +177,25 @@ func.func @clamp_ulessthanequal(%input: i32, %min: i32, %max: i32) -> i32 {
// CHECK-NEXT: spirv.ReturnValue [[RES]]
spirv.ReturnValue %2 : i32
}
+
+// -----
+
+//===----------------------------------------------------------------------===//
+// spirv.GL.Length
+//===----------------------------------------------------------------------===//
+
+// CHECK-LABEL: @convert_length_into_fabs_scalar
+func.func @convert_length_into_fabs_scalar(%arg0 : f32) -> f32 {
+ //CHECK: spirv.GL.FAbs {{%.*}} : f32
+ //CHECK-NOT: spirv.GL.Length
+ %0 = spirv.GL.Length %arg0 : f32 -> f32
+ spirv.ReturnValue %0 : f32
+}
+
+// CHECK-LABEL: @dont_convert_length_into_fabs_vec
+func.func @dont_convert_length_into_fabs_vec(%arg0 : vector<3xf32>) -> f32 {
+ //CHECK: spirv.GL.Length {{%.*}} : vector<3xf32> -> f32
+ //CHECK-NOT: spirv.GL.FAbs
+ %0 = spirv.GL.Length %arg0 : vector<3xf32> -> f32
+ spirv.ReturnValue %0 : f32
+}
diff --git a/mlir/test/Target/SPIRV/gl-ops.mlir b/mlir/test/Target/SPIRV/gl-ops.mlir
index eacf36bfba9ce..832f7ea2fe314 100644
--- a/mlir/test/Target/SPIRV/gl-ops.mlir
+++ b/mlir/test/Target/SPIRV/gl-ops.mlir
@@ -128,6 +128,10 @@ spirv.module Logical GLSL450 requires #spirv.vce<v1.0, [Shader], []> {
%8 = spirv.GL.FindSMsb %arg3 : vector<3xi32>
// CHECK: {{%.*}} = spirv.GL.FindUMsb {{%.*}} : vector<3xi32>
%9 = spirv.GL.FindUMsb %arg3 : vector<3xi32>
+ // CHECK: {{%.*}} = spirv.GL.Length {{%.*}} : f32 -> f32
+ %10 = spirv.GL.Length %arg0 : f32 -> f32
+ // CHECK: {{%.*}} = spirv.GL.Length {{%.*}} : vector<3xf32> -> f32
+ %11 = spirv.GL.Length %arg1 : vector<3xf32> -> f32
spirv.Return
}
More information about the Mlir-commits
mailing list