[mlir][vector] Fix parser of vector.transfer_read

Author: douyixuan

mlir/lib/Dialect/Vector/IR/VectorOps.cpp

@@ -4265,8 +4265,15 @@ ParseResult TransferReadOp::parse(OpAsmParser &parser, OperationState &result) {
   if (!permMapAttr) {
     permMap = getTransferMinorIdentityMap(shapedType, vectorType);
     if (!permMap) {
-      return parser.emitError(
-          typesLoc, "failed to create a minor identity map, source rank is less than required for vector rank");
+      int64_t elementVectorRank = 0;
+      VectorType elementVectorType =
+          llvm::dyn_cast<VectorType>(shapedType.getElementType());
+      if (elementVectorType)
+        elementVectorRank += elementVectorType.getRank();
+      if (shapedType.getRank() < vectorType.getRank() - elementVectorRank)
+        return parser.emitError(typesLoc,
+                                "expected a custom permutation_map when source "
+                                "rank is less than required for vector rank");
     }
     result.attributes.set(permMapAttrName, AffineMapAttr::get(permMap));
   } else {
@@ -4677,8 +4684,15 @@ ParseResult TransferWriteOp::parse(OpAsmParser &parser,
   if (!permMapAttr) {
     permMap = getTransferMinorIdentityMap(shapedType, vectorType);
     if (!permMap) {
-      return parser.emitError(
-          typesLoc, "failed to create a minor identity map, result rank is less than required for vector rank");
+      int64_t elementVectorRank = 0;
+      VectorType elementVectorType =
+          llvm::dyn_cast<VectorType>(shapedType.getElementType());
+      if (elementVectorType)
+        elementVectorRank += elementVectorType.getRank();
+      if (shapedType.getRank() < vectorType.getRank() - elementVectorRank)
+        return parser.emitError(typesLoc,
+                                "expected a custom permutation_map when result "
+                                "rank is less than required for vector rank");
     }
     result.attributes.set(permMapAttrName, AffineMapAttr::get(permMap));
   } else {

mlir/test/Dialect/Vector/invalid.mlir

@@ -527,7 +527,7 @@ func.func @test_vector.transfer_read(%arg0: memref<?x?xvector<2x3xf32>>) {
 
 func.func @test_vector.transfer_read(%arg1: memref<?xindex>) -> vector<3x4xi32> {
   %c3 = arith.constant 3 : index
-  // expected-error@+1 {{failed to create a minor identity map, source rank is less than required for vector rank}}
+  // expected-error@+1 {{expected a custom permutation_map when source rank is less than required for vector rank}}
   %0 = vector.transfer_read %arg1[%c3, %c3], %c3 : memref<?xindex>, vector<3x4xi32>
   return %0 : vector<3x4xi32>
 }
@@ -656,9 +656,9 @@ func.func @test_vector.transfer_write(%arg0: memref<?xf32>, %arg1: vector<7xf32>
 // -----
 
 func.func @test_vector.transfer_write(%vec_to_write: vector<3x4xi32>, %output_memref: memref<?xindex>) {
-  %c3_idx = arith.constant 3 : index
-  // expected-error@+1 {{failed to create a minor identity map, result rank is less than required for vector rank}}
-  vector.transfer_write %vec_to_write, %output_memref[%c3_idx, %c3_idx] : vector<3x4xi32>, memref<?xindex>
+  %c3 = arith.constant 3 : index
+  // expected-error@+1 {{expected a custom permutation_map when result rank is less than required for vector rank}}
+  vector.transfer_write %vec_to_write, %output_memref[%c3, %c3] : vector<3x4xi32>, memref<?xindex>
 }
 
 // -----