Move logic to verifyOffsetSizeAndStrideOp

Author: rikhuijzer

mlir/include/mlir/Interfaces/ViewLikeInterface.td

@@ -56,6 +56,7 @@ def OffsetSizeAndStrideOpInterface : OpInterface<"OffsetSizeAndStrideOpInterface
          for each dynamic offset (resp. size, stride).
       5. `offsets`, `sizes` and `strides` operands are specified in this order
          at operand index starting at `getOffsetSizeAndStrideStartOperandIndex`.
+      6. `offsets` and `sizes` operands are non-negative.
 
     This interface is useful to factor out common behavior and provide support
     for carrying or injecting static behavior through the use of the static

mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp

@@ -2852,17 +2852,6 @@ static LogicalResult produceSubViewErrorMsg(SliceVerificationResult result,
 }
 
 LogicalResult SubViewOp::verify() {
-  for (int64_t offset : getStaticOffsets()) {
-    if (offset < 0 && !ShapedType::isDynamic(offset))
-      return emitError("expected subview offsets to be non-negative, but got ")
-             << offset;
-  }
-  for (int64_t size : getStaticSizes()) {
-    if (size < 0 && !ShapedType::isDynamic(size))
-      return emitError("expected subview sizes to be non-negative, but got ")
-             << size;
-  }
-
   MemRefType baseType = getSourceType();
   MemRefType subViewType = getType();
 

mlir/lib/Interfaces/ViewLikeInterface.cpp

@@ -66,6 +66,17 @@ mlir::detail::verifyOffsetSizeAndStrideOp(OffsetSizeAndStrideOpInterface op) {
   if (failed(verifyListOfOperandsOrIntegers(
           op, "stride", maxRanks[2], op.getStaticStrides(), op.getStrides())))
     return failure();
+
+  for (int64_t offset : op.getStaticOffsets()) {
+    if (offset < 0 && !ShapedType::isDynamic(offset))
+      return op->emitError("expected offsets to be non-negative, but got ")
+             << offset;
+  }
+  for (int64_t size : op.getStaticSizes()) {
+    if (size < 0 && !ShapedType::isDynamic(size))
+      return op->emitError("expected sizes to be non-negative, but got ")
+             << size;
+  }
   return success();
 }
 

mlir/test/Dialect/MemRef/invalid.mlir

@@ -612,15 +612,15 @@ func.func @invalid_view(%arg0 : index, %arg1 : index, %arg2 : index) {
 // -----
 
 func.func @invalid_subview(%input: memref<4x1024xf32>) -> memref<2x256xf32, strided<[1024, 1], offset: 2304>> {
-  // expected-error@+1 {{expected subview offsets to be non-negative, but got -1}}
+  // expected-error@+1 {{expected offsets to be non-negative, but got -1}}
   %0 = memref.subview %input[-1, 256] [2, 256] [1, 1] : memref<4x1024xf32> to memref<2x256xf32, strided<[1024, 1], offset: 2304>>
   return %0 : memref<2x256xf32, strided<[1024, 1], offset: 2304>>
 }
 
 // -----
 
 func.func @invalid_subview(%input: memref<4x1024xf32>) -> memref<2x256xf32, strided<[1024, 1], offset: 2304>> {
-  // expected-error@+1 {{expected subview sizes to be non-negative, but got -1}}
+  // expected-error@+1 {{expected sizes to be non-negative, but got -1}}
   %0 = memref.subview %input[2, 256] [-1, 256] [1, 1] : memref<4x1024xf32> to memref<2x256xf32, strided<[1024, 1], offset: 2304>>
   return %0 : memref<2x256xf32, strided<[1024, 1], offset: 2304>>
 }