diff options
| -rw-r--r-- | mlir/include/mlir/Dialect/Linalg/EDSC/Builders.h | 6 | ||||
| -rw-r--r-- | mlir/lib/Dialect/Linalg/EDSC/Builders.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mlir/include/mlir/Dialect/Linalg/EDSC/Builders.h b/mlir/include/mlir/Dialect/Linalg/EDSC/Builders.h index 5c43c4080d8..c25c9d9f5ab 100644 --- a/mlir/include/mlir/Dialect/Linalg/EDSC/Builders.h +++ b/mlir/include/mlir/Dialect/Linalg/EDSC/Builders.h @@ -37,12 +37,12 @@ inline StringRef toString(IterType t) { } /// A StructuredIndexed represents a captured value that can be indexed and -/// passed to the `makeLinalgGenericOp`. It allows writing intuitive index +/// passed to the `makeGenericLinalgOp`. It allows writing intuitive index /// expressions such as: /// /// ``` /// StructuredIndexed A(vA), B(vB), C(vC); -/// makeLinalgGenericOp({A({m, n}), B({k, n})}, {C({m, n})}, ... ); +/// makeGenericLinalgOp({A({m, n}), B({k, n})}, {C({m, n})}, ... ); /// ``` struct StructuredIndexed { StructuredIndexed(Value v) : value(v) {} @@ -67,7 +67,7 @@ private: inline void defaultRegionBuilder(ArrayRef<BlockArgument> args) {} -Operation *makeLinalgGenericOp( +Operation *makeGenericLinalgOp( ArrayRef<IterType> iteratorTypes, ArrayRef<StructuredIndexed> inputs, ArrayRef<StructuredIndexed> outputs, function_ref<void(ArrayRef<BlockArgument>)> regionBuilder = diff --git a/mlir/lib/Dialect/Linalg/EDSC/Builders.cpp b/mlir/lib/Dialect/Linalg/EDSC/Builders.cpp index 37c63b74f14..de5b1d1f631 100644 --- a/mlir/lib/Dialect/Linalg/EDSC/Builders.cpp +++ b/mlir/lib/Dialect/Linalg/EDSC/Builders.cpp @@ -32,7 +32,7 @@ static void getMaxDimIndex(ArrayRef<StructuredIndexed> structuredIndices, } } -Operation *mlir::edsc::makeLinalgGenericOp( +Operation *mlir::edsc::makeGenericLinalgOp( ArrayRef<IterType> iteratorTypes, ArrayRef<StructuredIndexed> inputs, ArrayRef<StructuredIndexed> outputs, function_ref<void(ArrayRef<BlockArgument>)> regionBuilder, @@ -118,7 +118,7 @@ Operation *mlir::edsc::ops::linalg_pointwise(UnaryPointwiseOpBuilder unaryOp, ValueHandle a(args[0]); linalg_yield(unaryOp(a)); }; - return makeLinalgGenericOp(iterTypes, {I}, {O}, fun); + return makeGenericLinalgOp(iterTypes, {I}, {O}, fun); } Operation *mlir::edsc::ops::linalg_pointwise_tanh(StructuredIndexed I, @@ -141,7 +141,7 @@ Operation *mlir::edsc::ops::linalg_pointwise(BinaryPointwiseOpBuilder binaryOp, ValueHandle a(args[0]), b(args[1]); linalg_yield(binaryOp(a, b)); }; - return makeLinalgGenericOp(iterTypes, {I1, I2}, {O}, fun); + return makeGenericLinalgOp(iterTypes, {I1, I2}, {O}, fun); } Operation *mlir::edsc::ops::linalg_pointwise_add(StructuredIndexed I1, @@ -170,7 +170,7 @@ Operation *mlir::edsc::ops::linalg_matmul(ValueHandle vA, ValueHandle vB, AffineExpr m, n, k; bindDims(ScopedContext::getContext(), m, n, k); StructuredIndexed A(vA), B(vB), C(vC); - return makeLinalgGenericOp( + return makeGenericLinalgOp( {IterType::Parallel, IterType::Parallel, IterType::Reduction}, {A({m, k}), B({k, n})}, {C({m, n})}, @@ -198,7 +198,7 @@ Operation *mlir::edsc::ops::linalg_conv_nhwc(ValueHandle vI, ValueHandle vW, unsigned numDims = c.cast<AffineDimExpr>().getPosition() + 1; StructuredIndexed I(vI), W(vW), O(vO); // clang-format off - return makeLinalgGenericOp( + return makeGenericLinalgOp( {par, par, par, par, red, red, red}, { I({b, // Roundtrip to flattened form to serve as canonicalization and ensure @@ -231,7 +231,7 @@ Operation *mlir::edsc::ops::linalg_dilated_conv_nhwc( bindDims(ctx, b, dm, c, h, w, kh, kw); unsigned numDims = kw.cast<AffineDimExpr>().getPosition() + 1; StructuredIndexed I(vI), W(vW), O(vO); - return makeLinalgGenericOp( + return makeGenericLinalgOp( {par, par, par, par, par, red, red}, { I({b, // Roundtrip to flattened form to serve as canonicalization and ensure |
