Review comments, fix typos in tests

Author: krzysz00

mlir/lib/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.cpp

@@ -106,19 +106,17 @@ struct AffineDelinearizeIndexOpInterface
 
     SmallVector<OpFoldResult> basis = op.getPaddedBasis();
     AffineExpr divisor = cstr.getExpr(1);
-    for (OpFoldResult basisElem :
-         ArrayRef<OpFoldResult>(basis).drop_front(resIdx + 1))
+    for (OpFoldResult basisElem : llvm::drop_begin(basis, resIdx + 1))
       divisor = divisor * cstr.getExpr(basisElem);
 
-    auto resBound = cstr.bound(result);
     if (resIdx == 0) {
-      resBound == linearIdx.floorDiv(divisor);
+      cstr.bound(value) == linearIdx.floorDiv(divisor);
       if (!basis.front().isNull())
-        resBound < cstr.getExpr(basis.front());
+        cstr.bound(value) < cstr.getExpr(basis.front());
       return;
     }
     AffineExpr thisBasis = cstr.getExpr(basis[resIdx]);
-    resBound == (linearIdx % (thisBasis * divisor)).floorDiv(divisor);
+    cstr.bound(value) == (linearIdx % (thisBasis * divisor)).floorDiv(divisor);
   }
 };
 
@@ -135,19 +133,19 @@ struct AffineLinearizeIndexOpInterface
     AffineExpr stride = cstr.getExpr(1);
     SmallVector<OpFoldResult> basis = op.getPaddedBasis();
     OperandRange multiIndex = op.getMultiIndex();
+    unsigned numArgs = multiIndex.size();
     for (auto [revArgNum, length] : llvm::enumerate(llvm::reverse(basis))) {
-      unsigned argNum = multiIndex.size() - (revArgNum + 1);
+      unsigned argNum = numArgs - (revArgNum + 1);
       if (argNum == 0)
         break;
       OpFoldResult indexAsFoldRes = getAsOpFoldResult(multiIndex[argNum]);
       bound = bound + cstr.getExpr(indexAsFoldRes) * stride;
       stride = stride * cstr.getExpr(length);
     }
     bound = bound + cstr.getExpr(op.getMultiIndex().front()) * stride;
-    auto resBound = cstr.bound(value);
-    resBound == bound;
+    cstr.bound(value) == bound;
     if (op.getDisjoint() && !basis.front().isNull()) {
-      resBound <= stride *cstr.getExpr(basis.front());
+      cstr.bound(value) < stride *cstr.getExpr(basis.front());
     }
   }
 };

mlir/test/Dialect/Affine/value-bounds-op-interface-impl.mlir

