Changes:

* Use OptionalTypesMatchWith
* Add constraint to verify both padding and mask are specified, as well
  as test.

Author: c-rhodes

mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td

@@ -233,21 +233,23 @@ def ZeroOp : ArmSME_Op<"zero", [Pure]> {
 
 def TileLoadOp : ArmSME_Op<"tile_load", [
   AttrSizedOperandSegments,
-  TypesMatchWith<
-    "padding type matches element type of result (if present)",
+  OptionalTypesMatchWith<
+    "padding type matches element type of result",
     "result", "padding",
-    "::llvm::cast<VectorType>($_self).getElementType()",
-    "!getPadding() || std::equal_to<>()"
+    "::llvm::cast<VectorType>($_self).getElementType()"
   >,
-  TypesMatchWith<
-    "mask has i1 element type and same shape as result (if present)",
+  OptionalTypesMatchWith<
+    "mask has i1 element type and same shape as result",
     "result", "mask",
     "VectorType("
       "VectorType::Builder("
         "::llvm::cast<mlir::VectorType>($_self)"
-      ").setElementType(IntegerType::get($_self.getContext(), 1)))",
-    "!getMask() || std::equal_to<>()"
-  >
+      ").setElementType(IntegerType::get($_self.getContext(), 1)))"
+  >,
+  PredOpTrait<
+    "both `padding` and `mask` should be provided or neither",
+    CPred<"bool(getPadding()) == bool(getMask())">
+  >,
 ]> {
   let summary = "Tile load operation";
   let description = [{

mlir/test/Dialect/ArmSME/invalid.mlir

@@ -141,3 +141,12 @@ func.func @arm_sme_tile_load__bad_mask_type(%src : memref<?x?xf64>, %pad : f64,
   %tile = arm_sme.tile_load %src[%c0, %c0], %pad, %mask : memref<?x?xf64>, vector<[2]x[2]xf64>
   return
 }
+
+// -----
+
+func.func @arm_sme_tile_load__pad_but_no_mask(%src : memref<?x?xf64>, %pad : f64) {
+  %c0 = arith.constant 0 : index
+  // expected-error@+1 {{op failed to verify that both `padding` and `mask` should be provided or neither}}
+  %tile = arm_sme.tile_load %src[%c0, %c0], %pad, : memref<?x?xf64>, vector<[2]x[2]xf64>
+  return
+}