Skip to content

Commit 74df89f

Browse files
kernhandaftynse
kernhanda
authored and
ftynse
committed
[NFC][mlir][linalg] Merge Utils/Intrinsics.h into EDSC/Intrinsics.h
Differential Revision: https://reviews.llvm.org/D73377
1 parent 51ba5b5 commit 74df89f

File tree

9 files changed

+17
-50
lines changed

9 files changed

+17
-50
lines changed

‎mlir/include/mlir/Dialect/Linalg/EDSC/Intrinsics.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ namespace mlir {
1616
namespace edsc {
1717
namespace intrinsics {
1818

19+
using linalg_copy = OperationBuilder<linalg::CopyOp>;
1920
using linalg_fill = OperationBuilder<linalg::FillOp>;
21+
using linalg_range = ValueBuilder<linalg::RangeOp>;
2022
using linalg_reshape = ValueBuilder<linalg::ReshapeOp>;
23+
using linalg_slice = ValueBuilder<linalg::SliceOp>;
2124
using linalg_yield = OperationBuilder<linalg::YieldOp>;
2225

2326
} // namespace intrinsics

‎mlir/include/mlir/Dialect/Linalg/Utils/Intrinsics.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
1717
#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
1818
#include "mlir/Dialect/Linalg/Passes.h"
19-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
2019
#include "mlir/EDSC/Builders.h"
2120
#include "mlir/EDSC/Intrinsics.h"
2221
#include "mlir/IR/AffineExpr.h"
@@ -47,7 +46,6 @@ using namespace mlir::edsc;
4746
using namespace mlir::edsc::intrinsics;
4847
using namespace mlir::LLVM;
4948
using namespace mlir::linalg;
50-
using namespace mlir::linalg::intrinsics;
5149

5250
using add = ValueBuilder<mlir::LLVM::AddOp>;
5351
using addi = ValueBuilder<mlir::AddIOp>;
@@ -452,7 +450,8 @@ class LinalgOpConversion : public OpRewritePattern<LinalgOp> {
452450

453451
/// Conversion pattern specialization for CopyOp. This kicks in when both input
454452
/// and output permutations are left unspecified or are the identity.
455-
template <> class LinalgOpConversion<CopyOp> : public OpRewritePattern<CopyOp> {
453+
template <>
454+
class LinalgOpConversion<CopyOp> : public OpRewritePattern<CopyOp> {
456455
public:
457456
using OpRewritePattern<CopyOp>::OpRewritePattern;
458457

‎mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
1616
#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
1717
#include "mlir/Dialect/Linalg/Passes.h"
18-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
1918
#include "mlir/Dialect/Linalg/Utils/Utils.h"
2019
#include "mlir/EDSC/Helpers.h"
2120
#include "mlir/IR/AffineExpr.h"
@@ -35,7 +34,6 @@ using namespace mlir;
3534
using namespace mlir::edsc;
3635
using namespace mlir::edsc::intrinsics;
3736
using namespace mlir::linalg;
38-
using namespace mlir::linalg::intrinsics;
3937

4038
using llvm::dbgs;
4139

‎mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "mlir/Dialect/Linalg/EDSC/Builders.h"
10+
#include "mlir/Dialect/Linalg/EDSC/Intrinsics.h"
1011
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
1112
#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
1213
#include "mlir/Dialect/Linalg/Passes.h"
1314
#include "mlir/Dialect/Linalg/Transforms/LinalgTransforms.h"
14-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
1515
#include "mlir/Dialect/Linalg/Utils/Utils.h"
1616
#include "mlir/Dialect/LoopOps/LoopOps.h"
1717
#include "mlir/Dialect/StandardOps/Ops.h"
@@ -30,7 +30,6 @@ using namespace mlir;
3030
using namespace mlir::edsc;
3131
using namespace mlir::edsc::intrinsics;
3232
using namespace mlir::linalg;
33-
using namespace mlir::linalg::intrinsics;
3433

3534
using IndexedStdValue = TemplatedIndexedValue<std_load, std_store>;
3635
using IndexedAffineValue = TemplatedIndexedValue<affine_load, affine_store>;
@@ -77,7 +76,8 @@ SmallVector<Value, 4> emitLoopRanges(OpBuilder &b, Location loc, AffineMap map,
7776
ScopedContext scope(b, loc);
7877
SmallVector<Value, 4> res;
7978
for (unsigned idx = 0, e = map.getNumResults(); idx < e; ++idx) {
80-
res.push_back(range(constant_index(0), sizes[idx], constant_index(1)));
79+
res.push_back(
80+
linalg_range(constant_index(0), sizes[idx], constant_index(1)));
8181
}
8282
return res;
8383
}

‎mlir/lib/Dialect/Linalg/Transforms/LinalgTransforms.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "mlir/Dialect/Linalg/Transforms/LinalgTransforms.h"
1414
#include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h"
1515
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
16-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
1716
#include "mlir/Dialect/Linalg/Utils/Utils.h"
1817
#include "mlir/Dialect/VectorOps/VectorOps.h"
1918
#include "mlir/EDSC/Helpers.h"
@@ -31,7 +30,6 @@ using namespace mlir;
3130
using namespace mlir::edsc;
3231
using namespace mlir::edsc::intrinsics;
3332
using namespace mlir::linalg;
34-
using namespace mlir::linalg::intrinsics;
3533

3634
using llvm::dbgs;
3735
using llvm::SetVector;

‎mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
#include "mlir/Dialect/Linalg/EDSC/Intrinsics.h"
1314
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
1415
#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
1516
#include "mlir/Dialect/Linalg/Passes.h"
16-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
1717
#include "mlir/Dialect/Linalg/Utils/Utils.h"
1818
#include "mlir/Dialect/LoopOps/LoopOps.h"
1919
#include "mlir/EDSC/Helpers.h"
@@ -33,7 +33,6 @@ using namespace mlir;
3333
using namespace mlir::edsc;
3434
using namespace mlir::edsc::intrinsics;
3535
using namespace mlir::linalg;
36-
using namespace mlir::linalg::intrinsics;
3736
using namespace mlir::loop;
3837

3938
using llvm::SetVector;
@@ -93,14 +92,15 @@ static PromotionInfo promoteFullTileBuffer(OpBuilder &b, Location loc,
9392
Value d = rangeValue.size;
9493
allocSize = muli(folder, allocSize, d).getValue();
9594
fullRanges.push_back(d);
96-
partialRanges.push_back(range(folder, zero, dim(subView, rank), one));
95+
partialRanges.push_back(
96+
linalg_range(folder, zero, dim(subView, rank), one));
9797
}
9898
SmallVector<int64_t, 4> dynSizes(fullRanges.size(), -1);
9999
auto buffer =
100100
allocBuffer(viewType.getElementType(), allocSize, dynamicBuffers);
101101
auto fullLocalView = view(
102102
MemRefType::get(dynSizes, viewType.getElementType()), buffer, fullRanges);
103-
auto partialLocalView = slice(fullLocalView, partialRanges);
103+
auto partialLocalView = linalg_slice(fullLocalView, partialRanges);
104104
return PromotionInfo{buffer, fullLocalView, partialLocalView};
105105
}
106106

@@ -139,14 +139,15 @@ mlir::linalg::promoteSubViews(OpBuilder &b, Location loc,
139139
// TODO(ntv): fill is only necessary if `promotionInfo` has a full local
140140
// view that is different from the partial local view and we are on the
141141
// boundary.
142-
fill(info->second.fullLocalView, fillVal);
142+
linalg_fill(info->second.fullLocalView, fillVal);
143143
}
144144

145145
for (auto v : subViews) {
146146
auto info = promotionInfoMap.find(v);
147147
if (info == promotionInfoMap.end())
148148
continue;
149-
copy(cast<SubViewOp>(v.getDefiningOp()), info->second.partialLocalView);
149+
linalg_copy(cast<SubViewOp>(v.getDefiningOp()),
150+
info->second.partialLocalView);
150151
}
151152
return res;
152153
}
@@ -191,7 +192,8 @@ LinalgOp mlir::linalg::promoteSubViewOperands(OpBuilder &b, LinalgOp op,
191192
bool isOutput =
192193
op.getIndexOfOutputBuffer(viewAndPartialLocalView.first).hasValue();
193194
if (isOutput)
194-
copy(viewAndPartialLocalView.second, viewAndPartialLocalView.first);
195+
linalg_copy(viewAndPartialLocalView.second,
196+
viewAndPartialLocalView.first);
195197
}
196198

197199
// 4. Dealloc local buffers.

‎mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
1515
#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
1616
#include "mlir/Dialect/Linalg/Passes.h"
17-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
1817
#include "mlir/Dialect/Linalg/Utils/Utils.h"
1918
#include "mlir/Dialect/LoopOps/LoopOps.h"
2019
#include "mlir/EDSC/Helpers.h"
@@ -33,7 +32,6 @@ using namespace mlir;
3332
using namespace mlir::edsc;
3433
using namespace mlir::edsc::intrinsics;
3534
using namespace mlir::linalg;
36-
using namespace mlir::linalg::intrinsics;
3735
using namespace mlir::loop;
3836

3937
#define DEBUG_TYPE "linalg-tiling"

‎mlir/lib/Dialect/Linalg/Utils/Utils.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "mlir/Dialect/Linalg/Utils/Utils.h"
1414
#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
1515
#include "mlir/Dialect/Linalg/IR/LinalgTypes.h"
16-
#include "mlir/Dialect/Linalg/Utils/Intrinsics.h"
1716
#include "mlir/Dialect/LoopOps/LoopOps.h"
1817
#include "mlir/Dialect/StandardOps/Ops.h"
1918
#include "mlir/EDSC/Helpers.h"
@@ -28,7 +27,6 @@ using namespace mlir;
2827
using namespace mlir::edsc;
2928
using namespace mlir::edsc::intrinsics;
3029
using namespace mlir::linalg;
31-
using namespace mlir::linalg::intrinsics;
3230
using namespace mlir::loop;
3331

3432
static Value emitOrFoldComposedAffineApply(OpBuilder &b, Location loc,

0 commit comments

Comments
 (0)