address review comments

Author: zero9178

mlir/include/mlir/IR/OpImplementation.h

@@ -1602,33 +1602,15 @@ class OpAsmParser : public AsmParser {
                   SmallVectorImpl<Value> &result) {
     size_t operandSize = llvm::range_size(operands);
     size_t typeSize = llvm::range_size(types);
-    if (operandSize == typeSize) {
-      for (auto [operand, type] : llvm::zip_equal(operands, types))
-        if (resolveOperand(operand, type, result))
-          return failure();
-      return success();
-    }
-
-    InFlightDiagnostic diag = emitError(loc)
-                              << "number of operands and types do not match";
-    std::string lesserQuantityText = "operand";
-    if (operandSize != 1)
-      lesserQuantityText += "s";
-    std::string higherQuantityText = "type";
-    if (typeSize != 1)
-      higherQuantityText += "s";
-
-    size_t lesserQuantity = operandSize;
-    size_t higherQuantity = typeSize;
-    if (operandSize > typeSize) {
-      std::swap(lesserQuantity, higherQuantity);
-      std::swap(lesserQuantityText, higherQuantityText);
-    }
+    if (operandSize != typeSize)
+      return emitError(loc)
+             << "number of operands and types do not match: got " << operandSize
+             << " operands and " << typeSize << " types";
 
-    diag.attachNote() << "got " << higherQuantity << " " << higherQuantityText
-                      << " but only " << lesserQuantity << " "
-                      << lesserQuantityText;
-    return diag;
+    for (auto [operand, type] : llvm::zip_equal(operands, types))
+      if (resolveOperand(operand, type, result))
+        return failure();
+    return success();
   }
 
   /// Parses an affine map attribute where dims and symbols are SSA operands.

mlir/test/Dialect/LLVMIR/invalid.mlir

