Skip to content

Commit 829717c

Browse files
maksleventalmakslevental
authored
Bump LLVM (#958)
1 parent 8b94759 commit 829717c

File tree

17 files changed

+42
-41
lines changed

17 files changed

+42
-41
lines changed

‎externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ add_mlir_library(TorchMLIRTMTensorDialect
1111
TorchMLIRTMTensorOpsIncGen
1212

1313
LINK_LIBS PUBLIC
14-
MLIRAffine
14+
MLIRAffineDialect
1515
MLIRDialectUtils
1616
MLIRIR
17-
MLIRLinalg
18-
MLIRMath
19-
MLIRMemRef
17+
MLIRLinalgDialect
18+
MLIRMathDialect
19+
MLIRMemRefDialect
2020
MLIRPass
2121
MLIRSideEffectInterfaces
2222
MLIRSupport
23-
MLIRSCF
24-
MLIRFunc
25-
MLIRTensor
23+
MLIRSCFDialect
24+
MLIRFuncDialect
25+
MLIRTensorDialect
2626
MLIRViewLikeInterface
2727
)
2828

‎externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1515
#include "mlir/Dialect/Math/IR/Math.h"
1616
#include "mlir/Dialect/MemRef/IR/MemRef.h"
17-
#include "mlir/Dialect/SCF/SCF.h"
17+
#include "mlir/Dialect/SCF/IR/SCF.h"
1818
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1919
#include "mlir/Dialect/Utils/StructuredOpsUtils.h"
2020
#include "mlir/IR/Attributes.h"

‎externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ add_mlir_library(TorchMLIRTMTensorPasses
88

99
LINK_LIBS PUBLIC
1010
TorchMLIRTMTensorDialect
11-
MLIRAffine
11+
MLIRAffineDialect
1212
MLIRIR
13-
MLIRLinalg
13+
MLIRLinalgDialect
1414
MLIRLinalgTransforms
15-
MLIRMath
16-
MLIRMemRef
15+
MLIRMathDialect
16+
MLIRMemRefDialect
1717
MLIRPass
18-
MLIRSCF
19-
MLIRFunc
18+
MLIRSCFDialect
19+
MLIRFuncDialect
2020
MLIRSupport
21-
MLIRTensor
21+
MLIRTensorDialect
2222
MLIRTransforms
2323
)

‎externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1313
#include "mlir/Dialect/Math/IR/Math.h"
1414
#include "mlir/Dialect/MemRef/IR/MemRef.h"
15-
#include "mlir/Dialect/SCF/SCF.h"
15+
#include "mlir/Dialect/SCF/IR/SCF.h"
1616
#include "mlir/IR/BuiltinTypes.h"
1717
#include "mlir/IR/PatternMatch.h"
1818
#include "mlir/Pass/Pass.h"

‎externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
set(LIBS
2-
MLIRArithmetic
2+
MLIRArithmeticDialect
33
MLIRDialect
4-
MLIRLinalg
5-
MLIRMemRef
4+
MLIRLinalgDialect
5+
MLIRMemRefDialect
66
MLIROptLib
7-
MLIRSCF
7+
MLIRSCFDialect
88
MLIRSCFTransforms
9-
MLIRFunc
10-
MLIRTensor
9+
MLIRFuncDialect
10+
MLIRTensorDialect
1111
MLIRTransforms
1212
TorchMLIRTMTensorDialect
1313
TorchMLIRTMTensorPasses

‎externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/torch-mlir-dialects-opt.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "mlir/Dialect/Func/IR/FuncOps.h"
1212
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1313
#include "mlir/Dialect/MemRef/IR/MemRef.h"
14-
#include "mlir/Dialect/SCF/Passes.h"
15-
#include "mlir/Dialect/SCF/SCF.h"
14+
#include "mlir/Dialect/SCF/Transforms/Passes.h"
15+
#include "mlir/Dialect/SCF/IR/SCF.h"
1616
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1717
#include "mlir/IR/AsmState.h"
1818
#include "mlir/IR/Dialect.h"

‎externals/llvm-project

Submodule llvm-project updated 13832 files

‎lib/Conversion/TorchToLinalg/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ add_mlir_conversion_library(TorchMLIRTorchToLinalg
2525
LINK_LIBS PUBLIC
2626
MLIRIR
2727
MLIRPass
28-
MLIRLinalg
29-
MLIRMath
28+
MLIRLinalgDialect
29+
MLIRMathDialect
3030
TorchMLIRTorchDialect
3131
)
3232

‎lib/Conversion/TorchToSCF/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ add_mlir_conversion_library(TorchMLIRTorchToSCF
1313
LINK_LIBS PUBLIC
1414
MLIRIR
1515
MLIRPass
16-
MLIRSCF
17-
MLIRFunc
16+
MLIRSCFDialect
17+
MLIRFuncDialect
1818
TorchMLIRTorchDialect
1919
TorchMLIRTorchConversionDialect
2020
)

‎lib/Conversion/TorchToSCF/TorchToSCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "../PassDetail.h"
1313
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
14-
#include "mlir/Dialect/SCF/SCF.h"
14+
#include "mlir/Dialect/SCF/IR/SCF.h"
1515
#include "mlir/IR/BuiltinTypes.h"
1616
#include "mlir/Transforms/DialectConversion.h"
1717
#include "torch-mlir/Dialect/Torch/IR/TorchDialect.h"

‎lib/Conversion/TorchToStd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ add_mlir_conversion_library(TorchMLIRTorchToStd
1313
LINK_LIBS PUBLIC
1414
MLIRIR
1515
MLIRPass
16-
MLIRFunc
16+
MLIRFuncDialect
1717
TorchMLIRTorchDialect
1818
)
1919

‎lib/Conversion/TorchToTMTensor/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ TorchToTMTensor.cpp
1313
LINK_LIBS PUBLIC
1414
MLIRIR
1515
MLIRPass
16-
MLIRLinalg
17-
MLIRMath
16+
MLIRLinalgDialect
17+
MLIRMathDialect
1818
TorchMLIRTorchDialect
1919
TorchMLIRTMTensorDialect
2020
)

‎lib/Conversion/TorchToTosa/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ add_mlir_conversion_library(TorchMLIRTorchToTosa
1515
LINK_LIBS PUBLIC
1616
MLIRIR
1717
MLIRPass
18-
MLIRTosa
18+
MLIRTosaDialect
1919
TorchMLIRTorchDialect
2020
)
2121

‎lib/Dialect/Torch/IR/TorchOps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ LogicalResult ClassTypeOp::verify() {
237237
// PrimLoopOp
238238
//===----------------------------------------------------------------------===//
239239

240-
OperandRange PrimLoopOp::getSuccessorEntryOperands(unsigned index) {
241-
assert(index == 0);
240+
OperandRange PrimLoopOp::getSuccessorEntryOperands(Optional<unsigned int> index) {
241+
assert(index.hasValue() && index.value() == 0);
242242
return iterArgsInit();
243243
}
244244

‎lib/Dialect/TorchConversion/Transforms/VerifyLinalgOnTensorsBackendContract.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "mlir/Dialect/Func/IR/FuncOps.h"
1616
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1717
#include "mlir/Dialect/Math/IR/Math.h"
18-
#include "mlir/Dialect/SCF/SCF.h"
18+
#include "mlir/Dialect/SCF/IR/SCF.h"
1919
#include "mlir/Dialect/Tensor/IR/Tensor.h"
2020
#include "mlir/IR/OpDefinition.h"
2121
#include "mlir/Transforms/DialectConversion.h"

‎python/torch_mlir_e2e_test/linalg_on_tensors_backends/refbackend.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ def invoke(*args):
119119
# Bufferize.
120120
"func.func(scf-bufferize)",
121121
"func.func(tm-tensor-bufferize)",
122+
"func.func(linalg-init-tensor-to-alloc-tensor)",
122123
"func.func(linalg-bufferize)",
123124
"func-bufferize",
124125
"arith-bufferize",

‎test/Dialect/Torch/canonicalize.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// CHECK-LABEL: func.func @torch.aten.__range_length$fold() -> (!torch.int, !torch.int, !torch.int, !torch.int) {
44
// CHECK: %[[INT1:.*]] = torch.constant.int 1
55
// CHECK: %[[INT2:.*]] = torch.constant.int 2
6-
// CHECK: %[[INTM1:.*]] = torch.constant.int -1
76
// CHECK: %[[INT3:.*]] = torch.constant.int 3
7+
// CHECK: %[[INTM1:.*]] = torch.constant.int -1
88
// CHECK: %[[NEG_STEP:.*]] = torch.aten.__range_length %[[INT1]], %[[INT3]], %[[INTM1]] : !torch.int, !torch.int, !torch.int -> !torch.int
99
// CHECK: return %[[INT2]], %[[INT2]], %[[INT1]], %[[NEG_STEP]] : !torch.int, !torch.int, !torch.int, !torch.int
1010
func.func @torch.aten.__range_length$fold() -> (!torch.int, !torch.int, !torch.int, !torch.int) {
@@ -559,8 +559,8 @@ func.func @torch.aten.__getitem__.t() -> !torch.int {
559559

560560
// Not canonicalized because of passed in index
561561
// CHECK-LABEL: func.func @torch.aten.__getitem__.t$no_change_test0(
562-
// CHECK: %[[C4:.*]] = torch.constant.int 4
563562
// CHECK: %[[C5:.*]] = torch.constant.int 5
563+
// CHECK: %[[C4:.*]] = torch.constant.int 4
564564
// CHECK: %[[LIST:.*]] = torch.prim.ListConstruct %[[C4]], %[[C5]] : (!torch.int, !torch.int) -> !torch.list<int>
565565
// CHECK: %[[ITEM:.*]] = torch.aten.__getitem__.t %[[LIST]], %arg0 : !torch.list<int>, !torch.int -> !torch.int
566566
// CHECK: return %[[ITEM]] : !torch.int
@@ -673,8 +673,8 @@ func.func @torch.constant.none$constantlike() -> (!torch.none, !torch.none) {
673673
}
674674

675675
// CHECK-LABEL: func.func @torch.constant.str$constantlike() -> (!torch.str, !torch.str, !torch.str) {
676-
// CHECK: %[[T:.*]] = torch.constant.str "t"
677676
// CHECK: %[[S:.*]] = torch.constant.str "s"
677+
// CHECK: %[[T:.*]] = torch.constant.str "t"
678678
// CHECK: return %[[S]], %[[S]], %[[T]] : !torch.str, !torch.str, !torch.str
679679
func.func @torch.constant.str$constantlike() -> (!torch.str, !torch.str, !torch.str) {
680680
%0 = torch.constant.str "s"
@@ -684,8 +684,8 @@ func.func @torch.constant.str$constantlike() -> (!torch.str, !torch.str, !torch.
684684
}
685685

686686
// CHECK-LABEL: func.func @torch.constant.bool$constantlike() -> (!torch.bool, !torch.bool, !torch.bool) {
687-
// CHECK: %[[F:.*]] = torch.constant.bool false
688687
// CHECK: %[[T:.*]] = torch.constant.bool true
688+
// CHECK: %[[F:.*]] = torch.constant.bool false
689689
// CHECK: return %[[T]], %[[T]], %[[F]] : !torch.bool, !torch.bool, !torch.bool
690690
func.func @torch.constant.bool$constantlike() -> (!torch.bool, !torch.bool, !torch.bool) {
691691
%0 = torch.constant.bool true

0 commit comments

Comments
 (0)