From faa9a78e38e3a546d5533248455f967cd31f8c58 Mon Sep 17 00:00:00 2001 From: Ashay Rane Date: Wed, 5 Oct 2022 08:28:06 -0500 Subject: [PATCH] build: update llvm tag to 6f46ff37 (#1448) Summary of changes: - Updated references to the Arith dialect (https://reviews.llvm.org/D134762) - Switched to prefixed accessors for MemRef dialect (https://reviews.llvm.org/D134995) - Fixed warnings about signed/unsigned comparisons, ignored return values, and unused variables --- .../Dialect/TMTensor/Transforms/Bufferize.cpp | 6 +++--- .../TMTensor/Transforms/ConvertToLoops.cpp | 6 +++--- .../torch-mlir-dialects-opt/CMakeLists.txt | 2 +- .../torch-mlir-dialects-opt.cpp | 6 +++--- externals/llvm-project | 2 +- externals/mlir-hlo | 2 +- lib/Conversion/TorchToArith/TorchToArith.cpp | 6 +++--- lib/Conversion/TorchToLinalg/DataMovement.cpp | 19 +++++++------------ .../TorchToLinalg/IndirectDataMovement.cpp | 2 +- lib/Conversion/TorchToLinalg/Linear.cpp | 2 +- lib/Conversion/TorchToLinalg/Pooling.cpp | 2 +- lib/Conversion/TorchToLinalg/Random.cpp | 2 +- lib/Conversion/TorchToLinalg/Reduction.cpp | 2 +- .../TorchToLinalg/TensorConstructors.cpp | 2 +- .../TorchToLinalg/TensorScalarInterop.cpp | 2 +- .../TorchToLinalg/TorchToLinalg.cpp | 6 +++--- .../TorchToLinalg/Uncategorized.cpp | 2 +- lib/Conversion/TorchToLinalg/Utils.cpp | 2 +- lib/Conversion/TorchToMhlo/Basic.cpp | 2 +- lib/Conversion/TorchToMhlo/Gather.cpp | 2 +- lib/Conversion/TorchToMhlo/Linear.cpp | 2 +- .../TorchToMhlo/MhloLegalizeUtils.cpp | 2 +- lib/Conversion/TorchToMhlo/Pooling.cpp | 2 +- lib/Conversion/TorchToMhlo/Reduction.cpp | 2 +- lib/Conversion/TorchToMhlo/TorchToMhlo.cpp | 6 +++--- lib/Conversion/TorchToMhlo/ViewLike.cpp | 2 +- lib/Conversion/TorchToSCF/TorchToSCF.cpp | 6 +++--- .../TorchToTMTensor/TorchToTMTensor.cpp | 6 +++--- lib/Conversion/TorchToTosa/TorchToTosa.cpp | 6 +++--- lib/Conversion/Utils/CMakeLists.txt | 2 +- lib/Conversion/Utils/Utils.cpp | 2 +- .../IR/TorchConversionDialect.cpp | 4 ++-- .../VerifyLinalgOnTensorsBackendContract.cpp | 5 ++--- .../Transforms/VerifyMhloBackendContract.cpp | 4 ++-- .../Transforms/VerifyTosaBackendContract.cpp | 2 +- lib/RefBackend/RefBackend.cpp | 6 +++--- 36 files changed, 65 insertions(+), 71 deletions(-) diff --git a/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/Bufferize.cpp b/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/Bufferize.cpp index e39c8413b..a79c0e09f 100644 --- a/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/Bufferize.cpp +++ b/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/Bufferize.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Bufferization/Transforms/Bufferize.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Func/Transforms/Passes.h" @@ -134,7 +134,7 @@ struct TMTensorBufferizePass bufferization::BufferizeTypeConverter typeConverter; // Mark all Standard operations legal. - target.addLegalDialect(); // Mark all TMTensor operations illegal as long as they work on tensors. diff --git a/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp b/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp index 3d68625b7..d8af2ef5c 100644 --- a/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp +++ b/externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" @@ -101,7 +101,7 @@ namespace { struct TMTensorToLoopsPass : public TMTensorToLoopsBase { void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); } diff --git a/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/CMakeLists.txt b/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/CMakeLists.txt index 4b753e310..102d60bce 100644 --- a/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/CMakeLists.txt +++ b/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/CMakeLists.txt @@ -1,5 +1,5 @@ set(LIBS - MLIRArithmeticDialect + MLIRArithDialect MLIRDialect MLIRLinalgDialect MLIRMemRefDialect diff --git a/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/torch-mlir-dialects-opt.cpp b/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/torch-mlir-dialects-opt.cpp index 1dfc756bb..5e65bb28d 100644 --- a/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/torch-mlir-dialects-opt.cpp +++ b/externals/llvm-external-projects/torch-mlir-dialects/tools/torch-mlir-dialects-opt/torch-mlir-dialects-opt.cpp @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" -#include "mlir/Dialect/SCF/Transforms/Passes.h" #include "mlir/Dialect/SCF/IR/SCF.h" +#include "mlir/Dialect/SCF/Transforms/Passes.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/IR/AsmState.h" #include "mlir/IR/Dialect.h" @@ -39,7 +39,7 @@ int main(int argc, char **argv) { // Local dialects mlir::torch::TMTensor::TMTensorDialect, // Upstream dialects - mlir::arith::ArithmeticDialect, mlir::linalg::LinalgDialect, + mlir::arith::ArithDialect, mlir::linalg::LinalgDialect, mlir::func::FuncDialect, mlir::memref::MemRefDialect, mlir::scf::SCFDialect, mlir::tensor::TensorDialect>(); diff --git a/externals/llvm-project b/externals/llvm-project index bebc96956..6f46ff376 160000 --- a/externals/llvm-project +++ b/externals/llvm-project @@ -1 +1 @@ -Subproject commit bebc96956b76bdbc36f1d82a788c810e5b12e2c5 +Subproject commit 6f46ff3765dcdc178b9cf52ebd8c03437806798a diff --git a/externals/mlir-hlo b/externals/mlir-hlo index 7b0ecf782..2f7c1454b 160000 --- a/externals/mlir-hlo +++ b/externals/mlir-hlo @@ -1 +1 @@ -Subproject commit 7b0ecf7827e3fc07d2af90e147bcedc165bc78ac +Subproject commit 2f7c1454bbe4c4ad0ae1c86c5539ac58b6053b6a diff --git a/lib/Conversion/TorchToArith/TorchToArith.cpp b/lib/Conversion/TorchToArith/TorchToArith.cpp index 1c1a2009d..2de450f72 100644 --- a/lib/Conversion/TorchToArith/TorchToArith.cpp +++ b/lib/Conversion/TorchToArith/TorchToArith.cpp @@ -10,7 +10,7 @@ #include "torch-mlir/Conversion/TorchToArith/TorchToArith.h" #include "../PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Math/IR/Math.h" @@ -300,7 +300,7 @@ class ConvertTorchToArith : public ConvertTorchToArithBase public: void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); - registry.insert(); + registry.insert(); registry.insert(); registry.insert(); registry.insert(); @@ -311,7 +311,7 @@ public: MLIRContext *context = &getContext(); ConversionTarget target(*context); target.addLegalDialect(); TypeConverter typeConverter; diff --git a/lib/Conversion/TorchToLinalg/DataMovement.cpp b/lib/Conversion/TorchToLinalg/DataMovement.cpp index d66f18393..20c7f4168 100644 --- a/lib/Conversion/TorchToLinalg/DataMovement.cpp +++ b/lib/Conversion/TorchToLinalg/DataMovement.cpp @@ -16,7 +16,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" @@ -252,11 +252,11 @@ public: llvm::all_of(expandShape, [](int64_t value) { return value == kUnknownSize; })) { - for (int i = 0; i < collapseShape.size(); i++) { + for (size_t i = 0; i < collapseShape.size(); i++) { collapseIndices.push_back(i); } - for (int i = 0; i < expandShape.size(); i++) { + for (size_t i = 0; i < expandShape.size(); i++) { expandIndices.push_back(i); } @@ -290,8 +290,8 @@ public: op, "total number of elements mismatch in the expansion"); } - static LogicalResult solveDynamicSize(SmallVector &inputShape, - SmallVector &outputShape) { + static void solveDynamicSize(SmallVector &inputShape, + SmallVector &outputShape) { int64_t inputProduct = 1; int64_t outputProduct = 1; @@ -316,7 +316,7 @@ public: if (inputDynamicValues + outputDynamicValues == 1) { if (inputDynamicValues) { int64_t missingValue = outputProduct / inputProduct; - for (int i = 0; i < inputShape.size(); i++) { + for (size_t i = 0; i < inputShape.size(); i++) { if (inputShape[i] == -1) { inputShape[i] = missingValue; break; @@ -324,7 +324,7 @@ public: } } else { int64_t missingValue = inputProduct / outputProduct; - for (int i = 0; i < outputShape.size(); i++) { + for (size_t i = 0; i < outputShape.size(); i++) { if (outputShape[i] == -1) { outputShape[i] = missingValue; break; @@ -332,8 +332,6 @@ public: } } } - - return success(); } LogicalResult @@ -625,9 +623,6 @@ public: } } - int64_t inputCount = inputAssociations.size(); - int64_t outputCount = outputAssociations.size(); - // Check if the shapes already match up to dynamic sizes. If so, we can just // cast as the result type because the previous loop sets up the necessary // dim checks in case of dynamic sizes. diff --git a/lib/Conversion/TorchToLinalg/IndirectDataMovement.cpp b/lib/Conversion/TorchToLinalg/IndirectDataMovement.cpp index 2098bb602..a94b09594 100644 --- a/lib/Conversion/TorchToLinalg/IndirectDataMovement.cpp +++ b/lib/Conversion/TorchToLinalg/IndirectDataMovement.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" diff --git a/lib/Conversion/TorchToLinalg/Linear.cpp b/lib/Conversion/TorchToLinalg/Linear.cpp index 9c01db32c..c9e92b625 100644 --- a/lib/Conversion/TorchToLinalg/Linear.cpp +++ b/lib/Conversion/TorchToLinalg/Linear.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Conversion/TorchToLinalg/Pooling.cpp b/lib/Conversion/TorchToLinalg/Pooling.cpp index d1828c474..fc1379e92 100644 --- a/lib/Conversion/TorchToLinalg/Pooling.cpp +++ b/lib/Conversion/TorchToLinalg/Pooling.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Conversion/TorchToLinalg/Random.cpp b/lib/Conversion/TorchToLinalg/Random.cpp index c8118b21d..427b42181 100644 --- a/lib/Conversion/TorchToLinalg/Random.cpp +++ b/lib/Conversion/TorchToLinalg/Random.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Conversion/TorchToLinalg/Reduction.cpp b/lib/Conversion/TorchToLinalg/Reduction.cpp index dc4e9704c..2549a1553 100644 --- a/lib/Conversion/TorchToLinalg/Reduction.cpp +++ b/lib/Conversion/TorchToLinalg/Reduction.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" diff --git a/lib/Conversion/TorchToLinalg/TensorConstructors.cpp b/lib/Conversion/TorchToLinalg/TensorConstructors.cpp index 013fdbb48..592e71229 100644 --- a/lib/Conversion/TorchToLinalg/TensorConstructors.cpp +++ b/lib/Conversion/TorchToLinalg/TensorConstructors.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" diff --git a/lib/Conversion/TorchToLinalg/TensorScalarInterop.cpp b/lib/Conversion/TorchToLinalg/TensorScalarInterop.cpp index 24b487c5b..d1d13b776 100644 --- a/lib/Conversion/TorchToLinalg/TensorScalarInterop.cpp +++ b/lib/Conversion/TorchToLinalg/TensorScalarInterop.cpp @@ -11,7 +11,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Conversion/TorchToLinalg/TorchToLinalg.cpp b/lib/Conversion/TorchToLinalg/TorchToLinalg.cpp index f8ebc349f..484307ecf 100644 --- a/lib/Conversion/TorchToLinalg/TorchToLinalg.cpp +++ b/lib/Conversion/TorchToLinalg/TorchToLinalg.cpp @@ -11,7 +11,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlow.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" @@ -43,7 +43,7 @@ public: registry.insert(); registry.insert(); registry.insert(); - registry.insert(); + registry.insert(); registry.insert(); TorchConversion::getBackendTypeConversionDependentDialects(registry); } @@ -53,7 +53,7 @@ public: ConversionTarget target(*context); target.addLegalDialect(); + tensor::TensorDialect, arith::ArithDialect>(); target.addLegalOp(); TypeConverter typeConverter; diff --git a/lib/Conversion/TorchToLinalg/Uncategorized.cpp b/lib/Conversion/TorchToLinalg/Uncategorized.cpp index 70b158e09..5ae82df6e 100644 --- a/lib/Conversion/TorchToLinalg/Uncategorized.cpp +++ b/lib/Conversion/TorchToLinalg/Uncategorized.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" #include "Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" diff --git a/lib/Conversion/TorchToLinalg/Utils.cpp b/lib/Conversion/TorchToLinalg/Utils.cpp index 57a50a688..8cdab3960 100644 --- a/lib/Conversion/TorchToLinalg/Utils.cpp +++ b/lib/Conversion/TorchToLinalg/Utils.cpp @@ -11,7 +11,7 @@ #include "../PassDetail.h" #include "PopulatePatterns.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Conversion/TorchToMhlo/Basic.cpp b/lib/Conversion/TorchToMhlo/Basic.cpp index a61202c0e..3e7cbf3b0 100644 --- a/lib/Conversion/TorchToMhlo/Basic.cpp +++ b/lib/Conversion/TorchToMhlo/Basic.cpp @@ -14,7 +14,7 @@ #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" #include "mlir-hlo/utils/hlo_utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "stablehlo/dialect/ChloOps.h" #include "torch-mlir/Conversion/Utils/Utils.h" diff --git a/lib/Conversion/TorchToMhlo/Gather.cpp b/lib/Conversion/TorchToMhlo/Gather.cpp index 1b1863347..12da1c8e3 100644 --- a/lib/Conversion/TorchToMhlo/Gather.cpp +++ b/lib/Conversion/TorchToMhlo/Gather.cpp @@ -13,7 +13,7 @@ #include "./MhloLegalizeUtils.h" #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "torch-mlir/Conversion/Utils/Utils.h" #include "torch-mlir/Dialect/Torch/IR/TorchDialect.h" diff --git a/lib/Conversion/TorchToMhlo/Linear.cpp b/lib/Conversion/TorchToMhlo/Linear.cpp index 2f5c7df4d..a97933ce8 100644 --- a/lib/Conversion/TorchToMhlo/Linear.cpp +++ b/lib/Conversion/TorchToMhlo/Linear.cpp @@ -13,7 +13,7 @@ #include "./MhloLegalizeUtils.h" #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "stablehlo/dialect/ChloOps.h" #include "torch-mlir/Conversion/Utils/Utils.h" diff --git a/lib/Conversion/TorchToMhlo/MhloLegalizeUtils.cpp b/lib/Conversion/TorchToMhlo/MhloLegalizeUtils.cpp index 5cab3e7d1..9a93981c5 100644 --- a/lib/Conversion/TorchToMhlo/MhloLegalizeUtils.cpp +++ b/lib/Conversion/TorchToMhlo/MhloLegalizeUtils.cpp @@ -9,7 +9,7 @@ #include "./MhloLegalizeUtils.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "torch-mlir/Conversion/TorchToMhlo/TorchToMhlo.h" #include "torch-mlir/Dialect/Torch/IR/TorchOps.h" diff --git a/lib/Conversion/TorchToMhlo/Pooling.cpp b/lib/Conversion/TorchToMhlo/Pooling.cpp index 514f941a4..60529e886 100644 --- a/lib/Conversion/TorchToMhlo/Pooling.cpp +++ b/lib/Conversion/TorchToMhlo/Pooling.cpp @@ -13,7 +13,7 @@ #include "./MhloLegalizeUtils.h" #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "stablehlo/dialect/ChloOps.h" #include "torch-mlir/Conversion/Utils/Utils.h" diff --git a/lib/Conversion/TorchToMhlo/Reduction.cpp b/lib/Conversion/TorchToMhlo/Reduction.cpp index a185a27d4..b4f815436 100644 --- a/lib/Conversion/TorchToMhlo/Reduction.cpp +++ b/lib/Conversion/TorchToMhlo/Reduction.cpp @@ -13,7 +13,7 @@ #include "./MhloLegalizeUtils.h" #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "torch-mlir/Conversion/Utils/Utils.h" #include "torch-mlir/Dialect/Torch/IR/TorchDialect.h" diff --git a/lib/Conversion/TorchToMhlo/TorchToMhlo.cpp b/lib/Conversion/TorchToMhlo/TorchToMhlo.cpp index 67ff28c39..21d991bd7 100644 --- a/lib/Conversion/TorchToMhlo/TorchToMhlo.cpp +++ b/lib/Conversion/TorchToMhlo/TorchToMhlo.cpp @@ -12,7 +12,7 @@ #include "../PassDetail.h" #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Traits.h" #include "mlir/IR/Matchers.h" @@ -42,14 +42,14 @@ public: registry.insert(); registry.insert(); registry.insert(); - registry.insert(); + registry.insert(); TorchConversion::getBackendTypeConversionDependentDialects(registry); } void runOnOperation() override { MLIRContext *context = &getContext(); ConversionTarget target(*context); target.addLegalDialect(); + tensor::TensorDialect, arith::ArithDialect>(); TypeConverter typeConverter; typeConverter.addConversion([](Type type) { return type; }); diff --git a/lib/Conversion/TorchToMhlo/ViewLike.cpp b/lib/Conversion/TorchToMhlo/ViewLike.cpp index e89f3f389..baf34d7cb 100644 --- a/lib/Conversion/TorchToMhlo/ViewLike.cpp +++ b/lib/Conversion/TorchToMhlo/ViewLike.cpp @@ -13,7 +13,7 @@ #include "./MhloLegalizeUtils.h" #include "./PopulatePatterns.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "torch-mlir/Conversion/Utils/Utils.h" #include "torch-mlir/Dialect/Torch/IR/TorchDialect.h" diff --git a/lib/Conversion/TorchToSCF/TorchToSCF.cpp b/lib/Conversion/TorchToSCF/TorchToSCF.cpp index 0f833eab5..b0c2e821c 100644 --- a/lib/Conversion/TorchToSCF/TorchToSCF.cpp +++ b/lib/Conversion/TorchToSCF/TorchToSCF.cpp @@ -10,7 +10,7 @@ #include "torch-mlir/Conversion/TorchToSCF/TorchToSCF.h" #include "../PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/IR/BuiltinTypes.h" #include "mlir/Transforms/DialectConversion.h" @@ -321,7 +321,7 @@ namespace { class ConvertTorchToSCF : public ConvertTorchToSCFBase { public: void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); + registry.insert(); TorchConversion::getBackendTypeConversionDependentDialects(registry); } @@ -329,7 +329,7 @@ public: MLIRContext *context = &getContext(); ConversionTarget target(*context); target.addLegalDialect(); + arith::ArithDialect>(); TypeConverter typeConverter; typeConverter.addConversion([](Type type) { return type; }); diff --git a/lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp b/lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp index d92a29554..03dcd1fd2 100644 --- a/lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp +++ b/lib/Conversion/TorchToTMTensor/TorchToTMTensor.cpp @@ -10,7 +10,7 @@ #include "torch-mlir/Conversion/TorchToTMTensor/TorchToTMTensor.h" #include "../PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" @@ -614,7 +614,7 @@ public: registry.insert(); registry.insert(); registry.insert(); - registry.insert(); + registry.insert(); registry.insert(); TorchConversion::getBackendTypeConversionDependentDialects(registry); } @@ -623,7 +623,7 @@ public: MLIRContext *context = &getContext(); ConversionTarget target(*context); target.addLegalDialect(); TypeConverter typeConverter; diff --git a/lib/Conversion/TorchToTosa/TorchToTosa.cpp b/lib/Conversion/TorchToTosa/TorchToTosa.cpp index 1e7407da3..6f3abb3b4 100644 --- a/lib/Conversion/TorchToTosa/TorchToTosa.cpp +++ b/lib/Conversion/TorchToTosa/TorchToTosa.cpp @@ -12,7 +12,7 @@ #include "torch-mlir/Conversion/TorchToTosa/TosaLegalizeUtils.h" #include "../PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tosa/IR/TosaOps.h" #include "mlir/Dialect/Traits.h" @@ -3511,7 +3511,7 @@ public: void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); registry.insert(); - registry.insert(); + registry.insert(); TorchConversion::getBackendTypeConversionDependentDialects(registry); } @@ -3519,7 +3519,7 @@ public: MLIRContext *context = &getContext(); ConversionTarget target(*context); target.addLegalDialect(); + arith::ArithDialect>(); TypeConverter typeConverter; typeConverter.addConversion([](Type type) { return type; }); diff --git a/lib/Conversion/Utils/CMakeLists.txt b/lib/Conversion/Utils/CMakeLists.txt index 6b352bdc5..3f0f67b49 100644 --- a/lib/Conversion/Utils/CMakeLists.txt +++ b/lib/Conversion/Utils/CMakeLists.txt @@ -5,7 +5,7 @@ add_mlir_conversion_library(TorchMLIRConversionUtils ${PROJECT_SOURCE_DIR}/include/torch-mlir/Conversion/Utils LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRLinalgDialect TorchMLIRTorchDialect ) diff --git a/lib/Conversion/Utils/Utils.cpp b/lib/Conversion/Utils/Utils.cpp index a0bf7bb67..d800a6907 100644 --- a/lib/Conversion/Utils/Utils.cpp +++ b/lib/Conversion/Utils/Utils.cpp @@ -9,7 +9,7 @@ #include "torch-mlir/Conversion/Utils/Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Dialect/TorchConversion/IR/TorchConversionDialect.cpp b/lib/Dialect/TorchConversion/IR/TorchConversionDialect.cpp index 9be768986..f352e0175 100644 --- a/lib/Dialect/TorchConversion/IR/TorchConversionDialect.cpp +++ b/lib/Dialect/TorchConversion/IR/TorchConversionDialect.cpp @@ -8,13 +8,13 @@ //===----------------------------------------------------------------------===// #include "torch-mlir/Dialect/TorchConversion/IR/TorchConversionDialect.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/IR/DialectImplementation.h" #include "mlir/Transforms/InliningUtils.h" -#include "torch-mlir/Dialect/TorchConversion/IR/TorchConversionOps.h" #include "torch-mlir/Dialect/Torch/IR/TorchOps.h" #include "torch-mlir/Dialect/Torch/IR/TorchTypes.h" +#include "torch-mlir/Dialect/TorchConversion/IR/TorchConversionOps.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/TypeSwitch.h" diff --git a/lib/Dialect/TorchConversion/Transforms/VerifyLinalgOnTensorsBackendContract.cpp b/lib/Dialect/TorchConversion/Transforms/VerifyLinalgOnTensorsBackendContract.cpp index 62c3e8faf..cae5586b8 100644 --- a/lib/Dialect/TorchConversion/Transforms/VerifyLinalgOnTensorsBackendContract.cpp +++ b/lib/Dialect/TorchConversion/Transforms/VerifyLinalgOnTensorsBackendContract.cpp @@ -10,7 +10,7 @@ #include "PassDetail.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" @@ -71,8 +71,7 @@ class VerifyLinalgOnTensorsBackendContractPass // Basic scalar operations. target.addDynamicallyLegalDialect(isLegalScalarOp); target.addDynamicallyLegalDialect(isLegalScalarOp); - target.addDynamicallyLegalDialect( - isLegalScalarOp); + target.addDynamicallyLegalDialect(isLegalScalarOp); // Tensor operations should go through linalg and the tensor dialect. target.addDynamicallyLegalDialect(opHasLegalTypes); diff --git a/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp b/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp index c28ac45eb..bbb7a0a08 100644 --- a/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp +++ b/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp @@ -10,7 +10,7 @@ #include "PassDetail.h" #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Shape/IR/Shape.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" @@ -53,7 +53,7 @@ class VerifyMhloBackendContractPass target.addLegalDialect(); target.addLegalDialect(); target.addLegalDialect(); - target.addLegalDialect(); + target.addLegalDialect(); RewritePatternSet patterns(context); if (failed(applyFullConversion(module, target, std::move(patterns)))) { diff --git a/lib/Dialect/TorchConversion/Transforms/VerifyTosaBackendContract.cpp b/lib/Dialect/TorchConversion/Transforms/VerifyTosaBackendContract.cpp index e86948ebb..a29e14a3d 100644 --- a/lib/Dialect/TorchConversion/Transforms/VerifyTosaBackendContract.cpp +++ b/lib/Dialect/TorchConversion/Transforms/VerifyTosaBackendContract.cpp @@ -9,7 +9,7 @@ #include "PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tosa/IR/TosaOps.h" diff --git a/lib/RefBackend/RefBackend.cpp b/lib/RefBackend/RefBackend.cpp index cde11a481..873c92e93 100644 --- a/lib/RefBackend/RefBackend.cpp +++ b/lib/RefBackend/RefBackend.cpp @@ -15,7 +15,7 @@ //===----------------------------------------------------------------------===// #include "PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" @@ -304,7 +304,7 @@ class ExpandOpsForLLVM : public ExpandOpsForLLVMBase { ConversionTarget target(*context); target.addLegalDialect(); target.addLegalDialect(); - target.addLegalDialect(); + target.addLegalDialect(); target.addIllegalOp(); target.addIllegalOp(); if (failed(applyPartialConversion(func, target, std::move(patterns)))) { @@ -352,7 +352,7 @@ class MemrefCopyOpToLinalg : public OpRewritePattern { LogicalResult matchAndRewrite(memref::CopyOp copyOp, PatternRewriter &rewriter) const override { Operation *linalgCopy = createLinalgCopyOp( - rewriter, copyOp.getLoc(), copyOp.source(), copyOp.target()); + rewriter, copyOp.getLoc(), copyOp.getSource(), copyOp.getTarget()); rewriter.replaceOp(copyOp, linalgCopy->getResults()); return success(); }