Integrate llvm-project at 8353403f0833 and bump dependencies. (#9849)

* Integrate llvm-project at 8353403f0833 and bump dependencies. * llvm-project: 8353403f0833 * mlir-hlo: f9507dccb72c79f99a26d3a440cf09aaa091a59b * tensorflow: 5322479bfbdf57d75582768f07159bff6bc3559d * Fix iree-dialects/python/CMakeLists.txt * "mlir-c/Registration.h" -> "mlir-c/RegisterEverything.h" * Temporarily add register everything to iree-dialects for old behavior (and remove unused import of transforms) See for python changes: https://discourse.llvm.org/t/psa-mlir-c-python-api-registration-overhaul/63873 Co-authored-by: Stella Laurenzo <laurenzo@google.com>
iree-org · Jul 21, 2022 · c6616e0 · c6616e0
1 parent af22305
commit c6616e0
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
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 = "46152aac7417aa0d1506b782e055448f431e1629"
+TENSORFLOW_COMMIT = "5322479bfbdf57d75582768f07159bff6bc3559d"
 
 git_repository(
     name = "org_tensorflow",

diff --git a/integrations/tensorflow/iree-dialects/include/iree-dialects-c/Dialects.h b/integrations/tensorflow/iree-dialects/include/iree-dialects-c/Dialects.h
@@ -9,7 +9,7 @@
 
 #include "mlir-c/IR.h"
 #include "mlir-c/Pass.h"
-#include "mlir-c/Registration.h"
+#include "mlir-c/RegisterEverything.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/integrations/tensorflow/iree-dialects/python/IREEDialectsModule.cpp b/integrations/tensorflow/iree-dialects/python/IREEDialectsModule.cpp
@@ -10,7 +10,7 @@
 #include "mlir-c/BuiltinAttributes.h"
 #include "mlir-c/BuiltinTypes.h"
 #include "mlir-c/Diagnostics.h"
-#include "mlir-c/Registration.h"
+#include "mlir-c/RegisterEverything.h"
 #include "mlir/Bindings/Python/PybindAdaptors.h"
 
 namespace py = pybind11;

diff --git a/llvm-external-projects/iree-dialects/include/iree-dialects-c/Dialects.h b/llvm-external-projects/iree-dialects/include/iree-dialects-c/Dialects.h
@@ -9,7 +9,7 @@
 
 #include "mlir-c/IR.h"
 #include "mlir-c/Pass.h"
-#include "mlir-c/Registration.h"
+#include "mlir-c/RegisterEverything.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/llvm-external-projects/iree-dialects/python/CMakeLists.txt b/llvm-external-projects/iree-dialects/python/CMakeLists.txt
@@ -87,13 +87,14 @@ declare_mlir_python_extension(IREEDialectsPythonExtensions.Main
 set(_source_components
   # TODO: Core is now implicitly building/registering all dialects, increasing
   # build burden by ~5x. Make it stop.
+  MLIRPythonExtension.RegisterEverything
+
   MLIRPythonSources.Core
   MLIRPythonSources.Dialects.builtin
   MLIRPythonSources.Dialects.cf
   MLIRPythonSources.Dialects.func
   MLIRPythonSources.Dialects.pdl
   MLIRPythonSources.Dialects.transform
-  MLIRPythonSources.Passes
   IREEDialectsPythonSources
   IREEDialectsPythonExtensions
 )
@@ -110,7 +111,7 @@ add_mlir_python_common_capi_library(IREEDialectsAggregateCAPI
 add_mlir_python_modules(IREEDialectsPythonModules
   ROOT_PREFIX "${IREE_DIALECTS_BINARY_DIR}/python_packages/iree_dialects/iree/compiler"
   INSTALL_PREFIX "python_packages/iree_dialects/iree/compiler"
-  DECLARED_SOURCES 
+  DECLARED_SOURCES
     ${_source_components}
   COMMON_CAPI_LINK_LIBS
     IREEDialectsAggregateCAPI

diff --git a/llvm-external-projects/iree-dialects/python/IREEDialectsModule.cpp b/llvm-external-projects/iree-dialects/python/IREEDialectsModule.cpp
@@ -10,7 +10,7 @@
 #include "mlir-c/BuiltinAttributes.h"
 #include "mlir-c/BuiltinTypes.h"
 #include "mlir-c/Diagnostics.h"
-#include "mlir-c/Registration.h"
+#include "mlir-c/RegisterEverything.h"
 #include "mlir/Bindings/Python/PybindAdaptors.h"
 
 namespace py = pybind11;

diff --git a/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/base.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/base.py
@@ -26,7 +26,6 @@
 from .... import (
     ir,
     passmanager,
-    transforms as unused_transforms,
 )
 
 

diff --git a/third_party/llvm-project b/third_party/llvm-project
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ @@
     from .... import (
         ir,
         passmanager,
-        transforms as unused_transforms,
     )
@@ Expand Down @@