[Mlir-commits] [mlir] [mlir][SPIR-V] Add SPIRVToLLVM conversion for CL clamp ops (PR #237747)

[llvmlistbot at llvm.org]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-mlir

Author: Arseniy Obolenskiy (aobolensk)

<details>
<summary>Changes</summary>



---
Full diff: https://github.com/llvm/llvm-project/pull/237747.diff


2 Files Affected:

- (modified) mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp (+5-2) 
- (modified) mlir/test/Conversion/SPIRVToLLVM/cl-ops-to-llvm.mlir (+18) 


``````````diff
diff --git a/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp b/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
index 4b34bc722b8ee7..04d53c4f422134 100644
--- a/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
+++ b/mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp
@@ -1134,8 +1134,8 @@ class SNegatePattern : public SPIRVToLLVMConversion<spirv::SNegateOp> {
   }
 };
 
-/// Converts the GLSL clamp ops (FClamp, SClamp, UClamp) into a nested
-/// min/max sequence, following the op semantics `min(max(x, minVal), maxVal)`.
+/// Converts the GL and CL clamp ops into a nested min/max sequence, following
+/// the op semantics `min(max(x, minVal), maxVal)`.
 template <typename SPIRVOp, typename LLVMMinOp, typename LLVMMaxOp>
 class ClampPattern : public SPIRVToLLVMConversion<SPIRVOp> {
 public:
@@ -2502,6 +2502,9 @@ void mlir::populateSPIRVToLLVMConversionPatterns(
       DirectConversionPattern<spirv::CLSMinOp, LLVM::SMinOp>,
       DirectConversionPattern<spirv::CLUMaxOp, LLVM::UMaxOp>,
       DirectConversionPattern<spirv::CLUMinOp, LLVM::UMinOp>, CLMixPattern,
+      ClampPattern<spirv::CLFClampOp, LLVM::MinNumOp, LLVM::MaxNumOp>,
+      ClampPattern<spirv::CLSClampOp, LLVM::SMinOp, LLVM::SMaxOp>,
+      ClampPattern<spirv::CLUClampOp, LLVM::UMinOp, LLVM::UMaxOp>,
 
       // Logical ops
       DirectConversionPattern<spirv::LogicalAndOp, LLVM::AndOp>,
diff --git a/mlir/test/Conversion/SPIRVToLLVM/cl-ops-to-llvm.mlir b/mlir/test/Conversion/SPIRVToLLVM/cl-ops-to-llvm.mlir
index e6fed930268d47..ee7d4cfdf710c4 100644
--- a/mlir/test/Conversion/SPIRVToLLVM/cl-ops-to-llvm.mlir
+++ b/mlir/test/Conversion/SPIRVToLLVM/cl-ops-to-llvm.mlir
@@ -104,6 +104,24 @@ spirv.func @cl_integer(%arg0: i32, %arg1: i32) "None" {
   spirv.Return
 }
 
+//===----------------------------------------------------------------------===//
+// Clamp OpenCL ops
+//===----------------------------------------------------------------------===//
+
+// CHECK-LABEL: @cl_clamp
+spirv.func @cl_clamp(%arg0: f32, %arg1: i16, %arg2: vector<3xi32>) "None" {
+  // CHECK: %[[FMAX:.*]] = llvm.intr.maxnum(%{{.*}}, %{{.*}}) : (f32, f32) -> f32
+  // CHECK: llvm.intr.minnum(%[[FMAX]], %{{.*}}) : (f32, f32) -> f32
+  %0 = spirv.CL.fclamp %arg0, %arg0, %arg0 : f32
+  // CHECK: %[[SMAX:.*]] = llvm.intr.smax(%{{.*}}, %{{.*}}) : (i16, i16) -> i16
+  // CHECK: llvm.intr.smin(%[[SMAX]], %{{.*}}) : (i16, i16) -> i16
+  %1 = spirv.CL.s_clamp %arg1, %arg1, %arg1 : i16
+  // CHECK: %[[UMAX:.*]] = llvm.intr.umax(%{{.*}}, %{{.*}}) : (vector<3xi32>, vector<3xi32>) -> vector<3xi32>
+  // CHECK: llvm.intr.umin(%[[UMAX]], %{{.*}}) : (vector<3xi32>, vector<3xi32>) -> vector<3xi32>
+  %2 = spirv.CL.u_clamp %arg2, %arg2, %arg2 : vector<3xi32>
+  spirv.Return
+}
+
 //===----------------------------------------------------------------------===//
 // spirv.CL.mix
 //===----------------------------------------------------------------------===//

``````````

</details>


https://github.com/llvm/llvm-project/pull/237747