Use diagnostics to point at tile operand if move is required

Author: MacDue

mlir/lib/Dialect/ArmSME/Transforms/TileAllocation.cpp

@@ -544,9 +544,14 @@ LogicalResult assignTileIdsAndResolveTrivialConflicts(
           continue;
         auto operandTileOp =
             tileOperand->get().getDefiningOp<ArmSMETileOpInterface>();
-        if (!isTriviallyCloneableTileOp(operandTileOp))
-          return tileOp.emitOpError("failed to rectify tile operand with tile "
-                                    "result (move required)");
+        if (!isTriviallyCloneableTileOp(operandTileOp)) {
+          auto error =
+              tileOp.emitOpError("tile operand allocated to different SME "
+                                 "virtial tile (move required)");
+          error.attachNote(tileOperand->get().getLoc())
+              << "tile operand is: " << tileOperand->get();
+          return error;
+        }
         // Cloning prevents a move/spill (though may require recomputation).
         rewriter.setInsertionPoint(tileOp);
         auto clonedOp = operandTileOp.clone();
@@ -567,7 +572,7 @@ LogicalResult assignTileIdsAndResolveTrivialConflicts(
             return;
           if (!isAllocatedToSameTile(predecessorTile)) {
             blockArg.getOwner()->getParentOp()->emitOpError(
-                "block argument not allocated to the same tile as "
+                "block argument not allocated to the same SME virtial tile as "
                 "predecessors");
             tileMismatch = true;
           }

mlir/test/Dialect/ArmSME/tile-allocation-invalid.mlir

@@ -2,9 +2,11 @@
 
 // Select between tileA and tileB. This is currently unsupported as it would
 // require inserting (runtime) tile moves.
+
+// expected-note@below {{tile operand is: <block argument> of type 'vector<[4]x[4]xi32>'}}
 func.func @selecting_between_different_tiles_is_unsupported(%dest : memref<?x?xi32>, %tileA : vector<[4]x[4]xi32>, %tileB : vector<[4]x[4]xi32>, %cond: i1) {
   %c0 = arith.constant 0 : index
-  // expected-error@+1 {{op failed to rectify tile operand with tile result (move required)}}
+  // expected-error@below {{op tile operand allocated to different SME virtial tile (move required)}}
   %tile = scf.if %cond -> vector<[4]x[4]xi32> {
     scf.yield %tileA : vector<[4]x[4]xi32>
   } else {

mlir/test/Dialect/ArmSME/tile-allocation-liveness.mlir

@@ -37,8 +37,9 @@ func.func @constant_with_multiple_users(%a: vector<[4]xf32>, %b: vector<[4]xf32>
 //   CHECK-LIVE-RANGE-NEXT: |E test.some_use
 //   CHECK-LIVE-RANGE-NEXT: E  test.some_use
 
+// expected-note@below {{tile operand is: <block argument> of type 'vector<[4]x[4]xf32>'}}
 func.func @value_with_multiple_users(%tile: vector<[4]x[4]xf32>, %a: vector<[4]xf32>, %b: vector<[4]xf32>, %index: index) {
-  // expected-error@below {{op failed to rectify tile operand with tile result (move required)}}
+  // expected-error@below {{op tile operand allocated to different SME virtial tile (move required)}}
   %tile_a = arm_sme.move_vector_to_tile_slice %a, %tile, %index : vector<[4]xf32> into vector<[4]x[4]xf32>
   %tile_b = arm_sme.move_vector_to_tile_slice %b, %tile, %index : vector<[4]xf32> into vector<[4]x[4]xf32>
   "test.some_use"(%tile_a) : (vector<[4]x[4]xf32>) -> ()
@@ -143,8 +144,10 @@ func.func @non_overlapping_branches(%cond: i1) {
 
 // Here %vecA and %vecB are not merged into the same live range (as they are unknown values).
 // This means that %vecA and %vecB are both allocated to different tiles (which is not legal).
+
+// expected-note@below {{tile operand is: <block argument> of type 'vector<[4]x[4]xf32>'}}
 func.func @overlapping_branches(%cond: i1, %vecA: vector<[4]x[4]xf32>, %vecB: vector<[4]x[4]xf32>) {
-  // expected-error@below {{op failed to rectify tile operand with tile result (move required)}}
+  // expected-error@below {{op tile operand allocated to different SME virtial tile (move required)}}
   %tile = scf.if %cond -> vector<[4]x[4]xf32> {
     scf.yield %vecA : vector<[4]x[4]xf32>
   } else {