Skip to content

Commit 56b4dca

Browse files
j2kuncopybara-github
j2kun
authored and
copybara-github
committed
MemrefToArith: add missing includes
PiperOrigin-RevId: 599255451
1 parent 3c1b6d2 commit 56b4dca

File tree

6 files changed

+67
-19
lines changed

6 files changed

+67
-19
lines changed

‎lib/Conversion/MemrefToArith/BUILD

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ cc_library(
1010
srcs = ["Utils.cpp"],
1111
hdrs = ["@heir//include/Conversion/MemrefToArith:Utils.h"],
1212
deps = [
13+
"@llvm-project//llvm:Support",
1314
"@llvm-project//mlir:AffineAnalysis",
1415
"@llvm-project//mlir:AffineDialect",
1516
"@llvm-project//mlir:AffineUtils",
17+
"@llvm-project//mlir:IR",
18+
"@llvm-project//mlir:Support",
1619
],
1720
)
1821

@@ -22,9 +25,7 @@ cc_test(
2225
deps = [
2326
":Utils",
2427
"@googletest//:gtest_main",
25-
"@llvm-project//mlir:AffineAnalysis",
26-
"@llvm-project//mlir:AffineDialect",
27-
"@llvm-project//mlir:AffineUtils",
28+
"@llvm-project//llvm:Support",
2829
],
2930
)
3031

