[Mlir-commits] [mlir] [mlir][emitc] arith.negf to EmitC conversion (PR #95372)
Tina Jung
llvmlistbot at llvm.org
Mon Jun 17 04:21:20 PDT 2024
https://github.com/TinaAMD updated https://github.com/llvm/llvm-project/pull/95372
>From 8b4a8230656dfd4405b7867fbc4c51584de13f43 Mon Sep 17 00:00:00 2001
From: Tina Jung <tina.maria.jung at xilinx.com>
Date: Thu, 13 Jun 2024 09:00:05 +0100
Subject: [PATCH 1/4] [mlir][emitc] arith.negf to EmitC conversion
Lower arith.negf to the unary minus in EmitC.
---
.../Conversion/ArithToEmitC/ArithToEmitC.cpp | 24 +++++++++++++++++++
.../arith-to-emitc-unsupported.mlir | 16 +++++++++++++
.../ArithToEmitC/arith-to-emitc.mlir | 11 +++++++++
3 files changed, 51 insertions(+)
diff --git a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
index 74f0f61d04a1a..4ca59d11f0836 100644
--- a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
+++ b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
@@ -288,6 +288,29 @@ class CmpIOpConversion : public OpConversionPattern<arith::CmpIOp> {
}
};
+class NegFOpConversion : public OpConversionPattern<arith::NegFOp> {
+public:
+ using OpConversionPattern::OpConversionPattern;
+
+ LogicalResult
+ matchAndRewrite(arith::NegFOp op, OpAdaptor adaptor,
+ ConversionPatternRewriter &rewriter) const override {
+
+ auto adaptedOp = adaptor.getOperand();
+ auto adaptedOpType = adaptedOp.getType();
+
+ if (!isa<FloatType>(adaptedOpType)) {
+ return rewriter.notifyMatchFailure(op.getLoc(),
+ "negf currently only supported on "
+ "floats, not tensors/vectors thereof");
+ }
+
+ rewriter.replaceOpWithNewOp<emitc::UnaryMinusOp>(op, adaptedOpType,
+ adaptedOp);
+ return success();
+ }
+};
+
template <typename ArithOp, bool castToUnsigned>
class CastConversion : public OpConversionPattern<ArithOp> {
public:
@@ -621,6 +644,7 @@ void mlir::populateArithToEmitCPatterns(TypeConverter &typeConverter,
BitwiseOpConversion<arith::XOrIOp, emitc::BitwiseXorOp>,
CmpFOpConversion,
CmpIOpConversion,
+ NegFOpConversion,
SelectOpConversion,
// Truncation is guaranteed for unsigned types.
UnsignedCastConversion<arith::TruncIOp>,
diff --git a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
index c07289109e6dd..881fadc3c9632 100644
--- a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
+++ b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
@@ -81,6 +81,22 @@ func.func @arith_cmpf_tensor(%arg0: tensor<5xf32>, %arg1: tensor<5xf32>) -> tens
// -----
+func.func @arith_negf_tensor(%arg0: tensor<5xf32>) -> tensor<5xf32> {
+ // expected-error @+1 {{failed to legalize operation 'arith.negf'}}
+ %n = arith.negf %arg0 : tensor<5xf32>
+ return %n: tensor<5xf32>
+}
+
+// -----
+
+func.func @arith_negf_vector(%arg0: vector<5xf32>) -> vector<5xf32> {
+ // expected-error @+1 {{failed to legalize operation 'arith.negf'}}
+ %n = arith.negf %arg0 : vector<5xf32>
+ return %n: vector<5xf32>
+}
+
+// -----
+
func.func @arith_extsi_i1_to_i32(%arg0: i1) {
// expected-error @+1 {{failed to legalize operation 'arith.extsi'}}
%idx = arith.extsi %arg0 : i1 to i32
diff --git a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc.mlir b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc.mlir
index 71f1a6abd913b..667ff795178a6 100644
--- a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc.mlir
+++ b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc.mlir
@@ -422,6 +422,17 @@ func.func @arith_cmpi_predicates(%arg0: i32, %arg1: i32) {
// -----
+func.func @arith_negf(%arg0: f32) -> f32 {
+ // CHECK-LABEL: arith_negf
+ // CHECK-SAME: %[[Arg0:[^ ]*]]: f32
+ // CHECK: %[[N:[^ ]*]] = emitc.unary_minus %[[Arg0]] : (f32) -> f32
+ %n = arith.negf %arg0 : f32
+ // CHECK: return %[[N]]
+ return %n: f32
+}
+
+// -----
+
func.func @arith_float_to_int_cast_ops(%arg0: f32, %arg1: f64) {
// CHECK: emitc.cast %arg0 : f32 to i32
%0 = arith.fptosi %arg0 : f32 to i32
>From 65c988f4d6b26f8dda7ec41707846da9764e56b9 Mon Sep 17 00:00:00 2001
From: Tina Jung <tina.maria.jung at xilinx.com>
Date: Thu, 13 Jun 2024 14:28:24 +0100
Subject: [PATCH 2/4] Use proper float check
---
mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
index 4ca59d11f0836..d5dc9306855a5 100644
--- a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
+++ b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
@@ -299,7 +299,7 @@ class NegFOpConversion : public OpConversionPattern<arith::NegFOp> {
auto adaptedOp = adaptor.getOperand();
auto adaptedOpType = adaptedOp.getType();
- if (!isa<FloatType>(adaptedOpType)) {
+ if (!emitc::isSupportedFloatType(adaptedOpType)) {
return rewriter.notifyMatchFailure(op.getLoc(),
"negf currently only supported on "
"floats, not tensors/vectors thereof");
>From f8d920b5ee2f993bad9b3cc75d80222785e45c47 Mon Sep 17 00:00:00 2001
From: Tina Jung <tina.maria.jung at xilinx.com>
Date: Mon, 17 Jun 2024 11:01:01 +0100
Subject: [PATCH 3/4] Add float80 test
---
.../ArithToEmitC/arith-to-emitc-unsupported.mlir | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
index 881fadc3c9632..8a5ca1c41aa8f 100644
--- a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
+++ b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
@@ -81,6 +81,14 @@ func.func @arith_cmpf_tensor(%arg0: tensor<5xf32>, %arg1: tensor<5xf32>) -> tens
// -----
+func.func @arith_negf_f80(%arg0: tensor<5xf80>) -> tensor<5xf80> {
+ // expected-error @+1 {{failed to legalize operation 'arith.negf'}}
+ %n = arith.negf %arg0 : tensor<5xf80>
+ return %n: tensor<5xf80>
+}
+
+// -----
+
func.func @arith_negf_tensor(%arg0: tensor<5xf32>) -> tensor<5xf32> {
// expected-error @+1 {{failed to legalize operation 'arith.negf'}}
%n = arith.negf %arg0 : tensor<5xf32>
>From cfede88336c5f221921438868abc433c421b4d2d Mon Sep 17 00:00:00 2001
From: Tina Jung <tina.maria.jung at xilinx.com>
Date: Mon, 17 Jun 2024 12:20:49 +0100
Subject: [PATCH 4/4] Fix f80 test to use scalar
---
.../Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
index 8a5ca1c41aa8f..caef04052aa8c 100644
--- a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
+++ b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-unsupported.mlir
@@ -81,10 +81,10 @@ func.func @arith_cmpf_tensor(%arg0: tensor<5xf32>, %arg1: tensor<5xf32>) -> tens
// -----
-func.func @arith_negf_f80(%arg0: tensor<5xf80>) -> tensor<5xf80> {
+func.func @arith_negf_f80(%arg0: f80) -> f80 {
// expected-error @+1 {{failed to legalize operation 'arith.negf'}}
- %n = arith.negf %arg0 : tensor<5xf80>
- return %n: tensor<5xf80>
+ %n = arith.negf %arg0 : f80
+ return %n: f80
}
// -----
More information about the Mlir-commits
mailing list