Integrate llvm-project and bump dependencies. (#10140)

* llvm-project: 619fd8c2ab505d8f79cbbbe3fd09b02f6640e1b1 * mlir-hlo: cb55a7168c1841d05287677746a39a5de7cb855f * tensorflow: fc4021a8dd654606cd95e61a033691157853e122 Additional changes: * rename member functions for tenor ops * Remove reluN tosa tests * carry patches for llvm and mhlo
iree-org · Aug 19, 2022 · 979d6ea · 979d6ea
1 parent cb0f8d4
commit 979d6ea
Show file tree

Hide file tree

Showing 20 changed files with 18 additions and 40 deletions.
diff --git a/compiler/src/iree/compiler/Codegen/Common/TileDispatchUsingInterface.cpp b/compiler/src/iree/compiler/Codegen/Common/TileDispatchUsingInterface.cpp
@@ -445,7 +445,7 @@ struct SwapExtractSliceWithTiledProducer
 
   LogicalResult matchAndRewrite(tensor::ExtractSliceOp sliceOp,
                                 PatternRewriter &rewriter) const override {
-    OpResult producer = sliceOp.source().dyn_cast<OpResult>();
+    OpResult producer = sliceOp.getSource().dyn_cast<OpResult>();
     if (!producer) {
       return rewriter.notifyMatchFailure(sliceOp, "source uses bb arg");
     }
@@ -473,7 +473,7 @@ struct SwapExtractSliceWithDispatchTensorLoad
   LogicalResult matchAndRewrite(tensor::ExtractSliceOp sliceOp,
                                 PatternRewriter &rewriter) const override {
     auto loadOp =
-        sliceOp.source().getDefiningOp<IREE::Flow::DispatchTensorLoadOp>();
+        sliceOp.getSource().getDefiningOp<IREE::Flow::DispatchTensorLoadOp>();
     if (!loadOp) return failure();
 
     SmallVector<OpFoldResult> combinedOffsets, combinedSizes, combinedStrides;

diff --git a/compiler/src/iree/compiler/InputConversion/MHLO/MHLOToLinalgOnTensors.cpp b/compiler/src/iree/compiler/InputConversion/MHLO/MHLOToLinalgOnTensors.cpp
@@ -461,7 +461,7 @@ struct ConvertMHLOToLinalgOnTensorsPass
     RewritePatternSet patterns(&getContext());
     MLIRContext *context = &getContext();
 
-    auto typeConverter = mhlo::createHloToLinalgSignedIntegerConverter();
+    auto typeConverter = mhlo::createHloToLinalgTypeConverter();
     typeConverter->addArgumentMaterialization(scalarToTensor);
     // NOTE: not using corresponding setupMHLOToFlowPatterns because the entire
     // MHLO dialects are marked illegal by this pass.

diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
@@ -7,7 +7,7 @@
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-TENSORFLOW_COMMIT = "1986967601040a368e44b79339567d49f72a368f"
+TENSORFLOW_COMMIT = "fc4021a8dd654606cd95e61a033691157853e122"
 
 git_repository(
     name = "org_tensorflow",

diff --git a/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/IR/LinalgExtOps.cpp b/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/IR/LinalgExtOps.cpp
@@ -1486,7 +1486,7 @@ struct FoldTensorCastOp : public OpInterfaceRewritePattern<LinalgExtOp> {
     for (OpOperand *opOperand : op.getInputOperands()) {
       auto tensorCastOp = opOperand->get().getDefiningOp<tensor::CastOp>();
       newOperands.push_back(canFoldIntoConsumerOp(tensorCastOp)
-                                ? tensorCastOp.source()
+                                ? tensorCastOp.getSource()
                                 : opOperand->get());
     }
     // Init tensors may fold, in which case the resultType must also change.

diff --git a/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/Transforms/Fusion.cpp b/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/Transforms/Fusion.cpp
@@ -78,7 +78,7 @@ FailureOr<FusionResult> LinalgExtFusionPattern::returningMatchAndRewrite(
                        .getDefiningOp<tensor::ExtractSliceOp>();
     if (!sliceOp)
       return failure();
-    auto producerOp = sliceOp.source().getDefiningOp<TilingInterface>();
+    auto producerOp = sliceOp.getSource().getDefiningOp<TilingInterface>();
     if (!producerOp || producerOp->getNumResults() != 1)
       return failure();
 

diff --git a/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/Transforms/Tiling.cpp b/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/Transforms/Tiling.cpp
@@ -192,7 +192,7 @@ struct OpTilingPattern : public OpInterfaceRewritePattern<TilingInterface> {
 /// tensor.extract_slice` to `tensor.extract_slice -> `TilingInterface`.
 FailureOr<Operation *> SwapTilingInterfaceOp::returningMatchAndRewrite(
     tensor::ExtractSliceOp sliceOp, PatternRewriter &rewriter) const {
-  auto sourceOp = sliceOp.source().getDefiningOp<TilingInterface>();
+  auto sourceOp = sliceOp.getSource().getDefiningOp<TilingInterface>();
   if (!sourceOp)
     return failure();
   SmallVector<Operation *> tiledOps = sourceOp.getTiledImplementation(

diff --git a/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/Transforms/Utils.cpp b/integrations/tensorflow/iree-dialects/lib/Dialect/LinalgExt/Transforms/Utils.cpp
@@ -81,7 +81,7 @@ Value mlir::iree_compiler::IREE::LinalgExt::createMatchingSubsetInsertOp(
     OpBuilder &b, Location loc, tensor::ExtractSliceOp subsetExtractOp,
     Value source, Value dest) {
   return b.create<tensor::InsertSliceOp>(
-      loc, subsetExtractOp.source().getType(), source, dest,
+      loc, subsetExtractOp.getSource().getType(), source, dest,
       subsetExtractOp.offsets(), subsetExtractOp.sizes(),
       subsetExtractOp.strides(), subsetExtractOp.static_offsets(),
       subsetExtractOp.static_sizes(), subsetExtractOp.static_strides());

diff --git a/...ons/tensorflow/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp b/...ons/tensorflow/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
@@ -335,7 +335,7 @@ static linalg::LinalgOp findSingleLinalgOpDefiningAll(ValueRange range) {
     // mechanism of tracking op replacement at creation, or even different
     // patterns that identify the "main" result of a transformation.
     while (auto castOp = value.getDefiningOp<tensor::CastOp>())
-      value = castOp.source();
+      value = castOp.getSource();
 
     if (auto currentSourceOp = value.getDefiningOp<linalg::LinalgOp>()) {
       if (!sourceOp || sourceOp == currentSourceOp) {

diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/IR/LinalgExtOps.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/IR/LinalgExtOps.cpp
@@ -1487,7 +1487,7 @@ struct FoldTensorCastOp : public OpInterfaceRewritePattern<LinalgExtOp> {
     for (OpOperand *opOperand : op.getInputOperands()) {
       auto tensorCastOp = opOperand->get().getDefiningOp<tensor::CastOp>();
       newOperands.push_back(canFoldIntoConsumerOp(tensorCastOp)
-                                ? tensorCastOp.source()
+                                ? tensorCastOp.getSource()
                                 : opOperand->get());
     }
     // Init tensors may fold, in which case the resultType must also change.

diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Passes/Tiling.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Passes/Tiling.cpp
@@ -362,8 +362,7 @@ void TilingInterfaceTilingPass::runOnOperation() {
               buildFlowWorkgroupInfoOp<IREE::Input::DispatchWorkgroupIDOp>(
                   builder, dim),
               buildFlowWorkgroupInfoOp<IREE::Input::DispatchWorkgroupCountOp>(
-                  builder, dim),
-              linalg::DistributionMethod::Cyclic};
+                  builder, dim)};
         }
         return procInfo;
       }};

diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Transforms/Fusion.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Transforms/Fusion.cpp
@@ -33,7 +33,7 @@ FailureOr<FusionResult> LinalgExtFusionPattern::returningMatchAndRewrite(
                        .getDefiningOp<tensor::ExtractSliceOp>();
     if (!sliceOp)
       return failure();
-    auto producerOp = sliceOp.source().getDefiningOp<TilingInterface>();
+    auto producerOp = sliceOp.getSource().getDefiningOp<TilingInterface>();
     if (!producerOp || producerOp->getNumResults() != 1)
       return failure();
 

diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Transforms/Tiling.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Transforms/Tiling.cpp
@@ -192,7 +192,7 @@ struct OpTilingPattern : public OpInterfaceRewritePattern<TilingInterface> {
 /// tensor.extract_slice` to `tensor.extract_slice -> `TilingInterface`.
 FailureOr<Operation *> SwapTilingInterfaceOp::returningMatchAndRewrite(
     tensor::ExtractSliceOp sliceOp, PatternRewriter &rewriter) const {
-  auto sourceOp = sliceOp.source().getDefiningOp<TilingInterface>();
+  auto sourceOp = sliceOp.getSource().getDefiningOp<TilingInterface>();
   if (!sourceOp)
     return failure();
   SmallVector<Operation *> tiledOps = sourceOp.getTiledImplementation(

diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Transforms/Utils.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Transforms/Utils.cpp
@@ -81,7 +81,7 @@ Value mlir::iree_compiler::IREE::LinalgExt::createMatchingSubsetInsertOp(
     OpBuilder &b, Location loc, tensor::ExtractSliceOp subsetExtractOp,
     Value source, Value dest) {
   return b.create<tensor::InsertSliceOp>(
-      loc, subsetExtractOp.source().getType(), source, dest,
+      loc, subsetExtractOp.getSource().getType(), source, dest,
       subsetExtractOp.offsets(), subsetExtractOp.sizes(),
       subsetExtractOp.strides(), subsetExtractOp.static_offsets(),
       subsetExtractOp.static_sizes(), subsetExtractOp.static_strides());

diff --git a/...ernal-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp b/...ernal-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/StructuredTransformOpsExt.cpp
@@ -335,7 +335,7 @@ static linalg::LinalgOp findSingleLinalgOpDefiningAll(ValueRange range) {
     // mechanism of tracking op replacement at creation, or even different
     // patterns that identify the "main" result of a transformation.
     while (auto castOp = value.getDefiningOp<tensor::CastOp>())
-      value = castOp.source();
+      value = castOp.getSource();
 
     if (auto currentSourceOp = value.getDefiningOp<linalg::LinalgOp>()) {
       if (!sourceOp || sourceOp == currentSourceOp) {

diff --git a/tests/e2e/tosa_ops/BUILD b/tests/e2e/tosa_ops/BUILD
@@ -50,7 +50,6 @@ LLVM_SRCS = enforce_glob(
         "pad.mlir",
         "reciprocal.mlir",
         "reduce.mlir",
-        "reluN.mlir",
         "reshape.mlir",
         "rsqrt.mlir",
         "select.mlir",
@@ -103,7 +102,6 @@ VMVX_SRCS = enforce_glob(
         "negate.mlir",
         "pad.mlir",
         "reciprocal.mlir",
-        "reluN.mlir",
         "reshape.mlir",
         "rsqrt.mlir",
         "select.mlir",
@@ -162,7 +160,6 @@ VMVX_MICROKERNELS_SRCS = enforce_glob(
         "pad.mlir",
         "reciprocal.mlir",
         "reduce.mlir",
-        "reluN.mlir",
         "reshape.mlir",
         "rsqrt.mlir",
         "select.mlir",
@@ -220,7 +217,6 @@ VULKAN_SRCS = enforce_glob(
         "pad.mlir",
         "reciprocal.mlir",
         "reduce.mlir",
-        "reluN.mlir",
         "reshape.mlir",
         "rsqrt.mlir",
         "select.mlir",

diff --git a/tests/e2e/tosa_ops/CMakeLists.txt b/tests/e2e/tosa_ops/CMakeLists.txt
@@ -44,7 +44,6 @@ iree_check_single_backend_test_suite(
     "pad.mlir"
     "reciprocal.mlir"
     "reduce.mlir"
-    "reluN.mlir"
     "reshape.mlir"
     "rsqrt.mlir"
     "select.mlir"
@@ -95,7 +94,6 @@ iree_check_single_backend_test_suite(
     "negate.mlir"
     "pad.mlir"
     "reciprocal.mlir"
-    "reluN.mlir"
     "reshape.mlir"
     "rsqrt.mlir"
     "select.mlir"
@@ -147,7 +145,6 @@ iree_check_single_backend_test_suite(
     "pad.mlir"
     "reciprocal.mlir"
     "reduce.mlir"
-    "reluN.mlir"
     "reshape.mlir"
     "rsqrt.mlir"
     "select.mlir"
@@ -200,7 +197,6 @@ iree_check_single_backend_test_suite(
     "pad.mlir"
     "reciprocal.mlir"
     "reduce.mlir"
-    "reluN.mlir"
     "reshape.mlir"
     "rsqrt.mlir"
     "select.mlir"

diff --git a/tests/e2e/tosa_ops/reluN.mlir b/tests/e2e/tosa_ops/reluN.mlir
diff --git a/third_party/llvm-project b/third_party/llvm-project
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
diff --git a/third_party/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorOps.cpp b/third_party/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorOps.cpp
@@ -478,7 +478,7 @@ struct FoldTensorCastOp : public OpInterfaceRewritePattern<TMTensorOp> {
     for (OpOperand *opOperand : op.getInputOperands()) {
       auto tensorCastOp = opOperand->get().getDefiningOp<tensor::CastOp>();
       newOperands.push_back(canFoldIntoConsumerOp(tensorCastOp)
-                                ? tensorCastOp.source()
+                                ? tensorCastOp.getSource()
                                 : opOperand->get());
     }
     // Init tensors may fold, in which case the resultType must also change.