Unverified Commit 3472d4d4 authored by Mehdi Amini's avatar Mehdi Amini Committed by GitHub
Browse files

[MLIR][Doc] Prepend "Variadic of" in front of variadic operands (#69285) 

Table of Operands for operations like:

https://mlir.llvm.org/docs/Dialects/MemRef/#operands-6

Don't distinguish variadic ODS operands from others right now.

After this change, it'll print:

| Operand      | Description       |
| dynamicSizes | Variadic of index |

instead of:

| Operand      | Description |
| dynamicSizes | index       |
parent e9b9a1d3

flang/test/Fir/invalid.fir

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ func.func @bad_array_modify(%arr1 : !fir.ref<!fir.array<?x?xf32>>, %m : index, % 
func.func @slice_must_be_integral() {

  %0 = arith.constant 42 : i32

  %1 = fir.field_index field, !fir.type<t(param:i32){field:i32}> (%0 : i32)

  // expected-error@+1 {{'fir.slice' op operand #0 must be any integer, but got '!fir.field'}}

  // expected-error@+1 {{'fir.slice' op operand #0 must be variadic of any integer, but got '!fir.field'}}

  %2 = fir.slice %1, %1, %1 : (!fir.field, !fir.field, !fir.field) -> !fir.slice<1>

  return

}

flang/test/HLFIR/invalid.fir

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ func.func @bad_concat(%arg0: !fir.ref<!fir.char<1,10>>, %arg1: !fir.ref<!fir.cha 
// -----

func.func @bad_concat_2(%arg0: !fir.ref<!fir.array<100x!fir.char<1,10>>>, %arg1: !fir.ref<!fir.array<100x!fir.char<1,20>>>) {

  %c30 = arith.constant 30 : index

  // expected-error@+1 {{'hlfir.concat' op operand #0 must be any character scalar type, but got '!fir.ref<!fir.array<100x!fir.char<1,10>>>'}}

  // expected-error@+1 {{'hlfir.concat' op operand #0 must be variadic of any character scalar type, but got '!fir.ref<!fir.array<100x!fir.char<1,10>>>'}}

  %0 = hlfir.concat %arg0, %arg1 len %c30 : (!fir.ref<!fir.array<100x!fir.char<1,10>>>, !fir.ref<!fir.array<100x!fir.char<1,20>>>, index) -> (!hlfir.expr<100x!fir.char<1,30>>)

  return

}
@@ -275,7 +275,7 @@ func.func @bad_concat_2(%arg0: !fir.ref<!fir.array<100x!fir.char<1,10>>>, %arg1: 
// -----

func.func @bad_concat_3(%arg0: !fir.ref<!fir.char<1,10>>, %arg1: !fir.ref<i32>) {

  %c30 = arith.constant 30 : index

  // expected-error@+1 {{'hlfir.concat' op operand #1 must be any character scalar type, but got '!fir.ref<i32>'}}

  // expected-error@+1 {{'hlfir.concat' op operand #1 must be variadic of any character scalar type, but got '!fir.ref<i32>'}}

  %0 = hlfir.concat %arg0, %arg1 len %c30 : (!fir.ref<!fir.char<1,10>>, !fir.ref<i32>, index) -> (!hlfir.expr<!fir.char<1,30>>)

  return

}

mlir/include/mlir/IR/CommonTypeConstraints.td

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ class DialectType<Dialect d, Pred condition, string descr = "", 


// A variadic type constraint. It expands to zero or more of the base type. This

// class is used for supporting variadic operands/results.

class Variadic<Type type> : TypeConstraint<type.predicate, type.summary,

class Variadic<Type type> : TypeConstraint<type.predicate,

                                           "variadic of " # type.summary,

                                           type.cppClassName> {

  Type baseType = type;

  int minSize = 0;

mlir/test/Dialect/Affine/invalid.mlir

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
func.func @affine_apply_operand_non_index(%arg0 : i32) {

  // Custom parser automatically assigns all arguments the `index` so we must

  // use the generic syntax here to exercise the verifier.

  // expected-error@+1 {{op operand #0 must be index, but got 'i32'}}

  // expected-error@+1 {{op operand #0 must be variadic of index, but got 'i32'}}

  %0 = "affine.apply"(%arg0) {map = affine_map<(d0) -> (d0)>} : (i32) -> (index)

  return

}

mlir/test/Dialect/LLVMIR/invalid.mlir

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ func.func @call_non_llvm() { 
// -----



func.func @call_non_llvm_arg(%arg0 : tensor<*xi32>) {

  // expected-error@+1 {{'llvm.call' op operand #0 must be LLVM dialect-compatible type}}

  // expected-error@+1 {{'llvm.call' op operand #0 must be variadic of LLVM dialect-compatible type}}

  "llvm.call"(%arg0) : (tensor<*xi32>) -> ()

  llvm.return

}