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>
diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
index 2c35d39..d5a081b 100644
--- 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
index cddf291..4684e9c 100644
--- 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
index 4954f9f..14627ef 100644
--- 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
index cddf291..4684e9c 100644
--- 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
index 8ee012e..db1dab9 100644
--- a/llvm-external-projects/iree-dialects/python/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/python/CMakeLists.txt
@@ -87,13 +87,14 @@
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_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
index 4954f9f..14627ef 100644
--- 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
index f0cb05e..653d53b 100644
--- 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
index 617a0b5..6f133cf 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 617a0b5e0f1ed18d3eec1231d1db70f61d3e04c0
+Subproject commit 6f133cf76bf636b61b0a2a5351cb1d123a5a117b
diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index 518b159..0b80e1d 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo
@@ -1 +1 @@
-Subproject commit 518b1598aaf391d3b6d22b3282fa0a5ea128182c
+Subproject commit 0b80e1d8d47b498fe468f1494cda1d6292059515
