fixup! fixup! fixup! fixup! [mlir][vector] Make the in_bounds attribute mandatory

Address comment from Diego and Han-Chung

Author: banach-space

mlir/include/mlir/IR/AffineMap.h

@@ -146,6 +146,14 @@ class AffineMap {
   /// affine map (d0, ..., dn) -> (dp, ..., dn) on the most minor dimensions.
   bool isMinorIdentity() const;
 
+  /// Returns the list of broadcast dimensions (i.e. dims indicated by value 0
+  /// in the result).
+  /// Ex:
+  ///  * (d0, d1, d2) -> (0, d1) gives [0]
+  ///  * (d0, d1, d2) -> (d2, d1) gives []
+  ///  * (d0, d1, d2, d4) -> (d0, 0, d1, 0) gives [1, 3]
+  SmallVector<unsigned> getBroadcastDims() const;
+
   /// Returns true if this affine map is a minor identity up to broadcasted
   /// dimensions which are indicated by value 0 in the result. If
   /// `broadcastedDims` is not null, it will be populated with the indices of
@@ -155,13 +163,6 @@ class AffineMap {
   bool isMinorIdentityWithBroadcasting(
       SmallVectorImpl<unsigned> *broadcastedDims = nullptr) const;
 
-  /// Returns the list of broadcast dimensions.
-  /// Ex:
-  ///  * (d0, d1, d2) -> (0, d1) gives [0]
-  ///  * (d0, d1, d2) -> (d2, d1) gives []
-  ///  * (d0, d1, d2, d4) -> (d0, 0, d1, 0) gives [1, 3]
-  SmallVector<unsigned> getBroadcastDims() const;
-
   /// Return true if this affine map can be converted to a minor identity with
   /// broadcast by doing a permute. Return a permutation (there may be
   /// several) to apply to get to a minor identity with broadcasts.

mlir/lib/Dialect/Affine/Transforms/SuperVectorize.cpp

@@ -1235,7 +1235,7 @@ static Operation *vectorizeAffineLoad(AffineLoadOp loadOp,
 
   auto transfer = state.builder.create<vector::TransferReadOp>(
       loadOp.getLoc(), vectorType, loadOp.getMemRef(), indices, permutationMap,
-      ArrayRef<bool>(inBounds));
+      inBounds);
 
   // Register replacement for future uses in the scope.
   state.registerOpVectorReplacement(loadOp, transfer);

mlir/lib/Dialect/Vector/IR/VectorOps.cpp

@@ -3958,7 +3958,7 @@ verifyTransferOp(VectorTransferOpInterface op, ShapedType shapedType,
                            "as permutation_map results: ")
            << AffineMapAttr::get(permutationMap)
            << " vs inBounds of size: " << inBounds.size();
-  for (unsigned int i = 0; i < permutationMap.getNumResults(); ++i)
+  for (unsigned int i = 0, e = permutationMap.getNumResults(); i < e; ++i)
     if (isa<AffineConstantExpr>(permutationMap.getResult(i)) &&
         !llvm::cast<BoolAttr>(inBounds.getValue()[i]).getValue())
       return op->emitOpError("requires broadcast dimensions to be in-bounds");

mlir/lib/IR/AffineMap.cpp

@@ -158,6 +158,19 @@ bool AffineMap::isMinorIdentity() const {
              getMinorIdentityMap(getNumDims(), getNumResults(), getContext());
 }
 
+SmallVector<unsigned> AffineMap::getBroadcastDims() const {
+  SmallVector<unsigned> broadcastedDims;
+  for (const auto &[resIdx, expr] : llvm::enumerate(getResults())) {
+    if (auto constExpr = dyn_cast<AffineConstantExpr>(expr)) {
+      if (constExpr.getValue() != 0)
+        continue;
+      broadcastedDims.push_back(resIdx);
+    }
+  }
+
+  return broadcastedDims;
+}
+
 /// Returns true if this affine map is a minor identity up to broadcasted
 /// dimensions which are indicated by value 0 in the result.
 bool AffineMap::isMinorIdentityWithBroadcasting(
@@ -187,22 +200,6 @@ bool AffineMap::isMinorIdentityWithBroadcasting(
   return true;
 }
 
-SmallVector<unsigned> AffineMap::getBroadcastDims() const {
-  SmallVector<unsigned> broadcastedDims = {};
-  for (const auto &idxAndExpr : llvm::enumerate(getResults())) {
-    unsigned resIdx = idxAndExpr.index();
-    AffineExpr expr = idxAndExpr.value();
-    if (auto constExpr = dyn_cast<AffineConstantExpr>(expr)) {
-      // Each result may be either a constant 0 (broadcasted dimension).
-      if (constExpr.getValue() != 0)
-        continue;
-      broadcastedDims.push_back(resIdx);
-    }
-  }
-
-  return broadcastedDims;
-}
-
 /// Return true if this affine map can be converted to a minor identity with
 /// broadcast by doing a permute. Return a permutation (there may be
 /// several) to apply to get to a minor identity with broadcasts.