[Mlir-commits] [mlir] Rename structured.{vectorize => vectorize_children}. (PR #66575)
Ingo Müller
llvmlistbot at llvm.org
Sat Sep 16 06:04:17 PDT 2023
https://github.com/ingomueller-net created https://github.com/llvm/llvm-project/pull/66575
Still work in progres. Further changes and a more detailed description will follow.
This is the rename that was discussed [here](https://reviews.llvm.org/D157774).
>From 6a80c7005cb53e2941974aa9ac06ee3562191faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20M=C3=BCller?= <ingomueller at google.com>
Date: Sat, 16 Sep 2023 13:03:02 +0000
Subject: [PATCH] Rename structured.{vectorize => vectorize_children}.
---
.../Linalg/TransformOps/LinalgTransformOps.td | 37 +++---
.../TransformOps/LinalgTransformOps.cpp | 30 ++---
.../dialects/_structured_transform_ops_ext.py | 4 +-
mlir/test/Dialect/LLVM/transform-e2e.mlir | 2 +-
.../transform-op-matmul-to-outerproduct.mlir | 2 +-
.../Linalg/transform-op-vectorize.mlir | 12 +-
mlir/test/Dialect/Linalg/vectorization.mlir | 114 +++++++++---------
.../Linalg/vectorize-tensor-extract.mlir | 24 ++--
.../Transform/selective-targeting.mlir | 6 +-
.../test/Dialect/Vector/transform-vector.mlir | 2 +-
.../dialects/transform_structured_ext.py | 4 +-
11 files changed, 120 insertions(+), 117 deletions(-)
diff --git a/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td b/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
index 74c0909ce58e88a..6bd93633aaa6d4b 100644
--- a/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
@@ -1947,37 +1947,38 @@ def TileToForallOp :
}
//===----------------------------------------------------------------------===//
-// VectorizeOp
+// VectorizeChildrenOp
//===----------------------------------------------------------------------===//
-def VectorizeOp : Op<Transform_Dialect, "structured.vectorize",
+def VectorizeChildrenOp : Op<Transform_Dialect, "structured.vectorize_children",
[FunctionalStyleTransformOpTrait, MemoryEffectsOpInterface,
TransformEachOpTrait, TransformOpInterface,
ReportTrackingListenerFailuresOpTrait]> {
let description = [{
- Indicates that the given `target` op all the ops it contains should be
- vectorized with the configuration specified by the attributes of this op.
- This vectorization only handles structured ops that operate on shaped types
- and does not vectorize loops or straight-line. Internally, it applies a
- set of rewrite patterns, some of which enable vectorization and some of
- which clean up the results. Therefore, it can only be applied to an op with
- the "isolated from above property". If finer granularity is required, it can
- be achieved by outlining the target part of the payload IR into, e.g., a
- function, performing the transformation, and inlining it back. This
- transformation only fails if the entire pattern rewriting failed, i.e., it
- does **not** fail when no ops were vectorized.
-
- Note that this transformation is invalidating the handles to any payload IR
+ Vectorizes all children contained in the given `target` using the
+ configuration specified by the attributes of this op. This only vectorizes
+ structured ops that operate on shaped types and does not vectorize loops or
+ straight-line. Internally, it applies a set of rewrite patterns, some of
+ which enable vectorization and some of which clean up the results.
+ Therefore, it can only be applied to an op with the "isolated from above"
+ property. This transformation only fails if the entire pattern rewriting
+ failed, i.e., it does **not** fail when no ops were vectorized.
+
+ Finer granularity can be achieved either with the `VectorizeOp` for
+ individual ops or by outlining the target part of the payload IR into, e.g.,
+ a function, performing this transformation, and inlining it back.
+
+ Note that this transformation invalidates the handles to any payload IR
operation that is contained inside the vectorization target.
This transformation supports the following attributes:
- - `vectorize_padding`: a UnitAttr to activate the vectorization of
+ - `vectorize_padding`: a `UnitAttr` to activate the vectorization of
`tensor.pad` ops. Different pipelines may prefer to lower such ops to
loops.
- - `disable_multi_reduction_to_contract_patterns`: a UnitAttr to deactivate
+ - `disable_multi_reduction_to_contract_patterns`: a `UnitAttr` to deactivate
the rewrite of `vector.multi_reduction` to `vector.contract`. This is
intended to be used in tests only.
- - `disable_transfer_permutation_map_lowering_patterns`: a UnitAttr to
+ - `disable_transfer_permutation_map_lowering_patterns`: a `UnitAttr` to
deactivate the rewrite of `vector.transfer` with permutation maps into
explicit `vector.transpose` operations. This is intended to be used in
tests only but may be promoted to a first class attribute in the future.
diff --git a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
index dc65ac509d280dc..f4fc35d686a023a 100644
--- a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
+++ b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp
@@ -2904,27 +2904,30 @@ LogicalResult TileToForallOp::verify() {
}
//===----------------------------------------------------------------------===//
-// VectorizeOp
+// VectorizeChildrenOp
//===----------------------------------------------------------------------===//
-void transform::VectorizeOp::build(OpBuilder &builder, OperationState &result,
- Value target, bool vectorizePadding,
- bool vectorizeExtract) {
+void transform::VectorizeChildrenOp::build(OpBuilder &builder,
+ OperationState &result, Value target,
+ bool vectorizePadding,
+ bool vectorizeExtract) {
result.addOperands(target);
if (vectorizePadding) {
- result.addAttribute(VectorizeOp::getVectorizePaddingAttrName(result.name),
- builder.getUnitAttr());
+ result.addAttribute(
+ VectorizeChildrenOp::getVectorizePaddingAttrName(result.name),
+ builder.getUnitAttr());
}
if (vectorizeExtract) {
- result.addAttribute(VectorizeOp::getVectorizeNdExtractAttrName(result.name),
- builder.getUnitAttr());
+ result.addAttribute(
+ VectorizeChildrenOp::getVectorizeNdExtractAttrName(result.name),
+ builder.getUnitAttr());
}
result.addTypes(transform::AnyOpType::get(builder.getContext()));
}
namespace {
/// This is an helper only to call vectorize via a pattern inside of
-/// VectorizeOp::applyToOne.
+/// VectorizeChildrenOp::applyToOne.
struct VectorizationPattern : public RewritePattern {
explicit VectorizationPattern(MLIRContext *context,
bool vectorizeExtract = false)
@@ -2946,11 +2949,10 @@ struct VectorizationPattern : public RewritePattern {
};
} // namespace
-DiagnosedSilenceableFailure
-transform::VectorizeOp::applyToOne(transform::TransformRewriter &rewriter,
- Operation *target,
- transform::ApplyToEachResultList &results,
- transform::TransformState &state) {
+DiagnosedSilenceableFailure transform::VectorizeChildrenOp::applyToOne(
+ transform::TransformRewriter &rewriter, Operation *target,
+ transform::ApplyToEachResultList &results,
+ transform::TransformState &state) {
if (!target->hasTrait<OpTrait::IsIsolatedFromAbove>()) {
auto diag = this->emitOpError("requires isolated-from-above targets");
diag.attachNote(target->getLoc()) << "non-isolated target";
diff --git a/mlir/python/mlir/dialects/_structured_transform_ops_ext.py b/mlir/python/mlir/dialects/_structured_transform_ops_ext.py
index c5134b6e718f3b8..911d46d24991522 100644
--- a/mlir/python/mlir/dialects/_structured_transform_ops_ext.py
+++ b/mlir/python/mlir/dialects/_structured_transform_ops_ext.py
@@ -724,8 +724,8 @@ def __init__(
)
-class VectorizeOp:
- """Specialization for VectorizeOp class."""
+class VectorizeChildrenOp:
+ """Specialization for VectorizeChildrenOp class."""
def __init__(
self,
diff --git a/mlir/test/Dialect/LLVM/transform-e2e.mlir b/mlir/test/Dialect/LLVM/transform-e2e.mlir
index 2cb753a3d7fb8f3..a976036fd71ceee 100644
--- a/mlir/test/Dialect/LLVM/transform-e2e.mlir
+++ b/mlir/test/Dialect/LLVM/transform-e2e.mlir
@@ -17,7 +17,7 @@ transform.sequence failures(propagate) {
%0 = transform.structured.match ops{["linalg.matmul"]} in %module_op : (!transform.any_op) -> !transform.any_op
%1, %loops:3 = transform.structured.tile %0 [2, 2, 2] : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op, !transform.any_op)
%2 = get_parent_op %1 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- transform.structured.vectorize %2 : (!transform.any_op) -> !transform.any_op
+ transform.structured.vectorize_children %2 : (!transform.any_op) -> !transform.any_op
%b = transform.bufferization.one_shot_bufferize layout{IdentityLayoutMap}
%module_op {bufferize_function_boundaries = true}
: (!transform.any_op) -> !transform.any_op
diff --git a/mlir/test/Dialect/Linalg/transform-op-matmul-to-outerproduct.mlir b/mlir/test/Dialect/Linalg/transform-op-matmul-to-outerproduct.mlir
index ea84b6b7587687a..4227b860e74f73c 100644
--- a/mlir/test/Dialect/Linalg/transform-op-matmul-to-outerproduct.mlir
+++ b/mlir/test/Dialect/Linalg/transform-op-matmul-to-outerproduct.mlir
@@ -31,7 +31,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
transform.apply_patterns to %2 {
transform.apply_patterns.vector.lower_contraction lowering_strategy = "outerproduct"
} : !transform.any_op
diff --git a/mlir/test/Dialect/Linalg/transform-op-vectorize.mlir b/mlir/test/Dialect/Linalg/transform-op-vectorize.mlir
index b335a65250d93e6..ef318d0bb32993a 100644
--- a/mlir/test/Dialect/Linalg/transform-op-vectorize.mlir
+++ b/mlir/test/Dialect/Linalg/transform-op-vectorize.mlir
@@ -20,7 +20,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -45,7 +45,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -65,7 +65,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.copy"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -111,7 +111,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -159,7 +159,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 {vectorize_padding} : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 {vectorize_padding} : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -176,5 +176,5 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
// expected-error @below {{op requires isolated-from-above targets}}
- %2 = transform.structured.vectorize %0 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %0 : (!transform.any_op) -> !transform.any_op
}
diff --git a/mlir/test/Dialect/Linalg/vectorization.mlir b/mlir/test/Dialect/Linalg/vectorization.mlir
index a5ec058b6e02c9c..b6dd0cff8452fd2 100644
--- a/mlir/test/Dialect/Linalg/vectorization.mlir
+++ b/mlir/test/Dialect/Linalg/vectorization.mlir
@@ -32,7 +32,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matvec"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -50,7 +50,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -69,7 +69,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.batch_matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -109,7 +109,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -149,7 +149,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -176,7 +176,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -216,7 +216,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -236,7 +236,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -260,7 +260,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -284,7 +284,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -329,7 +329,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -346,7 +346,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.fill"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -364,7 +364,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.fill"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -381,7 +381,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["memref.copy"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -401,7 +401,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["memref.copy"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -417,7 +417,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["memref.copy"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -445,7 +445,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -474,7 +474,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -559,7 +559,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -650,7 +650,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -694,7 +694,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -737,7 +737,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -769,7 +769,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.matmul"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -798,7 +798,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -827,7 +827,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
@@ -864,7 +864,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -884,7 +884,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -914,7 +914,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -947,7 +947,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
@@ -984,7 +984,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
@@ -1018,7 +1018,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
@@ -1046,7 +1046,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1083,7 +1083,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1118,7 +1118,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1163,7 +1163,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1193,7 +1193,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1224,7 +1224,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1254,7 +1254,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1284,7 +1284,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1314,7 +1314,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1344,7 +1344,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1378,7 +1378,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1416,11 +1416,11 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.fill"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1463,7 +1463,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
@@ -1494,7 +1494,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1533,7 +1533,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { disable_multi_reduction_to_contract_patterns, disable_transfer_permutation_map_lowering_patterns } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1557,7 +1557,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.map"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1576,7 +1576,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.transpose"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1599,13 +1599,13 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.reduce"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
// This is a regression test. This IR cannot be vectorized, but
-// structured.vectorize should nevertheless succeed. : (!transform.any_op) -> !transform.any_op
+// structured.vectorize_children should nevertheless succeed.
#map = affine_map<(d0) -> (d0)>
// CHECK-LABEL: @not_vectorizable
@@ -1631,7 +1631,7 @@ func.func @not_vectorizable(%arg0: tensor<1x?xf32>, %arg1: index, %arg2: index,
transform.sequence failures(propagate) {
^bb0(%arg0: !transform.any_op):
%0 = transform.structured.match ops{["func.func"]} in %arg0 : (!transform.any_op) -> !transform.any_op
- %1 = transform.structured.vectorize %0 : (!transform.any_op) -> !transform.any_op
+ %1 = transform.structured.vectorize_children %0 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1666,7 +1666,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// CHECK-LABEL: @wrong_reduction_detection
@@ -1695,7 +1695,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1716,7 +1716,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["tensor.pad"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_padding } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -1738,7 +1738,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// CHECK-LABEL: func @zero_dim_tensor
@@ -1775,7 +1775,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%3 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%4 = get_parent_op %3 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %5 = transform.structured.vectorize %4 : (!transform.any_op) -> !transform.any_op
+ %5 = transform.structured.vectorize_children %4 : (!transform.any_op) -> !transform.any_op
}
// CHECK-LABEL: func @multi_output_generic_different_perm_maps
diff --git a/mlir/test/Dialect/Linalg/vectorize-tensor-extract.mlir b/mlir/test/Dialect/Linalg/vectorize-tensor-extract.mlir
index 84e36c8912c6501..8cd1fb7685bb917 100644
--- a/mlir/test/Dialect/Linalg/vectorize-tensor-extract.mlir
+++ b/mlir/test/Dialect/Linalg/vectorize-tensor-extract.mlir
@@ -31,7 +31,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -104,7 +104,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -156,7 +156,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -204,7 +204,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -248,7 +248,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -290,7 +290,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -332,7 +332,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -376,7 +376,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -416,7 +416,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -456,7 +456,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -495,7 +495,7 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
// -----
@@ -522,5 +522,5 @@ transform.sequence failures(propagate) {
^bb1(%arg1: !transform.any_op):
%0 = transform.structured.match ops{["linalg.generic"]} in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- %2 = transform.structured.vectorize %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
+ %2 = transform.structured.vectorize_children %1 { vectorize_nd_extract } : (!transform.any_op) -> !transform.any_op
}
diff --git a/mlir/test/Dialect/Transform/selective-targeting.mlir b/mlir/test/Dialect/Transform/selective-targeting.mlir
index 5bf47fd75d3d200..98c91e2267f9a83 100644
--- a/mlir/test/Dialect/Transform/selective-targeting.mlir
+++ b/mlir/test/Dialect/Transform/selective-targeting.mlir
@@ -80,7 +80,7 @@ transform.with_pdl_patterns {
transform.structured.tile %0 [4, 4, 4] : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op, !transform.any_op)
%1 = pdl_match @pdl_target_attrC in %arg1 : (!transform.any_op) -> !transform.any_op
%2 = get_parent_op %1 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- transform.structured.vectorize %2 : (!transform.any_op) -> !transform.any_op
+ transform.structured.vectorize_children %2 : (!transform.any_op) -> !transform.any_op
}
}
@@ -125,7 +125,7 @@ transform.with_pdl_patterns {
^bb1(%arg1: !transform.any_op):
%0 = pdl_match @pdl_target in %arg1 : (!transform.any_op) -> !transform.any_op
%1 = get_parent_op %0 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- transform.structured.vectorize %1 : (!transform.any_op) -> !transform.any_op
+ transform.structured.vectorize_children %1 : (!transform.any_op) -> !transform.any_op
}
}
@@ -150,5 +150,5 @@ func.func @vectorize_all(
transform.sequence failures(propagate) {
^bb0(%arg0: !transform.any_op):
- transform.structured.vectorize %arg0 : (!transform.any_op) -> !transform.any_op
+ transform.structured.vectorize_children %arg0 : (!transform.any_op) -> !transform.any_op
}
diff --git a/mlir/test/Dialect/Vector/transform-vector.mlir b/mlir/test/Dialect/Vector/transform-vector.mlir
index 3e62a8fbf718f92..b5cb3c7249d5088 100644
--- a/mlir/test/Dialect/Vector/transform-vector.mlir
+++ b/mlir/test/Dialect/Vector/transform-vector.mlir
@@ -19,7 +19,7 @@ transform.sequence failures(propagate) {
%1, %loops:3 = transform.structured.tile %0 [8, 4, 2]
: (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op, !transform.any_op)
%2 = get_parent_op %1 {isolated_from_above} : (!transform.any_op) -> !transform.any_op
- transform.structured.vectorize %2 : (!transform.any_op) -> !transform.any_op
+ transform.structured.vectorize_children %2 : (!transform.any_op) -> !transform.any_op
%b = transform.bufferization.one_shot_bufferize
layout{IdentityLayoutMap} %module_op
{bufferize_function_boundaries = true, allow_return_allocs = true}
diff --git a/mlir/test/python/dialects/transform_structured_ext.py b/mlir/test/python/dialects/transform_structured_ext.py
index 5d5ee945b66867e..db9e9209dfff87e 100644
--- a/mlir/test/python/dialects/transform_structured_ext.py
+++ b/mlir/test/python/dialects/transform_structured_ext.py
@@ -488,7 +488,7 @@ def testTileToForallMapping(target):
@run
@create_sequence
def testVectorizeAllAttrs(target):
- structured.VectorizeOp(
+ structured.VectorizeChildrenOp(
target,
disable_multi_reduction_to_contract_patterns=True,
disable_transfer_permutation_map_lowering_patterns=True,
@@ -507,7 +507,7 @@ def testVectorizeAllAttrs(target):
@run
@create_sequence
def testVectorizeNoAttrs(target):
- structured.VectorizeOp(
+ structured.VectorizeChildrenOp(
target,
disable_multi_reduction_to_contract_patterns=False,
disable_transfer_permutation_map_lowering_patterns=False,
More information about the Mlir-commits
mailing list