Skip to content

[mlir][vector] Update tests for xfer permutation lowering (4/N) #127624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 25, 2025
Merged

[mlir][vector] Update tests for xfer permutation lowering (4/N) #127624

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a360fc2
[mlir][vector] Update tests for xfer permutation lowering (4/N)
banach-space Feb 16, 2025
4c906ac
fixup! [mlir][vector] Update tests for xfer permutation lowering (4/N)
banach-space Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 82 additions & 11 deletions mlir/test/Dialect/Vector/vector-transfer-permutation-lowering.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,17 +363,39 @@ func.func @xfer_read_minor_identity_transposed_masked_scalable(
}

///----------------------------------------------------------------------------------------
/// vector.transfer_read
/// [Pattern: TransferOpReduceRank]
///
/// IN: vector.transfer_read (minor identity map + broadcast)
/// OUT: vector.transfer_read + vector.broadcast
///----------------------------------------------------------------------------------------
/// TODO: Review and categorize

// CHECK-LABEL: func.func @xfer_read_minor_identitiy_bcast_dims
// CHECK-SAME: %[[MEM:.*]]: memref<?x?x?x?xf32>, %[[IDX:.*]]: index) -> vector<8x4x2x3xf32> {
// CHECK: %[[T_READ:.*]] = vector.transfer_read %[[MEM]][%[[IDX]], %[[IDX]], %[[IDX]], %[[IDX]]]{{.*}} permutation_map = #[[$MAP]]} : memref<?x?x?x?xf32>, vector<4x2x3xf32>
// CHECK: %[[BC:.*]] = vector.broadcast %[[T_READ]] : vector<4x2x3xf32> to vector<8x4x2x3xf32>
// CHECK: return %[[BC]] : vector<8x4x2x3xf32>
func.func @xfer_read_minor_identitiy_bcast_dims(
%mem: memref<?x?x?x?xf32>,
%idx: index) -> vector<8x4x2x3xf32> {

%pad = arith.constant 0.000000e+00 : f32

%res = vector.transfer_read %mem[%idx, %idx, %idx, %idx], %pad {
in_bounds = [true, true, true, true],
permutation_map = affine_map<(d0, d1, d2, d3) -> (0, d1, 0, d3)>
} : memref<?x?x?x?xf32>, vector<8x4x2x3xf32>

return %res : vector<8x4x2x3xf32>
}

// CHECK-LABEL: func.func @xfer_read_minor_identitiy_bcast_dims_scalable
// CHECK-SAME: %[[MEM:.*]]: memref<?x?x?x?xf32>, %[[IDX:.*]]: index) -> vector<8x[4]x2x3xf32> {
// CHECK: %[[T_READ:.*]] = vector.transfer_read %[[MEM]][%[[IDX]], %[[IDX]], %[[IDX]], %[[IDX]]]{{.*}} permutation_map = #[[$MAP]]} : memref<?x?x?x?xf32>, vector<[4]x2x3xf32>
// CHECK: %[[BC:.*]] = vector.broadcast %[[T_READ]] : vector<[4]x2x3xf32> to vector<8x[4]x2x3xf32>
// CHECK: return %[[BC]] : vector<8x[4]x2x3xf32>
func.func @xfer_read_minor_identitiy_bcast_dims_scalable(
%mem: memref<?x?x?x?xf32>, %idx: index) -> vector<8x[4]x2x3xf32> {
%mem: memref<?x?x?x?xf32>,
%idx: index) -> vector<8x[4]x2x3xf32> {

%pad = arith.constant 0.000000e+00 : f32

Expand All @@ -385,31 +407,80 @@ func.func @xfer_read_minor_identitiy_bcast_dims_scalable(
return %res : vector<8x[4]x2x3xf32>
}

// CHECK-LABEL: func.func @xfer_read_minor_identitiy_bcast_dims_with_mask
// CHECK-SAME: %[[MEM:.*]]: memref<?x?x?x?xf32>
// CHECK-SAME: %[[MASK:.*]]: vector<4x3xi1>
// CHECK-SAME: %[[IDX:.*]]: index) -> vector<8x4x2x3xf32>
// CHECK: %[[PASS_THROUGH:.*]] = arith.constant 0.000000e+00 : f32
// CHECK: %[[T_READ:.*]] = vector.transfer_read %[[MEM]][%[[IDX]], %[[IDX]], %[[IDX]], %[[IDX]]], %[[PASS_THROUGH]], %[[MASK]]{{.*}} permutation_map = #[[$MAP]]} : memref<?x?x?x?xf32>, vector<4x2x3xf32>
// CHECK: %[[BC:.*]] = vector.broadcast %[[T_READ]] : vector<4x2x3xf32> to vector<8x4x2x3xf32>
// CHECK: return %[[BC]] : vector<8x4x2x3xf32>
func.func @xfer_read_minor_identitiy_bcast_dims_with_mask(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this test deserve a scalable flavour ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, why not :) And thanks for the review!

%mem: memref<?x?x?x?xf32>,
%mask: vector<4x3xi1>,
%idx: index) -> vector<8x4x2x3xf32> {

%pad = arith.constant 0.000000e+00 : f32

%res = vector.transfer_read %mem[%idx, %idx, %idx, %idx], %pad, %mask {
in_bounds = [true, true, true, true],
permutation_map = affine_map<(d0, d1, d2, d3) -> (0, d1, 0, d3)>
} : memref<?x?x?x?xf32>, vector<8x4x2x3xf32>

return %res : vector<8x4x2x3xf32>
}

