Skip to content

Commit c1cd243

Browse files
MacDueMacDue
committed
Fixups
1 parent 5673849 commit c1cd243

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

‎mlir/lib/Conversion/ArmSMEToSCF/ArmSMEToSCF.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ struct TileLoadOpConversion : public OpRewritePattern<arm_sme::TileLoadOp> {
128128
tileLoadOp.createOpAndForwardTileId<arm_sme::LoadTileSliceOp>(
129129
rewriter, loc, tileType, tileLoadOp.getBase(), allTruePredicate,
130130
currentTile, memrefIndices, tileSliceIndex, tileLoadOp.getLayout());
131-
rewriter.create<scf::YieldOp>(loc, ValueRange{loadSlice});
131+
rewriter.create<scf::YieldOp>(loc, loadSlice.getResult());
132132

133133
rewriter.setInsertionPointAfter(forOp);
134134

@@ -233,7 +233,7 @@ struct TileLoadOpWithMaskAndPadZeroConversion
233233
tileLoadOp.createOpAndForwardTileId<arm_sme::LoadTileSliceOp>(
234234
rewriter, loc, tileType, tileLoadOp.getBase(), numColsOp,
235235
currentTile, memrefIndices, tileSliceIndex, tileLoadOp.getLayout());
236-
rewriter.create<scf::YieldOp>(loc, ValueRange{loadSlice});
236+
rewriter.create<scf::YieldOp>(loc, loadSlice.getResult());
237237

238238
rewriter.setInsertionPointAfter(forOp);
239239

@@ -363,7 +363,7 @@ struct TileLoadOpWithMaskAndPadNonZeroConversion
363363
tileLoadOp.createOpAndForwardTileId<arm_sme::MoveVectorToTileSliceOp>(
364364
rewriter, loc, tileType, loadSlice->getResult(0), currentTile,
365365
tileSliceIndex, tileLoadOp.getLayout());
366-
rewriter.create<scf::YieldOp>(loc, ValueRange{moveSlice});
366+
rewriter.create<scf::YieldOp>(loc, moveSlice.getResult());
367367

368368
rewriter.setInsertionPointAfter(forOp);
369369

‎mlir/lib/Conversion/VectorToArmSME/VectorToArmSME.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static scf::ForOp createLoopOverTileSlices(PatternRewriter &rewriter,
4545
ValueRange{initTile});
4646
rewriter.setInsertionPointToStart(forOp.getBody());
4747
auto nextTile = callback(forOp);
48-
rewriter.create<scf::YieldOp>(loc, ValueRange{nextTile});
48+
rewriter.create<scf::YieldOp>(loc, nextTile.getResult());
4949
return forOp;
5050
}
5151