@@ -91,16 +91,14 @@ func.func @alloca_non_integer_alignment() {
 // -----
 
 func.func @gep_missing_input_result_type(%pos : i64, %base : !llvm.ptr) {
-  // expected-error@+2 {{number of operands and types do not match}}
-  // expected-note@+1 {{got 2 operands but only 0 types}}
+  // expected-error@+1 {{number of operands and types do not match: got 2 operands and 0 types}}
   llvm.getelementptr %base[%pos] : () -> (), i64
 }
 
 // -----
 
 func.func @gep_missing_input_type(%pos : i64, %base : !llvm.ptr) {
-  // expected-error@+2 {{number of operands and types do not match}}
-  // expected-note@+1 {{got 2 operands but only 0 types}}
+  // expected-error@+1 {{number of operands and types do not match: got 2 operands and 0 types}}
   llvm.getelementptr %base[%pos] : () -> (!llvm.ptr), i64
 }
 

mlir/test/Dialect/Linalg/transform-ops-invalid.mlir

@@ -77,8 +77,7 @@ transform.sequence failures(propagate) {
 transform.sequence failures(propagate) {
 ^bb0(%arg0: !transform.any_op):
   %0 = transform.param.constant 2 : i64 -> !transform.param<i64>
-  // expected-error@+2 {{custom op 'transform.structured.vectorize' number of operands and types do not match}}
-  // expected-note@below {{got 2 types but only 1 operand}}
+  // expected-error@+1 {{custom op 'transform.structured.vectorize' number of operands and types do not match: got 1 operands and 2 types}}
   transform.structured.vectorize %arg0 vector_sizes [%0, 2] : !transform.any_op, !transform.param<i64>, !transform.param<i64>
 
 }

mlir/test/Dialect/SCF/invalid.mlir

@@ -247,8 +247,7 @@ func.func @parallel_more_results_than_reduces(
 
 func.func @parallel_more_results_than_initial_values(
     %arg0 : index, %arg1: index, %arg2: index) {
-  // expected-error@+2 {{'scf.parallel' number of operands and types do not match}}
-  // expected-note@+1 {{got 1 type but only 0 operands}}
+  // expected-error@+1 {{'scf.parallel' number of operands and types do not match: got 0 operands and 1 types}}
   %res = scf.parallel (%i0) = (%arg0) to (%arg1) step (%arg2) -> f32 {
     scf.reduce(%arg0 : index) {
       ^bb0(%lhs: index, %rhs: index):
@@ -610,8 +609,7 @@ func.func @wrong_num_results(%in: tensor<100xf32>, %out: tensor<100xf32>) {
   %c1 = arith.constant 1 : index
   %num_threads = arith.constant 100 : index
 
-  // expected-error@+2 {{number of operands and types do not match}}
-  // expected-note@+1 {{got 2 types but only 1 operand}}
+  // expected-error@+1 {{number of operands and types do not match: got 1 operands and 2 types}}
   %result:2 = scf.forall (%thread_idx) in (%num_threads) shared_outs(%o = %out) -> (tensor<100xf32>, tensor<100xf32>) {
       %1 = tensor.extract_slice %in[%thread_idx][1][1] : tensor<100xf32> to tensor<1xf32>
       scf.forall.in_parallel {

mlir/test/Dialect/SPIRV/IR/memory-ops.mlir

@@ -57,8 +57,7 @@ func.func @access_chain_non_composite() -> () {
 
 func.func @access_chain_no_indices(%index0 : i32) -> () {
   %0 = spirv.Variable : !spirv.ptr<!spirv.array<4x!spirv.array<4xf32>>, Function>
-  // expected-error @+2 {{custom op 'spirv.AccessChain' number of operands and types do not match}}
-  // expected-note @+1 {{got 1 type but only 0 operands}}
+  // expected-error @+1 {{custom op 'spirv.AccessChain' number of operands and types do not match: got 0 operands and 1 types}}
   %1 = spirv.AccessChain %0[] : !spirv.ptr<!spirv.array<4x!spirv.array<4xf32>>, Function>, i32 -> !spirv.ptr<f32, Function>
   return
 }
@@ -76,8 +75,7 @@ func.func @access_chain_missing_comma(%index0 : i32) -> () {
 
 func.func @access_chain_invalid_indices_types_count(%index0 : i32) -> () {
   %0 = spirv.Variable : !spirv.ptr<!spirv.array<4x!spirv.array<4xf32>>, Function>
-  // expected-error @+2 {{custom op 'spirv.AccessChain' number of operands and types do not match}}
-  // expected-note @+1 {{got 2 types but only 1 operand}}
+  // expected-error @+1 {{custom op 'spirv.AccessChain' number of operands and types do not match: got 1 operands and 2 types}}
   %1 = spirv.AccessChain %0[%index0] : !spirv.ptr<!spirv.array<4x!spirv.array<4xf32>>, Function>, i32, i32 -> !spirv.ptr<!spirv.array<4xf32>, Function>
   return
 }
@@ -86,8 +84,7 @@ func.func @access_chain_invalid_indices_types_count(%index0 : i32) -> () {
 
 func.func @access_chain_missing_indices_type(%index0 : i32) -> () {
   %0 = spirv.Variable : !spirv.ptr<!spirv.array<4x!spirv.array<4xf32>>, Function>
-  // expected-error @+2 {{custom op 'spirv.AccessChain' number of operands and types do not match}}
-  // expected-note @+1 {{got 2 operands but only 1 type}}
+  // expected-error @+1 {{custom op 'spirv.AccessChain' number of operands and types do not match: got 2 operands and 1 types}}
   %1 = spirv.AccessChain %0[%index0, %index0] : !spirv.ptr<!spirv.array<4x!spirv.array<4xf32>>, Function>, i32 -> !spirv.ptr<f32, Function>
   return
 }

mlir/test/Dialect/Tensor/invalid.mlir

@@ -90,8 +90,7 @@ func.func @tensor.from_elements_wrong_result_type() {
 // -----
 
 func.func @tensor.from_elements_wrong_elements_count() {
-  // expected-error@+3 {{number of operands and types do not match}}
-  // expected-note@+2 {{got 2 types but only 1 operand}}
+  // expected-error@+2 {{number of operands and types do not match: got 1 operands and 2 types}}
   %c0 = arith.constant 0 : index
   %0 = tensor.from_elements %c0 : tensor<2xindex>
   return

mlir/test/Dialect/Vector/invalid.mlir

@@ -1803,8 +1803,7 @@ func.func @deinterleave_scalable_rank_fail(%vec : vector<2x[4]xf32>) {
 // -----
 
 func.func @invalid_from_elements(%a: f32) {
-  // expected-error @+2 {{'vector.from_elements' number of operands and types do not match}}
-  // expected-note @+1 {{got 2 types but only 1 operand}}
+  // expected-error @+1 {{'vector.from_elements' number of operands and types do not match: got 1 operands and 2 types}}
   vector.from_elements %a : vector<2xf32>
   return
 }