// CHECK-LABEL: func.func @xfer_read_minor_identitiy_bcast_dims_with_mask_scalable
// CHECK-SAME: %[[MEM:.*]]: memref<?x?x?x?xf32>
// CHECK-SAME: %[[MASK:.*]]: vector<[4]x3xi1>
// CHECK-SAME: %[[IDX:.*]]: index) -> vector<8x[4]x2x3xf32>
// CHECK: %[[PASS_THROUGH:.*]] = arith.constant 0.000000e+00 : f32
// CHECK: %[[T_READ:.*]] = vector.transfer_read %[[MEM]][%[[IDX]], %[[IDX]], %[[IDX]], %[[IDX]]], %[[PASS_THROUGH]], %[[MASK]]{{.*}} permutation_map = #[[$MAP]]} : memref<?x?x?x?xf32>, vector<[4]x2x3xf32>
// CHECK: %[[BC:.*]] = vector.broadcast %[[T_READ]] : vector<[4]x2x3xf32> to vector<8x[4]x2x3xf32>
// CHECK: return %[[BC]] : vector<8x[4]x2x3xf32>
func.func @xfer_read_minor_identitiy_bcast_dims_with_mask_scalable(
%mem: memref<?x?x?x?xf32>,
%mask: vector<[4]x3xi1>,
%idx: index) -> vector<8x[4]x2x3xf32> {

%pad = arith.constant 0.000000e+00 : f32

%res = vector.transfer_read %mem[%idx, %idx, %idx, %idx], %pad, %mask {
in_bounds = [true, true, true, true],
permutation_map = affine_map<(d0, d1, d2, d3) -> (0, d1, 0, d3)>
} : memref<?x?x?x?xf32>, vector<8x[4]x2x3xf32>

return %res : vector<8x[4]x2x3xf32>
}

// Masked version is not supported

// CHECK-LABEL: func.func @xfer_read_minor_identitiy_bcast_dims_masked
// CHECK-SAME: %[[MEM:.*]]: memref<?x?x?x?xf32>,
// CHECK-SAME: %[[MASK:.*]]: vector<[4]x3xi1>
// CHECK-SAME: %[[IDX:.*]]: index) -> vector<8x[4]x2x3xf32> {
// CHECK-SAME: %[[MASK:.*]]: vector<4x3xi1>
// CHECK-SAME: %[[IDX:.*]]: index) -> vector<8x4x2x3xf32> {
// CHECK-NOT: vector.broadcast
// CHECK: vector.mask %[[MASK]] { vector.transfer_read %[[MEM]]{{.*}} : memref<?x?x?x?xf32>, vector<8x[4]x2x3xf32> } : vector<[4]x3xi1> -> vector<8x[4]x2x3xf32>
// CHECK: vector.mask %[[MASK]] { vector.transfer_read %[[MEM]]{{.*}} : memref<?x?x?x?xf32>, vector<8x4x2x3xf32> } : vector<4x3xi1> -> vector<8x4x2x3xf32>
func.func @xfer_read_minor_identitiy_bcast_dims_masked(
%mem: memref<?x?x?x?xf32>,
%mask: vector<[4]x3xi1>,
%idx: index) -> vector<8x[4]x2x3xf32> {
%mask: vector<4x3xi1>,
%idx: index) -> vector<8x4x2x3xf32> {

%pad = arith.constant 0.000000e+00 : f32

%res = vector.mask %mask {
vector.transfer_read %mem[%idx, %idx, %idx, %idx], %pad {
in_bounds = [true, true, true, true],
permutation_map = affine_map<(d0, d1, d2, d3) -> (0, d1, 0, d3)>
} : memref<?x?x?x?xf32>, vector<8x[4]x2x3xf32>
} : vector<[4]x3xi1> -> vector<8x[4]x2x3xf32>
} : memref<?x?x?x?xf32>, vector<8x4x2x3xf32>
} : vector<4x3xi1> -> vector<8x4x2x3xf32>

return %res : vector<8x[4]x2x3xf32>
return %res : vector<8x4x2x3xf32>
}

///----------------------------------------------------------------------------------------
// TD sequence
///----------------------------------------------------------------------------------------
module attributes {transform.with_named_sequence} {
transform.named_sequence @__transform_main(%module_op: !transform.any_op {transform.readonly}) {
%f = transform.structured.match ops{["func.func"]} in %module_op
Expand Down