[mlir][vector] Fold extractOp coming from broadcastOp

[ThomasRaoux]

Summary

Combine ExtractOp with scalar result with BroadcastOp source. This is useful to be able to incrementally convert degenerated vector of one element into scalar.

[aartbik]

mlir/lib/Dialect/Vector/VectorOps.cpp

817

This transformation is not correct (as written).
For example

func @fold_extract_broadcast(%arg0: vector<4xf32>) -> f32 {
  %0 = vector.broadcast %arg0 : vector<4xf32> to vector<1x2x4xf32>
  %1 = vector.extract %0[0, 1, 2] : vector<1x2x4xf32>
  return %1 : f32
}

will break. You will need to do a bit more analysis of the types (but in that case, you can probably generalize beyond scalars).

[ThomasRaoux]

Fix bug when broadcast source and vector.extract type mismatch

[ThomasRaoux]

mlir/lib/Dialect/Vector/VectorOps.cpp

817

Thanks for catching that. I missed to consider that broadcast source can be a vector. I generalized it to vector as long as the type broadcast source is the same as extract destination the transformation is correct. I added a test for the vector case and a negative test as well.

[nicolasvasilache]

mlir/lib/Dialect/Vector/VectorOps.cpp

819

Why worry about the types here?
Shouldn't you just drop the n-k first dimensions from the extract and turn it into vector.extract %a[2] : vector<4xf32> to f32?
Depending on the dimension of the extract op compared to n-k you have 3 cases.

[ThomasRaoux]

mlir/lib/Dialect/Vector/VectorOps.cpp

819

I was trying to only handle the case where the extract and broadcast cancel each other. I can handle also the case where the rank of broadcast source is greater than the rank of extract result. I don't think I can handle the case where the rank of vector result is greater than the rank of broadcast source since I would need to create a new broadcast operation, my understanding is that the fold method shouldn't create new operations?
What do you think?

[nicolasvasilache]

mlir/lib/Dialect/Vector/VectorOps.cpp

819

Right, the third case would have to be a canonicalization pattern followed by DCE (if there are no other uses).
It seems undesirable to have both a folding and a canonicalization for the overlap of the 3 cases.

I'd say let's make the folding support the 2 cases it can with a TODO that if/when we want the third we should move all this to a canonicalization pattern ?

[ThomasRaoux]

Add extract case of folding when extract result rank is smaller than broadcast source rank.

[ThomasRaoux]

mlir/lib/Dialect/Vector/VectorOps.cpp

819

Sounds good, I added the case 2 where result rank is smaller than broadcast source rank and added a TODO for the case where result rank if bigger than broadcast source rank.

[nicolasvasilache]

LGTM, thanks @ThomasRaoux !

[aartbik]

mlir/lib/Dialect/Vector/VectorOps.cpp

842

typo: broadcast

[ThomasRaoux]

Fix typo

mlir/lib/Dialect/Vector/VectorOps.cpp

while (insertOp || transposeOp) {
     // `vector.insert` / `vector.transpose`.
     // Compute insert/transpose for the next iteration.
     insertOp = insertionDest.getDefiningOp<vector::InsertOp>();
     transposeOp = insertionDest.getDefiningOp<vector::TransposeOp>();
   }
   return Value();
 }
 
+/// Fold extractOp with scalar result coming from BroadcastOp.
+static Value foldExtractFromBroadcast(ExtractOp extractOp) {
+  auto broadcastOp = extractOp.vector().getDefiningOp<vector::BroadcastOp>();
+  if (!broadcastOp || extractOp.getType() != broadcastOp.getSourceType())
+    return Value();
+  return broadcastOp.source();
+}
+
 OpFoldResult ExtractOp::fold(ArrayRef<Attribute>) {
   if (succeeded(foldExtractOpFromExtractChain(*this)))
     return getResult();
   if (succeeded(foldExtractOpFromTranspose(*this)))
     return getResult();
   if (auto val = foldExtractOpFromInsertChainAndTranspose(*this))
     return val;
+  if (auto val = foldExtractFromBroadcast(*this))
+    return val;
   return OpFoldResult();
 }
 
 //===----------------------------------------------------------------------===//
 // ExtractSlicesOp
 //===----------------------------------------------------------------------===//
 
 void ExtractSlicesOp::build(OpBuilder &builder, OperationState &result,
                             TupleType tupleType, Value vector,
                             ArrayRef<int64_t> sizes,
                             ArrayRef<int64_t> strides) {
   result.addOperands(vector);
   auto sizesAttr = getVectorSubscriptAttr(builder, sizes);
   auto stridesAttr = getVectorSubscriptAttr(builder, strides);
   result.addTypes(tupleType);
   result.addAttribute(getSizesAttrName(), sizesAttr);
   result.addAttribute(getStridesAttrName(), stridesAttr);
 }

mlir/test/Dialect/Vector/canonicalize.mlir

func @fold_extract_transpose(
   %4 = vector.transpose %b, [0, 2, 3, 1] : vector<3x6x5x6xf32> to vector<3x5x6x6xf32>
   %5 = vector.extract %4[0, 1, 2] : vector<3x5x6x6xf32>
 
   return %1, %3, %5 : vector<6xf32>, vector<6xf32>, vector<6xf32>
 }
 
 // -----
 
+// CHECK-LABEL: fold_extract_broadcast
+//  CHECK-SAME:   %[[A:.*]]: f32
+//       CHECK:   return %[[A]] : f32
+func @fold_extract_broadcast(%a : f32) -> f32 {
+  %b = vector.broadcast %a : f32 to vector<1x2x4xf32>
+  %r = vector.extract %b[0, 1, 2] : vector<1x2x4xf32>
+  return %r : f32
+}
+
+// -----
+
+// CHECK-LABEL: fold_extract_broadcast_vector
+//  CHECK-SAME:   %[[A:.*]]: vector<4xf32>
+//       CHECK:   return %[[A]] : vector<4xf32>
+func @fold_extract_broadcast_vector(%a : vector<4xf32>) -> vector<4xf32> {
+  %b = vector.broadcast %a : vector<4xf32> to vector<1x2x4xf32>
+  %r = vector.extract %b[0, 1] : vector<1x2x4xf32>
+  return %r : vector<4xf32>
+}
+
+// -----
+
+// Negative test for extract_op folding when the type of broadcast source
+// doesn't match the type of vector.extract.
+// CHECK-LABEL: fold_extract_broadcast_negative
+//       CHECK:   %[[B:.*]] = vector.broadcast %{{.*}} : vector<4xf32> to vector<1x2x4xf32>
+//       CHECK:   %[[R:.*]] = vector.extract %[[B]][0, 1, 2] : vector<1x2x4xf32>
+//       CHECK:   return %[[R]] : f32
+func @fold_extract_broadcast_negative(%a : vector<4xf32>) -> f32 {
+  %b = vector.broadcast %a : vector<4xf32> to vector<1x2x4xf32>
+  %r = vector.extract %b[0, 1, 2] : vector<1x2x4xf32>
+  return %r : f32
+}
+
+// -----
+
 // CHECK-LABEL: fold_vector_transfers
 func @fold_vector_transfers(%A: memref<?x8xf32>) -> (vector<4x8xf32>, vector<4x9xf32>) {
   %c0 = constant 0 : index
   %f0 = constant 0.0 : f32
 
   // CHECK: vector.transfer_read %{{.*}} {masked = [true, false]}
   %1 = vector.transfer_read %A[%c0, %c0], %f0 : memref<?x8xf32>, vector<4x8xf32>