‎mlir/test/Conversion/ArmSMEToSCF/arm-sme-to-scf.mlir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// CHECK-NEXT: scf.for %[[TILE_SLICE_INDEX:.*]] = %[[C0]] to %[[NUM_TILE_SLICES]] step %[[C1]] iter_args(%[[CURRENT_TILE:.*]] = %[[INIT_TILE]]) -> (vector<[4]x[4]xi32>) {
1616
// CHECK-NEXT: %[[PTRUE_S:.*]] = arith.constant dense<true> : vector<[4]xi1>
1717
// CHECK-NEXT: %[[OFFSET:.*]] = arith.addi %[[C0]], %[[TILE_SLICE_INDEX]] : index
18-
// CHECK-NEXT: %[[NEW_TILE:.*]] = arm_sme.load_tile_slice %[[SRC]]{{\[}}%[[OFFSET]], %[[C0]]], %[[PTRUE_S]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : memref<?x?xi32>, vector<[4]xi1>, vector<[4]x[4]xi32>
19-
// CHECK-NEXT: scf.yield %[[NEW_TILE]] : vector<[4]x[4]xi32>
18+
// CHECK-NEXT: %[[TILE_UPDATE:.*]] = arm_sme.load_tile_slice %[[SRC]]{{\[}}%[[OFFSET]], %[[C0]]], %[[PTRUE_S]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : memref<?x?xi32>, vector<[4]xi1>, vector<[4]x[4]xi32>
19+
// CHECK-NEXT: scf.yield %[[TILE_UPDATE]] : vector<[4]x[4]xi32>
2020
func.func @arm_sme_tile_load_hor(%src : memref<?x?xi32>) {
2121
%c0 = arith.constant 0 : index
2222
%tile = arm_sme.tile_load %src[%c0, %c0] : memref<?x?xi32>, vector<[4]x[4]xi32>
@@ -44,8 +44,8 @@ func.func @arm_sme_tile_load_ver(%src : memref<?x?xi32>) {
4444
// CHECK-DAG: %[[TILE_ZERO:.*]] = arm_sme.zero : vector<[4]x[4]xi32>
4545
// CHECK-NEXT: scf.for %[[TILE_SLICE_INDEX:.*]] = %[[C0]] to %[[NUM_ROWS]] step %[[C1]] iter_args(%[[CURRENT_TILE:.*]] = %[[TILE_ZERO]]) -> (vector<[4]x[4]xi32>) {
4646
// CHECK-NEXT: %[[OFFSET:.*]] = arith.addi %[[C0]], %[[TILE_SLICE_INDEX]] : index
47-
// CHECK-NEXT: %[[NEW_TILE:.*]] = arm_sme.load_tile_slice %[[SRC]]{{\[}}%[[OFFSET]], %[[C0]]], %[[NUM_COLS]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : memref<?x?xi32>, vector<[4]xi1>, vector<[4]x[4]xi32>
48-
// CHECK-NEXT: scf.yield %[[NEW_TILE]] : vector<[4]x[4]xi32>
47+
// CHECK-NEXT: %[[TILE_UPDATE:.*]] = arm_sme.load_tile_slice %[[SRC]]{{\[}}%[[OFFSET]], %[[C0]]], %[[NUM_COLS]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : memref<?x?xi32>, vector<[4]xi1>, vector<[4]x[4]xi32>
48+
// CHECK-NEXT: scf.yield %[[TILE_UPDATE]] : vector<[4]x[4]xi32>
4949
func.func @arm_sme_tile_load_hor_with_mask_and_pad_zero(%src : memref<?x?xi32>) {
5050
%c0 = arith.constant 0 : index
5151
%c2 = arith.constant 2 : index
@@ -79,8 +79,8 @@ func.func @arm_sme_tile_load_hor_with_mask_and_pad_zero(%src : memref<?x?xi32>)
7979
// CHECK-NEXT: %[[OFFSET:.*]] = arith.addi %[[C0]], %[[TILE_SLICE_INDEX]] : index
8080
// CHECK: %[[PAD_1D:.*]] = vector.splat %[[PAD]] : vector<[4]xi32>
8181
// CHECK: %[[LOAD_SLICE:.*]] = vector.maskedload %[[SRC]]{{\[}}%[[OFFSET]], %[[C0]]], %[[MASK_1D]], %[[PAD_1D]] : memref<?x?xi32>, vector<[4]xi1>, vector<[4]xi32> into vector<[4]xi32>
82-
// CHECK: %[[NEW_TILE:.*]] = arm_sme.move_vector_to_tile_slice %[[LOAD_SLICE]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : vector<[4]xi32> into vector<[4]x[4]xi32>
83-
// CHECK-NEXT: scf.yield %[[NEW_TILE]] : vector<[4]x[4]xi32>
82+
// CHECK: %[[TILE_UPDATE:.*]] = arm_sme.move_vector_to_tile_slice %[[LOAD_SLICE]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : vector<[4]xi32> into vector<[4]x[4]xi32>
83+
// CHECK-NEXT: scf.yield %[[TILE_UPDATE]] : vector<[4]x[4]xi32>
8484
func.func @arm_sme_tile_load_hor_with_mask_and_nonzero_pad(%src : memref<?x?xi32>, %pad : i32) {
8585
%c0 = arith.constant 0 : index
8686
%c2 = arith.constant 2 : index

‎mlir/test/Dialect/ArmSME/arith-ops-to-sme.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ func.func @arith_constant_dense_2d_zero_f64() {
9999
// CHECK: %[[VSCALE:.*]] = vector.vscale
100100
// CHECK: %[[NUM_TILE_SLICES:.*]] = arith.muli %[[VSCALE]], %[[C16]] : index
101101
// CHECK: %[[TILE:.*]] = scf.for %[[TILE_SLICE_INDEX:.*]] = %[[C0]] to %[[NUM_TILE_SLICES]] step %[[C1]] iter_args(%[[CURRENT_TILE:.*]] = %[[INIT_TILE]]) -> (vector<[16]x[16]xi8>) {
102-
// CHECK: %[[NEW_TILE:.*]] = arm_sme.move_vector_to_tile_slice %[[C2_SPLAT]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : vector<[16]xi8> into vector<[16]x[16]xi8>
103-
// CHECK: scf.yield %[[NEW_TILE]] : vector<[16]x[16]xi8>
102+
// CHECK: %[[TILE_UPDATE:.*]] = arm_sme.move_vector_to_tile_slice %[[C2_SPLAT]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : vector<[16]xi8> into vector<[16]x[16]xi8>
103+
// CHECK: scf.yield %[[TILE_UPDATE]] : vector<[16]x[16]xi8>
104104
// CHECK: "prevent.dce"(%[[TILE]]) : (vector<[16]x[16]xi8>) -> ()
105105
func.func @arith_constant_dense_2d_nonzero_i8() {
106106
%two = arith.constant dense<2> : vector<[16]x[16]xi8>
@@ -119,8 +119,8 @@ func.func @arith_constant_dense_2d_nonzero_i8() {
119119
// CHECK: %[[VSCALE:.*]] = vector.vscale
120120
// CHECK: %[[NUM_TILE_SLICES:.*]] = arith.muli %[[VSCALE]], %[[C2]] : index
121121
// CHECK: %[[TILE:.*]] = scf.for %[[TILE_SLICE_INDEX:.*]] = %[[C0]] to %[[NUM_TILE_SLICES]] step %[[C1]] iter_args(%[[CURRENT_TILE:.*]] = %[[INIT_TILE]]) -> (vector<[2]x[2]xf64>) {
122-
// CHECK: %[[NEW_TILE:.*]] = arm_sme.move_vector_to_tile_slice %[[C2_SPLAT]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : vector<[2]xf64> into vector<[2]x[2]xf64>
123-
// CHECK: scf.yield %[[NEW_TILE]] : vector<[2]x[2]xf64>
122+
// CHECK: %[[TILE_UPDATE:.*]] = arm_sme.move_vector_to_tile_slice %[[C2_SPLAT]], %[[CURRENT_TILE]], %[[TILE_SLICE_INDEX]] : vector<[2]xf64> into vector<[2]x[2]xf64>
123+
// CHECK: scf.yield %[[TILE_UPDATE]] : vector<[2]x[2]xf64>
124124
// CHECK: "prevent.dce"(%[[TILE]]) : (vector<[2]x[2]xf64>) -> ()
125125
func.func @arith_constant_dense_2d_nonzero_f64() {
126126
%two = arith.constant dense<2.0> : vector<[2]x[2]xf64>

0 commit comments

Comments
 (0)