@@ -163,8 +163,8 @@ func.func @compare_maps(%a: index, %b: index) {
 // CHECK-DAG: #[[$map3:.+]] = affine_map<()[s0] -> (s0 mod 5)>
 // CHECK-LABEL: func.func @delinearize_static
 // CHECK-SAME: (%[[arg0:.+]]: index)
-// CHECK-DAG: %[[v1:.+]] = affine.apply #[[$map1]](}[%[[arg0]]]
-// CHECK-DAG: %[[v2:.+]] = affine.apply #[[$map2]](}[%[[arg0]]]
+// CHECK-DAG: %[[v1:.+]] = affine.apply #[[$map1]]()[%[[arg0]]]
+// CHECK-DAG: %[[v2:.+]] = affine.apply #[[$map2]]()[%[[arg0]]]
 // CHECK-DAG: %[[v3:.+]] = affine.apply #[[$map3]]()[%[[arg0]]]
 // CHECK: return %[[v1]], %[[v2]], %[[v3]]
 func.func @delinearize_static(%arg0: index) -> (index, index, index) {
@@ -174,7 +174,31 @@ func.func @delinearize_static(%arg0: index) -> (index, index, index) {
   %1 = "test.reify_bound"(%0#0) {type = "EQ"} : (index) -> (index)
   %2 = "test.reify_bound"(%0#1) {type = "EQ"} : (index) -> (index)
   %3 = "test.reify_bound"(%0#2) {type = "EQ"} : (index) -> (index)
-  // TODO: why doesn't this return true? I'm setting the bound.
+  // expected-remark @below{{true}}
+  "test.compare"(%0#0, %c2) {cmp = "LT"} : (index, index) -> ()
+  // expected-remark @below{{true}}
+  "test.compare"(%0#1, %c3) {cmp = "LT"} : (index, index) -> ()
+  return %1, %2, %3 : index, index, index
+}
+
+// -----
+
+// CHECK-DAG: #[[$map1:.+]] = affine_map<()[s0] -> (s0 floordiv 15)>
+// CHECK-DAG: #[[$map2:.+]] = affine_map<()[s0] -> ((s0 mod 15) floordiv 5)>
+// CHECK-DAG: #[[$map3:.+]] = affine_map<()[s0] -> (s0 mod 5)>
+// CHECK-LABEL: func.func @delinearize_static_no_outer_bound
+// CHECK-SAME: (%[[arg0:.+]]: index)
+// CHECK-DAG: %[[v1:.+]] = affine.apply #[[$map1]]()[%[[arg0]]]
+// CHECK-DAG: %[[v2:.+]] = affine.apply #[[$map2]]()[%[[arg0]]]
+// CHECK-DAG: %[[v3:.+]] = affine.apply #[[$map3]]()[%[[arg0]]]
+// CHECK: return %[[v1]], %[[v2]], %[[v3]]
+func.func @delinearize_static_no_outer_bound(%arg0: index) -> (index, index, index) {
+  %c2 = arith.constant 2 : index
+  %c3 = arith.constant 3 : index
+  %0:3 = affine.delinearize_index %arg0 into (3, 5) : index, index, index
+  %1 = "test.reify_bound"(%0#0) {type = "EQ"} : (index) -> (index)
+  %2 = "test.reify_bound"(%0#1) {type = "EQ"} : (index) -> (index)
+  %3 = "test.reify_bound"(%0#2) {type = "EQ"} : (index) -> (index)
   "test.compaare"(%0#0, %c2) {cmp = "LT"} : (index, index) -> ()
   // expected-remark @below{{true}}
   "test.compare"(%0#1, %c3) {cmp = "LT"} : (index, index) -> ()
@@ -186,10 +210,29 @@ func.func @delinearize_static(%arg0: index) -> (index, index, index) {
 // CHECK: #[[$map:.+]] = affine_map<()[s0, s1] -> (s0 + s1 * 3)>
 // CHECK-LABEL: func.func @linearize_static
 // CHECK-SAME: (%[[arg0:.+]]: index, %[[arg1:.+]]: index)
-// CHECK: %[[v1:.+]] = affine.apply #[[$map]]()[%[[arg0]], %[[arg1]]]
+// CHECK: %[[v1:.+]] = affine.apply #[[$map]]()[%[[arg1]], %[[arg0]]]
 // CHECK: return %[[v1]]
 func.func @linearize_static(%arg0: index, %arg1: index)  -> index {
+  %c6 = arith.constant 6 : index
   %0 = affine.linearize_index disjoint [%arg0, %arg1] by (2, 3) : index
   %1 = "test.reify_bound"(%0) {type = "EQ"} : (index) -> (index)
+  // expected-remark @below{{true}}
+  "test.compare"(%0, %c6) {cmp = "LT"} : (index, index) -> ()
+  return %1 : index
+}
+
+// -----
+
+// CHECK: #[[$map:.+]] = affine_map<()[s0, s1] -> (s0 + s1 * 3)>
+// CHECK-LABEL: func.func @linearize_static_no_outer_bound
+// CHECK-SAME: (%[[arg0:.+]]: index, %[[arg1:.+]]: index)
+// CHECK: %[[v1:.+]] = affine.apply #[[$map]]()[%[[arg1]], %[[arg0]]]
+// CHECK: return %[[v1]]
+func.func @linearize_static_no_outer_bound(%arg0: index, %arg1: index)  -> index {
+  %c6 = arith.constant 6 : index
+  %0 = affine.linearize_index disjoint [%arg0, %arg1] by (3) : index
+  %1 = "test.reify_bound"(%0) {type = "EQ"} : (index) -> (index)
+  // expected-error @below{{unknown}}
+  "test.compare"(%0, %c6) {cmp = "LT"} : (index, index) -> ()
   return %1 : index
 }