Move builderCall parameter from custom attr class to DefaultValued(Optional)Attr

Author: rolfmorel

mlir/include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td

@@ -624,10 +624,10 @@ def MatmulOp : LinalgStructuredBase_Op<"matmul", [
     let arguments = (ins
       Variadic<AnyType>:$inputs,
       Variadic<AnyShaped>:$outputs,
-      DefaultValuedContextDependentAttr<AffineMapArrayAttr,
+      DefaultValuedOptionalAttr<AffineMapArrayAttr, "SmallVector<AffineMap>()",
           builderCall = [{ $_builder.getAffineMapArrayAttr(
             $0.empty() ? MatmulOp::getDefaultIndexingMaps($_builder.getContext()) : $0
-          )}], default = "SmallVector<AffineMap>()">:$indexing_maps,
+          )}]>:$indexing_maps,
       DefaultValuedOptionalAttr<TypeFnAttr, "TypeFn::cast_signed">:$cast
     );
     let results = (outs Variadic<AnyRankedTensor>:$result_tensors);

mlir/include/mlir/IR/CommonAttrConstraints.td

@@ -90,15 +90,15 @@ class DialectAttr<Dialect d, Pred condition, string summary = ""> :
 // Attribute modifier definition
 
 // Decorates an attribute to have an (unvalidated) default value if not present.
-class DefaultValuedAttr<Attr attr, string val> :
+class DefaultValuedAttr<Attr attr, string val, string builderCall = ""> :
     Attr<attr.predicate, attr.summary> {
   // Construct this attribute with the input attribute and change only
   // the default value.
   // Note: this has to be kept up to date with Attr above.
   let storageType = attr.storageType;
   let returnType = attr.returnType;
   let convertFromStorage = attr.convertFromStorage;
-  let constBuilderCall = attr.constBuilderCall;
+  let constBuilderCall = !if(!eq(builderCall, ""), attr.constBuilderCall, builderCall);
   let defaultValue = val;
   let valueType = attr.valueType;
 
@@ -107,15 +107,15 @@ class DefaultValuedAttr<Attr attr, string val> :
 
 // Decorates an optional attribute to have an (unvalidated) default value
 // return by ODS generated accessors if not present.
-class DefaultValuedOptionalAttr<Attr attr, string val> :
+class DefaultValuedOptionalAttr<Attr attr, string val, string builderCall = ""> :
     Attr<attr.predicate, attr.summary> {
   // Construct this attribute with the input attribute and change only
   // the default value.
   // Note: this has to be kept up to date with Attr above.
   let storageType = attr.storageType;
   let returnType = attr.returnType;
   let convertFromStorage = attr.convertFromStorage;
-  let constBuilderCall = attr.constBuilderCall;
+  let constBuilderCall = !if(!eq(builderCall, ""), attr.constBuilderCall, builderCall);
   let defaultValue = val;
   let valueType = attr.valueType;
   let isOptional = 1;