add pattern for arith::UIToFPOp to VectorNarrowTypeRewritePatterns #115485

ziereis · 2024-11-08T14:07:11Z

This pr just adds the patterns from #89131 for the arith::UIToFPOp. Also does some slight renaming and moving of the tests for better readability.

github-actions · 2024-11-08T14:07:29Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2024-11-08T14:08:04Z

@llvm/pr-subscribers-mlir-vector

@llvm/pr-subscribers-mlir

Author: None (ziereis)

Changes

This pr just adds the patterns from #89131 for the arith::UIToFPOp.

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

2 Files Affected:

(modified) mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp (+4-2)
(modified) mlir/test/Dialect/Vector/vector-rewrite-narrow-types.mlir (+29-1)

diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp
index 58841f29698e0d..76ddaa2df5a9d9 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp
@@ -1452,8 +1452,10 @@ void vector::populateVectorNarrowTypeRewritePatterns(
                RewriteAlignedSubByteIntExt<arith::SIToFPOp, /*isSigned=*/true>,
                RewriteAlignedSubByteIntTrunc>(patterns.getContext(),
                                               benefit.getBenefit() + 1);
-  patterns.add<RewriteAlignedSubByteIntExt<arith::ExtUIOp, /*isSigned=*/false>>(
-      patterns.getContext(), benefit.getBenefit() + 1);
+  patterns
+      .add<RewriteAlignedSubByteIntExt<arith::ExtUIOp, /*isSigned=*/false>,
+           RewriteAlignedSubByteIntExt<arith::UIToFPOp, /*isSigned=*/false>>(
+          patterns.getContext(), benefit.getBenefit() + 1);
 }
 
 void vector::populateVectorTransposeNarrowTypeRewritePatterns(
diff --git a/mlir/test/Dialect/Vector/vector-rewrite-narrow-types.mlir b/mlir/test/Dialect/Vector/vector-rewrite-narrow-types.mlir
index 84aaa9c61200b9..75e46a79600d08 100644
--- a/mlir/test/Dialect/Vector/vector-rewrite-narrow-types.mlir
+++ b/mlir/test/Dialect/Vector/vector-rewrite-narrow-types.mlir
@@ -262,6 +262,34 @@ func.func @aligned_sitofp_2d(%a: vector<8x32xi4>) -> vector<8x32xf32> {
   return %0 : vector<8x32xf32>
 }
 
+// CHECK-LABEL: func.func @aligned_uitofp(
+func.func @aligned_uitofp(%a: vector<8xi4>) -> vector<8xf32> {
+// CHECK-SAME:    %[[IN:.*]]: vector<8xi4>) -> vector<8xf32> {
+// CHECK:           %[[I4_BITS:.*]] = arith.constant dense<4> : vector<4xi8>
+// CHECK:           %[[LOWBITS_MASK:.*]] = arith.constant dense<15> : vector<4xi8>
+// CHECK:           %[[BITCAST:.*]] = vector.bitcast %[[IN]] : vector<8xi4> to vector<4xi8>
+// CHECK:           %[[LOW:.*]] = arith.andi %[[BITCAST]], %[[LOWBITS_MASK]] : vector<4xi8>
+// CHECK:           %[[HIGH:.*]] = arith.shrui %[[BITCAST]], %[[I4_BITS]] : vector<4xi8>
+// CHECK:           %[[INTERLEAVE:.*]] = vector.interleave %[[LOW]], %[[HIGH]] : vector<4xi8>
+// CHECK:           %[[F32:.*]] = arith.uitofp %[[INTERLEAVE]] : vector<8xi8> to vector<8xf32>
+  %0 = arith.uitofp %a : vector<8xi4> to vector<8xf32>
+  return %0 : vector<8xf32>
+}
+
+// CHECK-LABEL: func.func @aligned_uitofp_2d(
+func.func @aligned_uitofp_2d(%a: vector<8x32xi4>) -> vector<8x32xf32> {
+// CHECK-SAME:    %[[IN:.*]]: vector<8x32xi4>) -> vector<8x32xf32> {
+// CHECK:           %[[I4_BITS:.*]] = arith.constant dense<4> : vector<8x16xi8>
+// CHECK:           %[[LOWBITS_MASK:.*]] = arith.constant dense<15> : vector<8x16xi8>
+// CHECK:           %[[BITCAST:.*]] = vector.bitcast %[[IN]] : vector<8x32xi4> to vector<8x16xi8>
+// CHECK:           %[[LOW:.*]] = arith.andi %[[BITCAST]], %[[LOWBITS_MASK]] : vector<8x16xi8>
+// CHECK:           %[[HIGH:.*]] = arith.shrui %[[BITCAST]], %[[I4_BITS]] : vector<8x16xi8>
+// CHECK:           %[[INTERLEAVE:.*]] = vector.interleave %[[LOW]], %[[HIGH]] : vector<8x16xi8>
+// CHECK:           %[[F32:.*]] = arith.uitofp %[[INTERLEAVE]] : vector<8x32xi8> to vector<8x32xf32>
+  %0 = arith.uitofp %a : vector<8x32xi4> to vector<8x32xf32>
+  return %0 : vector<8x32xf32>
+}
+
 // CHECK-LABEL: func.func @aligned_trunci(
 func.func @aligned_trunci(%a: vector<8xi32>) -> vector<8xi4> {
 // CHECK-SAME:    %[[IN:.*]]: vector<8xi32>) -> vector<8xi4> {
@@ -314,7 +342,7 @@ func.func @aligned_trunci_nd(%a: vector<3x8x32xi32>) -> vector<3x8x32xi4> {
   // CHECK: %[[ZEROED_LOW:.*]] = arith.andi %[[LOW]], %[[I4_MASK]] : vector<3x8x16xi8>
   // CHECK: %[[SHL_HIGH:.*]] = arith.shli %[[HIGH]], %[[LEFT_SHIFT_BITS]] : vector<3x8x16xi8>
   // CHECK: %[[MERGED:.*]] = arith.ori %[[ZEROED_LOW]], %[[SHL_HIGH]] : vector<3x8x16xi8>
-  // CHECK: %[[I4:.*]] = vector.bitcast %[[MERGED]] : vector<3x8x16xi8> to vector<3x8x32xi4> 
+  // CHECK: %[[I4:.*]] = vector.bitcast %[[MERGED]] : vector<3x8x16xi8> to vector<3x8x32xi4>
   %0 = arith.trunci %a : vector<3x8x32xi32> to vector<3x8x32xi4>
   return %0 : vector<3x8x32xi4>
 }

dcaballe

Thanks!

banach-space · 2024-11-11T08:34:37Z

mlir/test/Dialect/Vector/vector-rewrite-narrow-types.mlir

@@ -262,6 +262,34 @@ func.func @aligned_sitofp_2d(%a: vector<8x32xi4>) -> vector<8x32xf32> {
  return %0 : vector<8x32xf32>
 }

+// CHECK-LABEL: func.func @aligned_uitofp(


I've noticed arith.sitofp and arith.trunci include @{.*}_base_case test functions. Could you add a similar function here for consistency and symmetry?

Additionally, I believe it would be clearer if "base case" also appeared first (as in, "base case" followed by more involved cases). Also, "base case" itself may be a bit ambiguous. Based on my understanding, renaming these test functions might improve clarity, for example:

@aligned_sitofp → @aligned_sitofp_i4_to_f32,

@aligned_extsi_base_case → @aligned_extsi_i4_to_i32.

What do you think? If you agree, would you mind making these small additional changes? I realize this is slightly outside the PR's scope, but the impact would be positive without adding much noise.

as far as i can see the base_case tests are for converting i4 to i8 which is only possible for the ext and trunc functions but not the the integer to float conversion function ie. sitofp and uitofp.

But i can definitely improve the naming and reorder them

banach-space

Great, thank you! LGTM

Would you mind adding a note in the summary that you are also updating test function names for better consistency.

Btw, do you have commit access or would you like me to land this for you?

ziereis · 2024-11-11T15:11:03Z

@banach-space i updated the description. I dont think i can merge it so i would be happy if you could do it. Thanks!

github-actions · 2024-11-11T15:17:34Z

@ziereis Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

…lvm#115485) This pr just adds the patterns from llvm#89131 for the arith::UIToFPOp. Also does some slight renaming and moving of the tests for better readability.

add uitofp rewrite

2e1e0f1

ziereis requested review from dcaballe and hanhanW as code owners November 8, 2024 14:07

llvmbot added mlir:vectorops mlir mlir:vector labels Nov 8, 2024

dcaballe approved these changes Nov 8, 2024

View reviewed changes

banach-space reviewed Nov 11, 2024

View reviewed changes

renaming tests

ecbad79

banach-space approved these changes Nov 11, 2024

View reviewed changes

banach-space merged commit 4c4db3c into llvm:main Nov 11, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

add pattern for arith::UIToFPOp to VectorNarrowTypeRewritePatterns #115485

add pattern for arith::UIToFPOp to VectorNarrowTypeRewritePatterns #115485

Uh oh!

ziereis commented Nov 8, 2024 •

edited

Loading

Uh oh!

github-actions bot commented Nov 8, 2024

Uh oh!

llvmbot commented Nov 8, 2024 •

edited

Loading

Uh oh!

dcaballe left a comment

Uh oh!

banach-space Nov 11, 2024

Uh oh!

ziereis Nov 11, 2024

Uh oh!

banach-space left a comment

Uh oh!

ziereis commented Nov 11, 2024

Uh oh!

Uh oh!

github-actions bot commented Nov 11, 2024

Uh oh!

Uh oh!

add pattern for arith::UIToFPOp to VectorNarrowTypeRewritePatterns #115485

add pattern for arith::UIToFPOp to VectorNarrowTypeRewritePatterns #115485

Uh oh!

Conversation

ziereis commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Nov 8, 2024

Uh oh!

llvmbot commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dcaballe left a comment

Choose a reason for hiding this comment

Uh oh!

banach-space Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

ziereis Nov 11, 2024

Choose a reason for hiding this comment

Uh oh!

banach-space left a comment

Choose a reason for hiding this comment

Uh oh!

ziereis commented Nov 11, 2024

Uh oh!

Uh oh!

github-actions bot commented Nov 11, 2024

Uh oh!

Uh oh!

ziereis commented Nov 8, 2024 •

edited

Loading

llvmbot commented Nov 8, 2024 •

edited

Loading