From a6b88827397baf60e922518d50ce6bd672f53c76 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 21 Jun 2021 06:39:17 -0700
Subject: [PATCH] Integrate LLVM at llvm/llvm-project@b650778dc4ac

Updates LLVM usage to match
[b650778dc4ac](https://github.com/llvm/llvm-project/commit/b650778dc4ac)

PiperOrigin-RevId: 380565709
---
 BUILD                                                         | 2 ++
 WORKSPACE                                                     | 4 ++--
 build_tools/llvm_version.txt                                  | 2 +-
 include/mlir-hlo/Dialect/mhlo/IR/disc_ral_ops.h               | 1 +
 lib/Dialect/mhlo/IR/hlo_ops.cc                                | 1 +
 lib/Dialect/mhlo/transforms/legalize_tensor_load_op.cc        | 1 +
 .../mhlo/transforms/lhlo_legalize_to_parallel_loops.cc        | 3 ++-
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/BUILD b/BUILD
index 8d84c1d..a5c2329 100644
--- a/BUILD
+++ b/BUILD
@@ -526,6 +526,7 @@ cc_library(
         "@llvm-project//mlir:ControlFlowInterfaces",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:InferTypeOpInterface",
+        "@llvm-project//mlir:MemRefDialect",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:Shape",
         "@llvm-project//mlir:SideEffects",
@@ -679,6 +680,7 @@ cc_library(
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:InferTypeOpInterface",
         "@llvm-project//mlir:LoopLikeInterface",
+        "@llvm-project//mlir:MemRefDialect",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:SideEffects",
         "@llvm-project//mlir:StandardOps",
diff --git a/WORKSPACE b/WORKSPACE
index 708c586..b610a5f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,9 +15,9 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "134723edd5bf06ff6ec8aca7b87c56e5bd70ccae"
+LLVM_COMMIT = "b650778dc4acbab8a5415e743604a2a0afabea3d"
 
-LLVM_SHA256 = "0d9843fec643cf84557e06f5d1d008828923e86fc4e48966151e10b6d2cd2e6d"
+LLVM_SHA256 = "e406c4f09390dbfc534cad73122345b0b7e678968d911c1e97823457f9d7ac70"
 
 LLVM_BAZEL_TAG = "llvm-project-{commit}".format(commit = LLVM_COMMIT)
 
diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index f28d32a..fa2a8ae 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1,2 +1,2 @@
-134723edd5bf06ff6ec8aca7b87c56e5bd70ccae
+b650778dc4acbab8a5415e743604a2a0afabea3d
 
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/disc_ral_ops.h b/include/mlir-hlo/Dialect/mhlo/IR/disc_ral_ops.h
index a23d02e..3b57df4 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/disc_ral_ops.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/disc_ral_ops.h
@@ -19,6 +19,7 @@ limitations under the License.
 #define TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_MHLO_IR_DISC_RAL_OPS_H_
 
 #include "llvm/ADT/StringRef.h"
+#include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BuiltinTypes.h"
diff --git a/lib/Dialect/mhlo/IR/hlo_ops.cc b/lib/Dialect/mhlo/IR/hlo_ops.cc
index d7fb7f0..2767dcd 100644
--- a/lib/Dialect/mhlo/IR/hlo_ops.cc
+++ b/lib/Dialect/mhlo/IR/hlo_ops.cc
@@ -40,6 +40,7 @@ limitations under the License.
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops_common.h"
 #include "mlir-hlo/utils/convert_op_folder.h"
 #include "mlir-hlo/utils/hlo_utils.h"
+#include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
diff --git a/lib/Dialect/mhlo/transforms/legalize_tensor_load_op.cc b/lib/Dialect/mhlo/transforms/legalize_tensor_load_op.cc
index 81f02a1..ec30fe3 100644
--- a/lib/Dialect/mhlo/transforms/legalize_tensor_load_op.cc
+++ b/lib/Dialect/mhlo/transforms/legalize_tensor_load_op.cc
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "mlir-hlo/Dialect/mhlo/transforms/PassDetail.h"
 #include "mlir-hlo/Dialect/mhlo/transforms/passes.h"
+#include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"  // TF:llvm-project
diff --git a/lib/Dialect/mhlo/transforms/lhlo_legalize_to_parallel_loops.cc b/lib/Dialect/mhlo/transforms/lhlo_legalize_to_parallel_loops.cc
index 79a3ec4..312e5c5 100644
--- a/lib/Dialect/mhlo/transforms/lhlo_legalize_to_parallel_loops.cc
+++ b/lib/Dialect/mhlo/transforms/lhlo_legalize_to_parallel_loops.cc
@@ -704,7 +704,8 @@ struct LhloLegalizeToParallelLoopsPass
     : public LhloLegalizeToParallelLoopsPassBase<
           LhloLegalizeToParallelLoopsPass> {
   void getDependentDialects(DialectRegistry& registry) const override {
-    registry.insert<StandardOpsDialect, scf::SCFDialect>();
+    registry
+        .insert<StandardOpsDialect, memref::MemRefDialect, scf::SCFDialect>();
   }
 
   void runOnFunction() override {