[Mlir-commits] [mlir] [MLIR][Vector]Generalize DropUnitDimFromElementwiseOps (PR #92934)
Hugo Trachino
llvmlistbot at llvm.org
Fri May 31 04:06:29 PDT 2024
https://github.com/nujaa updated https://github.com/llvm/llvm-project/pull/92934
>From 7515bbeb76377f0e2202ce6cbe96687c720c415e Mon Sep 17 00:00:00 2001
From: Hugo <hugo.trachino at huawei.com>
Date: Wed, 8 May 2024 23:02:44 +0800
Subject: [PATCH 1/7] [MLIR][Vector]Generalize DropUnitDimFromElementwiseOps
---
.../Vector/Transforms/VectorTransforms.cpp | 55 +++++++++++--------
.../Vector/vector-transfer-flatten.mlir | 20 +++++++
2 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
index f29eba90c3ceb..364b9ff3e5483 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
@@ -1607,7 +1607,24 @@ struct ChainedReduction final : OpRewritePattern<vector::ReductionOp> {
}
};
-/// For vectors with either leading or trailing unit dim, replaces:
+FailureOr<VectorType> dropNonScalableUnitDimType(VectorType VT) {
+ VectorType newVT = VT;
+ int removed = 0;
+ auto shape = VT.getShape();
+ for (unsigned i = 0; i < shape.size(); i++) {
+ if (shape[i] == 1 && !VT.getScalableDims()[i]) {
+ newVT = VectorType::Builder(newVT).dropDim(i - removed);
+ removed++;
+ }
+ }
+
+ if (removed == 0)
+ return failure();
+ return newVT;
+}
+
+
+/// For vectors with at least an unit dim, replaces:
/// elementwise(a, b)
/// with:
/// sc_a = shape_cast(a)
@@ -1641,7 +1658,9 @@ struct DropUnitDimFromElementwiseOps final
using OpTraitRewritePattern::OpTraitRewritePattern;
LogicalResult matchAndRewrite(Operation *op,
PatternRewriter &rewriter) const override {
- if (op->getNumResults() != 1 || op->getNumRegions() != 0)
+ if (op->getNumResults() != 1)
+ return failure();
+ if (op->getNumRegions() != 0)
return failure();
auto resultVectorType = dyn_cast<VectorType>(op->getResult(0).getType());
@@ -1652,42 +1671,30 @@ struct DropUnitDimFromElementwiseOps final
// guaranteed to have identical shapes (with some exceptions such as
// `arith.select`) and it suffices to only check one of them.
auto sourceVectorType = dyn_cast<VectorType>(op->getOperand(0).getType());
- if (!sourceVectorType)
- return failure();
- if (sourceVectorType.getRank() < 2)
- return failure();
-
- bool hasTrailingDimUnitFixed =
- ((sourceVectorType.getShape().back() == 1) &&
- (!sourceVectorType.getScalableDims().back()));
- bool hasLeadingDimUnitFixed =
- ((sourceVectorType.getShape().front() == 1) &&
- (!sourceVectorType.getScalableDims().front()));
- if (!hasLeadingDimUnitFixed && !hasTrailingDimUnitFixed)
+ if (!sourceVectorType || sourceVectorType.getRank() < 2)
return failure();
- // Drop leading/trailing unit dim by applying vector.shape_cast to all
- // operands
- int64_t dim = hasLeadingDimUnitFixed ? 0 : sourceVectorType.getRank() - 1;
-
SmallVector<Value> newOperands;
auto loc = op->getLoc();
for (auto operand : op->getOperands()) {
auto opVectorType = cast<VectorType>(operand.getType());
- VectorType newVType = VectorType::Builder(opVectorType).dropDim(dim);
- auto opSC = rewriter.create<vector::ShapeCastOp>(loc, newVType, operand);
+ auto newVType = dropNonScalableUnitDimType(opVectorType);
+ if (failed(newVType)) {
+ return failure();
+ }
+ auto opSC =
+ rewriter.create<vector::ShapeCastOp>(loc, newVType.value(), operand);
newOperands.push_back(opSC);
}
VectorType newResultVectorType =
- VectorType::Builder(resultVectorType).dropDim(dim);
- // Create an updated elementwise Op without leading/trailing unit dim
+ dropNonScalableUnitDimType(resultVectorType).value();
+ // Create an updated elementwise Op without unit dim
Operation *elementwiseOp =
rewriter.create(loc, op->getName().getIdentifier(), newOperands,
newResultVectorType, op->getAttrs());
- // Restore the leading/trailing unit dim by applying vector.shape_cast
- // to the result
+ // Restore the unit dim by applying vector.shape_cast to the result
rewriter.replaceOpWithNewOp<ShapeCastOp>(op, resultVectorType,
elementwiseOp->getResult(0));
diff --git a/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir b/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
index 788ae9ac044ed..03c19742355bf 100644
--- a/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
+++ b/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
@@ -459,6 +459,26 @@ func.func @fold_unit_dims_entirely(%arg0 : vector<8xi32>,
// CHECK-128B-LABEL: func @fold_unit_dims_entirely(
// CHECK-128B-NOT: memref.collapse_shape
+// -----
+
+func.func @fold_unit_center_dim_scalable(%arg0 : vector<8x1x[1]xf128>,
+ %arg1 : vector<1x8x[1]xf128>) -> vector<8x[1]xf128> {
+ %sc_arg1 = vector.shape_cast %arg1 : vector<1x8x[1]xf128> to vector<8x1x[1]xf128>
+ %add = arith.mulf %arg0, %sc_arg1 : vector<8x1x[1]xf128>
+ %res = vector.shape_cast %add : vector<8x1x[1]xf128> to vector<8x[1]xf128>
+ return %res : vector<8x[1]xf128>
+}
+
+// CHECK-LABEL: func.func @fold_unit_center_dim_scalable(
+// CHECK-SAME: %[[VAL_0:.*]]: vector<8x1x[1]xf128>,
+// CHECK-SAME: %[[VAL_1:.*]]: vector<1x8x[1]xf128>) -> vector<8x[1]xf128> {
+// CHECK: %[[VAL_2:.*]] = vector.shape_cast %[[VAL_0]] : vector<8x1x[1]xf128> to vector<8x[1]xf128>
+// CHECK: %[[VAL_3:.*]] = vector.shape_cast %[[VAL_1]] : vector<1x8x[1]xf128> to vector<8x[1]xf128>
+// CHECK: %[[VAL_4:.*]] = arith.mulf %[[VAL_2]], %[[VAL_3]] : vector<8x[1]xf128>
+// CHECK: return %[[VAL_4]] : vector<8x[1]xf128>
+
+
+
// -----
>From 8f8c8adf48bfad6cdc726aa163b91c6dda842bfb Mon Sep 17 00:00:00 2001
From: Hugo Trachino <hugo.trachino at huawei.com>
Date: Tue, 21 May 2024 17:55:23 +0100
Subject: [PATCH 2/7] remove unrelated change.
---
mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
index 364b9ff3e5483..e772d4bbea311 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
@@ -1623,7 +1623,6 @@ FailureOr<VectorType> dropNonScalableUnitDimType(VectorType VT) {
return newVT;
}
-
/// For vectors with at least an unit dim, replaces:
/// elementwise(a, b)
/// with:
@@ -1658,9 +1657,7 @@ struct DropUnitDimFromElementwiseOps final
using OpTraitRewritePattern::OpTraitRewritePattern;
LogicalResult matchAndRewrite(Operation *op,
PatternRewriter &rewriter) const override {
- if (op->getNumResults() != 1)
- return failure();
- if (op->getNumRegions() != 0)
+ if (op->getNumResults() != 1 || op->getNumRegions() != 0)
return failure();
auto resultVectorType = dyn_cast<VectorType>(op->getResult(0).getType());
>From 9137557a5db580975cdfcad10cad3d9b94df7fd6 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.trachino at huawei.com>
Date: Wed, 22 May 2024 16:27:31 +0800
Subject: [PATCH 3/7] Fixup hoist VT builder.
---
mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
index e772d4bbea311..cf08791498109 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
@@ -1611,9 +1611,10 @@ FailureOr<VectorType> dropNonScalableUnitDimType(VectorType VT) {
VectorType newVT = VT;
int removed = 0;
auto shape = VT.getShape();
+ auto builder = VectorType::Builder(newVT);
for (unsigned i = 0; i < shape.size(); i++) {
if (shape[i] == 1 && !VT.getScalableDims()[i]) {
- newVT = VectorType::Builder(newVT).dropDim(i - removed);
+ newVT = builder.dropDim(i - removed);
removed++;
}
}
>From 4b3255ce31590242d30b443746e21707ed0834c1 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.trachino at huawei.com>
Date: Wed, 22 May 2024 17:29:27 +0800
Subject: [PATCH 4/7] Hoist VT builder properly.
---
mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
index cf08791498109..bdff1ba3b3907 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
@@ -1608,20 +1608,19 @@ struct ChainedReduction final : OpRewritePattern<vector::ReductionOp> {
};
FailureOr<VectorType> dropNonScalableUnitDimType(VectorType VT) {
- VectorType newVT = VT;
int removed = 0;
auto shape = VT.getShape();
- auto builder = VectorType::Builder(newVT);
+ auto builder = VectorType::Builder(VT);
for (unsigned i = 0; i < shape.size(); i++) {
if (shape[i] == 1 && !VT.getScalableDims()[i]) {
- newVT = builder.dropDim(i - removed);
+ builder.dropDim(i - removed);
removed++;
}
}
if (removed == 0)
return failure();
- return newVT;
+ return VectorType(builder);
}
/// For vectors with at least an unit dim, replaces:
>From 4848bd4239a97eddb1228568b57b24d022132e2c Mon Sep 17 00:00:00 2001
From: Hugo Trachino <hugo.trachino at huawei.com>
Date: Thu, 23 May 2024 09:37:24 +0100
Subject: [PATCH 5/7] Refactor tests
Rename test functions. Add scalable specific test.
---
.../Vector/vector-transfer-flatten.mlir | 41 +++++++++++++------
1 file changed, 28 insertions(+), 13 deletions(-)
diff --git a/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir b/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
index 03c19742355bf..6931306a92258 100644
--- a/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
+++ b/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
@@ -461,24 +461,39 @@ func.func @fold_unit_dims_entirely(%arg0 : vector<8xi32>,
// -----
-func.func @fold_unit_center_dim_scalable(%arg0 : vector<8x1x[1]xf128>,
- %arg1 : vector<1x8x[1]xf128>) -> vector<8x[1]xf128> {
- %sc_arg1 = vector.shape_cast %arg1 : vector<1x8x[1]xf128> to vector<8x1x[1]xf128>
- %add = arith.mulf %arg0, %sc_arg1 : vector<8x1x[1]xf128>
- %res = vector.shape_cast %add : vector<8x1x[1]xf128> to vector<8x[1]xf128>
- return %res : vector<8x[1]xf128>
+func.func @fold_unit_inner_dim(%arg0 : vector<8x1x3xf128>,
+ %arg1 : vector<1x8x3xf128>) -> vector<8x3xf128> {
+ %sc_arg1 = vector.shape_cast %arg1 : vector<1x8x3xf128> to vector<8x1x3xf128>
+ %mul = arith.mulf %arg0, %sc_arg1 : vector<8x1x3xf128>
+ %res = vector.shape_cast %mul : vector<8x1x3xf128> to vector<8x3xf128>
+ return %res : vector<8x3xf128>
}
-// CHECK-LABEL: func.func @fold_unit_center_dim_scalable(
-// CHECK-SAME: %[[VAL_0:.*]]: vector<8x1x[1]xf128>,
-// CHECK-SAME: %[[VAL_1:.*]]: vector<1x8x[1]xf128>) -> vector<8x[1]xf128> {
-// CHECK: %[[VAL_2:.*]] = vector.shape_cast %[[VAL_0]] : vector<8x1x[1]xf128> to vector<8x[1]xf128>
-// CHECK: %[[VAL_3:.*]] = vector.shape_cast %[[VAL_1]] : vector<1x8x[1]xf128> to vector<8x[1]xf128>
-// CHECK: %[[VAL_4:.*]] = arith.mulf %[[VAL_2]], %[[VAL_3]] : vector<8x[1]xf128>
-// CHECK: return %[[VAL_4]] : vector<8x[1]xf128>
+// CHECK-LABEL: func.func @fold_unit_inner_dim(
+// CHECK-SAME: %[[VAL_0:.*]]: vector<8x1x3xf128>,
+// CHECK-SAME: %[[VAL_1:.*]]: vector<1x8x3xf128>) -> vector<8xxf128> {
+// CHECK: %[[VAL_2:.*]] = vector.shape_cast %[[VAL_0]] : vector<8x1x3xf128> to vector<8x3xf128>
+// CHECK: %[[VAL_3:.*]] = vector.shape_cast %[[VAL_1]] : vector<1x8x3xf128> to vector<8x3xf128>
+// CHECK: %[[VAL_4:.*]] = arith.mulf %[[VAL_2]], %[[VAL_3]] : vector<8x3xf128>
+// CHECK: return %[[VAL_4]] : vector<8x3xf128>
+// -----
+func.func @fold_unit_inner_dim_scalable(%arg0 : vector<8x1x[1]x3xf128>,
+ %arg1 : vector<1x8x[1]x3xf128>) -> vector<8x[1]x3xf128> {
+ %sc_arg1 = vector.shape_cast %arg1 : vector<1x8x[1]x3xf128> to vector<8x1x[1]x3xf128>
+ %mul = arith.mulf %arg0, %sc_arg1 : vector<8x1x[1]x3xf128>
+ %res = vector.shape_cast %add : vector<8x1x[1]x3xf128> to vector<8x[1]x3xf128>
+ return %mul : vector<8x[1]x3xf128>
+}
+// CHECK-LABEL: func.func @fold_unit_inner_dim_scalable(
+// CHECK-SAME: %[[VAL_0:.*]]: vector<8x1x[1]x3xf128>,
+// CHECK-SAME: %[[VAL_1:.*]]: vector<1x8x[1]x3xf128>) -> vector<8x[1]x3xf128> {
+// CHECK: %[[VAL_2:.*]] = vector.shape_cast %[[VAL_0]] : vector<8x1x[1]x3xf128> to vector<8x[1]x3xf128>
+// CHECK: %[[VAL_3:.*]] = vector.shape_cast %[[VAL_1]] : vector<1x8x[1]x3xf128> to vector<8x[1]x3xf128>
+// CHECK: %[[VAL_4:.*]] = arith.mulf %[[VAL_2]], %[[VAL_3]] : vector<8x[1]x3xf128>
+// CHECK: return %[[VAL_4]] : vector<8x[1]x3xf128>
// -----
>From debbe951467bc6f0f9b382c79dce1bcd02e62859 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.trachino at huawei.com>
Date: Tue, 28 May 2024 18:54:13 +0800
Subject: [PATCH 6/7] Fix naming and test
---
.../Vector/Transforms/VectorTransforms.cpp | 20 +++++++++----------
.../Vector/vector-transfer-flatten.mlir | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
index bdff1ba3b3907..40dda6ddb25cc 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
@@ -1607,20 +1607,20 @@ struct ChainedReduction final : OpRewritePattern<vector::ReductionOp> {
}
};
-FailureOr<VectorType> dropNonScalableUnitDimType(VectorType VT) {
- int removed = 0;
- auto shape = VT.getShape();
- auto builder = VectorType::Builder(VT);
- for (unsigned i = 0; i < shape.size(); i++) {
- if (shape[i] == 1 && !VT.getScalableDims()[i]) {
- builder.dropDim(i - removed);
- removed++;
+FailureOr<VectorType> dropNonScalableUnitDimType(VectorType inVecTy) {
+ int numUnitDimsDropped = 0;
+ auto inVecShape = inVecTy.getShape();
+ auto newVecBuilder = VectorType::Builder(inVecTy);
+ for (unsigned i = 0; i < inVecShape.size(); i++) {
+ if (inVecShape[i] == 1 && !inVecTy.getScalableDims()[i]) {
+ newVecBuilder.dropDim(i - numUnitDimsDropped);
+ numUnitDimsDropped++;
}
}
- if (removed == 0)
+ if (numUnitDimsDropped == 0)
return failure();
- return VectorType(builder);
+ return VectorType(newVecBuilder);
}
/// For vectors with at least an unit dim, replaces:
diff --git a/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir b/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
index 6931306a92258..ed5aeb641ff7b 100644
--- a/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
+++ b/mlir/test/Dialect/Vector/vector-transfer-flatten.mlir
@@ -471,7 +471,7 @@ func.func @fold_unit_inner_dim(%arg0 : vector<8x1x3xf128>,
// CHECK-LABEL: func.func @fold_unit_inner_dim(
// CHECK-SAME: %[[VAL_0:.*]]: vector<8x1x3xf128>,
-// CHECK-SAME: %[[VAL_1:.*]]: vector<1x8x3xf128>) -> vector<8xxf128> {
+// CHECK-SAME: %[[VAL_1:.*]]: vector<1x8x3xf128>) -> vector<8x3xf128> {
// CHECK: %[[VAL_2:.*]] = vector.shape_cast %[[VAL_0]] : vector<8x1x3xf128> to vector<8x3xf128>
// CHECK: %[[VAL_3:.*]] = vector.shape_cast %[[VAL_1]] : vector<1x8x3xf128> to vector<8x3xf128>
// CHECK: %[[VAL_4:.*]] = arith.mulf %[[VAL_2]], %[[VAL_3]] : vector<8x3xf128>
@@ -483,8 +483,8 @@ func.func @fold_unit_inner_dim_scalable(%arg0 : vector<8x1x[1]x3xf128>,
%arg1 : vector<1x8x[1]x3xf128>) -> vector<8x[1]x3xf128> {
%sc_arg1 = vector.shape_cast %arg1 : vector<1x8x[1]x3xf128> to vector<8x1x[1]x3xf128>
%mul = arith.mulf %arg0, %sc_arg1 : vector<8x1x[1]x3xf128>
- %res = vector.shape_cast %add : vector<8x1x[1]x3xf128> to vector<8x[1]x3xf128>
- return %mul : vector<8x[1]x3xf128>
+ %res = vector.shape_cast %mul : vector<8x1x[1]x3xf128> to vector<8x[1]x3xf128>
+ return %res : vector<8x[1]x3xf128>
}
// CHECK-LABEL: func.func @fold_unit_inner_dim_scalable(
>From 5e1c3bdf11c7887109c9c09bd249439dc8c17454 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.trachino at huawei.com>
Date: Fri, 31 May 2024 19:04:23 +0800
Subject: [PATCH 7/7] helper function does not return failure.
---
.../Vector/Transforms/VectorTransforms.cpp | 29 +++++++++----------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
index 40dda6ddb25cc..5e7356fd14861 100644
--- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
+++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
@@ -1607,20 +1607,20 @@ struct ChainedReduction final : OpRewritePattern<vector::ReductionOp> {
}
};
-FailureOr<VectorType> dropNonScalableUnitDimType(VectorType inVecTy) {
- int numUnitDimsDropped = 0;
- auto inVecShape = inVecTy.getShape();
+VectorType dropNonScalableUnitDimType(VectorType inVecTy) {
auto newVecBuilder = VectorType::Builder(inVecTy);
- for (unsigned i = 0; i < inVecShape.size(); i++) {
- if (inVecShape[i] == 1 && !inVecTy.getScalableDims()[i]) {
- newVecBuilder.dropDim(i - numUnitDimsDropped);
- numUnitDimsDropped++;
+ auto inVecShape = inVecTy.getShape();
+ SmallVector<int64_t> newShape;
+ SmallVector<bool> newScalableDims;
+ for (auto [dim, isScalable] :
+ llvm::zip(inVecShape, inVecTy.getScalableDims())) {
+ if (dim != 1 || isScalable) {
+ newShape.push_back(dim);
+ newScalableDims.push_back(isScalable);
}
}
- if (numUnitDimsDropped == 0)
- return failure();
- return VectorType(newVecBuilder);
+ return VectorType::get(newShape, inVecTy.getElementType(), newScalableDims);
}
/// For vectors with at least an unit dim, replaces:
@@ -1676,16 +1676,15 @@ struct DropUnitDimFromElementwiseOps final
for (auto operand : op->getOperands()) {
auto opVectorType = cast<VectorType>(operand.getType());
auto newVType = dropNonScalableUnitDimType(opVectorType);
- if (failed(newVType)) {
- return failure();
+ if (newVType == opVectorType) {
+ return rewriter.notifyMatchFailure(op, "No unit dimension to remove.");
}
- auto opSC =
- rewriter.create<vector::ShapeCastOp>(loc, newVType.value(), operand);
+ auto opSC = rewriter.create<vector::ShapeCastOp>(loc, newVType, operand);
newOperands.push_back(opSC);
}
VectorType newResultVectorType =
- dropNonScalableUnitDimType(resultVectorType).value();
+ dropNonScalableUnitDimType(resultVectorType);
// Create an updated elementwise Op without unit dim
Operation *elementwiseOp =
rewriter.create(loc, op->getName().getIdentifier(), newOperands,
More information about the Mlir-commits
mailing list