@@ -37,9 +38,12 @@ cc_library(
3738
"@llvm-project//mlir:AffineAnalysis",
3839
"@llvm-project//mlir:AffineDialect",
3940
"@llvm-project//mlir:AffineUtils",
41+
"@llvm-project//mlir:ArithDialect",
42+
"@llvm-project//mlir:IR",
4043
"@llvm-project//mlir:MemRefDialect",
4144
"@llvm-project//mlir:Pass",
4245
"@llvm-project//mlir:SCFDialect",
46+
"@llvm-project//mlir:Support",
4347
"@llvm-project//mlir:TransformUtils",
4448
],
4549
)
@@ -52,9 +56,12 @@ cc_library(
5256
"@llvm-project//mlir:AffineAnalysis",
5357
"@llvm-project//mlir:AffineDialect",
5458
"@llvm-project//mlir:AffineUtils",
59+
"@llvm-project//mlir:ArithDialect",
60+
"@llvm-project//mlir:IR",
5561
"@llvm-project//mlir:MemRefDialect",
5662
"@llvm-project//mlir:Pass",
5763
"@llvm-project//mlir:SCFDialect",
64+
"@llvm-project//mlir:Support",
5865
"@llvm-project//mlir:TransformUtils",
5966
],
6067
)
@@ -87,6 +94,7 @@ cc_library(
8794
"@llvm-project//mlir:AffineAnalysis",
8895
"@llvm-project//mlir:AffineDialect",
8996
"@llvm-project//mlir:AffineUtils",
97+
"@llvm-project//mlir:ArithDialect",
9098
"@llvm-project//mlir:FuncDialect",
9199
"@llvm-project//mlir:IR",
92100
"@llvm-project//mlir:MemRefDialect",

‎lib/Conversion/MemrefToArith/ExpandCopy.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
#include <numeric>
1+
#include <memory>
2+
#include <utility>
23

34
#include "include/Conversion/MemrefToArith/MemrefToArith.h"
45
#include "mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h" // from @llvm-project
5-
#include "mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h" // from @llvm-project
66
#include "mlir/include/mlir/Dialect/Affine/IR/AffineOps.h" // from @llvm-project
7-
#include "mlir/include/mlir/Dialect/Affine/IR/AffineValueMap.h" // from @llvm-project
87
#include "mlir/include/mlir/Dialect/Affine/Utils.h" // from @llvm-project
8+
#include "mlir/include/mlir/Dialect/Arith/IR/Arith.h" // from @llvm-project
99
#include "mlir/include/mlir/Dialect/MemRef/IR/MemRef.h" // from @llvm-project
1010
#include "mlir/include/mlir/Dialect/SCF/IR/SCF.h" // from @llvm-project
11+
#include "mlir/include/mlir/IR/BuiltinOps.h" // from @llvm-project
12+
#include "mlir/include/mlir/IR/BuiltinTypes.h" // from @llvm-project
13+
#include "mlir/include/mlir/IR/DialectRegistry.h" // from @llvm-project
14+
#include "mlir/include/mlir/IR/PatternMatch.h" // from @llvm-project
1115
#include "mlir/include/mlir/Pass/Pass.h" // from @llvm-project
16+
#include "mlir/include/mlir/Support/LLVM.h" // from @llvm-project
17+
#include "mlir/include/mlir/Support/LogicalResult.h" // from @llvm-project
1218
#include "mlir/include/mlir/Transforms/DialectConversion.h" // from @llvm-project
13-
#include "mlir/include/mlir/Transforms/GreedyPatternRewriteDriver.h" // from @llvm-project
1419

1520
namespace mlir {
1621
namespace heir {

‎lib/Conversion/MemrefToArith/MemrefGlobalReplace.cpp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
#include <numeric>
1+
#include <cassert>
2+
#include <memory>
3+
#include <utility>
24

35
#include "include/Conversion/MemrefToArith/MemrefToArith.h"
46
#include "include/Conversion/MemrefToArith/Utils.h"
57
#include "mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h" // from @llvm-project
68
#include "mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h" // from @llvm-project
79
#include "mlir/include/mlir/Dialect/Affine/IR/AffineOps.h" // from @llvm-project
8-
#include "mlir/include/mlir/Dialect/Affine/IR/AffineValueMap.h" // from @llvm-project
910
#include "mlir/include/mlir/Dialect/Affine/Utils.h" // from @llvm-project
11+
#include "mlir/include/mlir/Dialect/Arith/IR/Arith.h" // from @llvm-project
1012
#include "mlir/include/mlir/Dialect/MemRef/IR/MemRef.h" // from @llvm-project
1113
#include "mlir/include/mlir/Dialect/SCF/IR/SCF.h" // from @llvm-project
12-
#include "mlir/include/mlir/Pass/Pass.h" // from @llvm-project
14+
#include "mlir/include/mlir/IR/BuiltinAttributeInterfaces.h" // from @llvm-project
15+
#include "mlir/include/mlir/IR/BuiltinAttributes.h" // from @llvm-project
16+
#include "mlir/include/mlir/IR/BuiltinOps.h" // from @llvm-project
17+
#include "mlir/include/mlir/IR/BuiltinTypes.h" // from @llvm-project
18+
#include "mlir/include/mlir/IR/DialectRegistry.h" // from @llvm-project
19+
#include "mlir/include/mlir/IR/PatternMatch.h" // from @llvm-project
20+
#include "mlir/include/mlir/IR/SymbolTable.h" // from @llvm-project
21+
#include "mlir/include/mlir/Pass/Pass.h" // from @llvm-project
22+
#include "mlir/include/mlir/Support/LLVM.h" // from @llvm-project
23+
#include "mlir/include/mlir/Support/LogicalResult.h" // from @llvm-project
1324
#include "mlir/include/mlir/Transforms/DialectConversion.h" // from @llvm-project
14-
#include "mlir/include/mlir/Transforms/GreedyPatternRewriteDriver.h" // from @llvm-project
1525

1626
namespace mlir {
1727
namespace heir {

‎lib/Conversion/MemrefToArith/UnrollAndForward.cpp

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
11
#include <cstddef>
2-
#include <deque>
2+
#include <cstdint>
3+
#include <functional>
4+
#include <limits>
5+
#include <memory>
6+
#include <optional>
37
#include <queue>
8+
#include <unordered_map>
9+
#include <utility>
10+
#include <vector>
411

512
#include "include/Conversion/MemrefToArith/MemrefToArith.h"
613
#include "include/Conversion/MemrefToArith/Utils.h"
7-
#include "llvm/include/llvm/ADT/TypeSwitch.h" // from @llvm-project
8-
#include "llvm/include/llvm/Support/Casting.h" // from @llvm-project
14+
#include "llvm/include/llvm/ADT/STLExtras.h" // from @llvm-project
15+
#include "llvm/include/llvm/ADT/SmallVector.h" // from @llvm-project
16+
#include "llvm/include/llvm/ADT/TypeSwitch.h" // from @llvm-project
17+
#include "llvm/include/llvm/Support/Casting.h" // from @llvm-project
18+
#include "llvm/include/llvm/Support/ErrorHandling.h" // from @llvm-project
919
#include "mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h" // from @llvm-project
1020
#include "mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h" // from @llvm-project
1121
#include "mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h" // from @llvm-project
1222
#include "mlir/include/mlir/Dialect/Affine/IR/AffineOps.h" // from @llvm-project
13-
#include "mlir/include/mlir/Dialect/Affine/IR/AffineValueMap.h" // from @llvm-project
1423
#include "mlir/include/mlir/Dialect/Affine/LoopUtils.h" // from @llvm-project
1524
#include "mlir/include/mlir/Dialect/Affine/Utils.h" // from @llvm-project
25+
#include "mlir/include/mlir/Dialect/Arith/IR/Arith.h" // from @llvm-project
1626
#include "mlir/include/mlir/Dialect/Func/IR/FuncOps.h" // from @llvm-project
1727
#include "mlir/include/mlir/Dialect/MemRef/IR/MemRef.h" // from @llvm-project
1828
#include "mlir/include/mlir/Dialect/SCF/IR/SCF.h" // from @llvm-project
29+
#include "mlir/include/mlir/IR/BuiltinTypes.h" // from @llvm-project
30+
#include "mlir/include/mlir/IR/DialectRegistry.h" // from @llvm-project
1931
#include "mlir/include/mlir/IR/ImplicitLocOpBuilder.h" // from @llvm-project
2032
#include "mlir/include/mlir/IR/Location.h" // from @llvm-project
21-
#include "mlir/include/mlir/IR/PatternMatch.h" // from @llvm-project
2233
#include "mlir/include/mlir/IR/Types.h" // from @llvm-project
34+
#include "mlir/include/mlir/IR/Value.h" // from @llvm-project
2335
#include "mlir/include/mlir/IR/Visitors.h" // from @llvm-project
2436
#include "mlir/include/mlir/Pass/Pass.h" // from @llvm-project
37+
#include "mlir/include/mlir/Support/LLVM.h" // from @llvm-project
2538
#include "mlir/include/mlir/Support/LogicalResult.h" // from @llvm-project
2639
#include "mlir/include/mlir/Transforms/DialectConversion.h" // from @llvm-project
27-
#include "mlir/include/mlir/Transforms/GreedyPatternRewriteDriver.h" // from @llvm-project
2840

2941
namespace mlir {
3042
namespace heir {

‎lib/Conversion/MemrefToArith/Utils.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1+
#include <cstdint>
2+
#include <optional>
13
#include <utility>
4+
#include <vector>
25

6+
#include "llvm/include/llvm/ADT/ArrayRef.h" // from @llvm-project
7+
#include "llvm/include/llvm/ADT/SmallVector.h" // from @llvm-project
38
#include "mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h" // from @llvm-project
49
#include "mlir/include/mlir/Dialect/Affine/IR/AffineOps.h" // from @llvm-project
510
#include "mlir/include/mlir/Dialect/Affine/IR/AffineValueMap.h" // from @llvm-project
11+
#include "mlir/include/mlir/IR/AffineExpr.h" // from @llvm-project
12+
#include "mlir/include/mlir/IR/BuiltinAttributeInterfaces.h" // from @llvm-project
13+
#include "mlir/include/mlir/IR/Types.h" // from @llvm-project
14+
#include "mlir/include/mlir/Support/LLVM.h" // from @llvm-project
615

716
namespace mlir {
817
namespace heir {
@@ -47,7 +56,7 @@ llvm::SmallVector<int64_t> unflattenIndex(int64_t index,
4756
int64_t offset) {
4857
llvm::SmallVector<int64_t> indices;
4958
int64_t ndx = index - offset;
50-
for (long stride : strides) {
59+
for (int64_t stride : strides) {
5160
indices.push_back(ndx / stride);
5261
ndx = ndx % stride;
5362
}

‎lib/Conversion/MemrefToArith/UtilsTest.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
#include <cstdint>
2+
13
#include "gmock/gmock.h" // from @googletest
24
#include "gtest/gtest.h" // from @googletest
35
#include "include/Conversion/MemrefToArith/Utils.h"
6+
#include "llvm/include/llvm/ADT/SmallVector.h" // from @llvm-project
47

58
namespace mlir {
69
namespace heir {
710

11+
using ::llvm::SmallVector;
812
using ::testing::ElementsAre;
913
using ::testing::ElementsAreArray;
1014

1115
TEST(FlattenIndex, UnflattenOffsetZero) {
12-
llvm::SmallVector<int64_t, 3> strides = {20, 5, 1};
16+
SmallVector<int64_t, 3> strides = {20, 5, 1};
1317
static const int64_t offset = 0;
1418
EXPECT_THAT(unflattenIndex(33, strides, offset), ElementsAre(1, 2, 3));
1519
}

0 commit comments

Comments
 (0)