From 635fc1d358b4d4037cc1631472cd223c604b91ce Mon Sep 17 00:00:00 2001 From: Abhishek Varma Date: Wed, 7 Jan 2026 08:21:25 +0000 Subject: [PATCH 1/3] Integrate llvm/llvm-project@55eaa6c27b Existing local reverts carried forward: * Local revert of https://github.com/llvm/llvm-project/pull/169614 due to https://github.com/llvm/llvm-project/issues/172932. * https://github.com/llvm/llvm-project/pull/174084 -- causes linker errors related to rtti in stablehlo code * https://github.com/llvm/llvm-project/commit/2b903df797f858ed5626bbb5aebd92872322298f -- follow up fix to the above (doesn't fix it for us) Signed-off-by: Abhishek Varma --- third_party/llvm-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/llvm-project b/third_party/llvm-project index 12d80f913c5a..996f32c436f8 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project @@ -1 +1 @@ -Subproject commit 12d80f913c5a0f13f54610e9b0524137301665e3 +Subproject commit 996f32c436f8ecd776f95c86f61b07123328c89f From d9acb9cd7f5f5ccfcbf59ee77f5c91e584de3385 Mon Sep 17 00:00:00 2001 From: Abhishek Varma Date: Thu, 8 Jan 2026 10:23:56 +0000 Subject: [PATCH 2/3] Try with local fix for namespace shadowing 174156 Signed-off-by: Abhishek Varma --- third_party/llvm-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/llvm-project b/third_party/llvm-project index 996f32c436f8..2eaa29c3c567 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project @@ -1 +1 @@ -Subproject commit 996f32c436f8ecd776f95c86f61b07123328c89f +Subproject commit 2eaa29c3c5675ebb63dfeb40ffda9abe6a525482 From bf7aa7ab2b88f28a2f259cfa0771ae0fbcec40f1 Mon Sep 17 00:00:00 2001 From: Abhishek Varma Date: Thu, 8 Jan 2026 19:46:49 +0000 Subject: [PATCH 3/3] Windows DLL colocation fix Signed-off-by: Abhishek Varma --- compiler/bindings/python/CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/compiler/bindings/python/CMakeLists.txt b/compiler/bindings/python/CMakeLists.txt index 5a148eddcdcf..5956c2d24cb8 100644 --- a/compiler/bindings/python/CMakeLists.txt +++ b/compiler/bindings/python/CMakeLists.txt @@ -416,6 +416,29 @@ add_custom_target(IREECompilerPythonDylibFiles add_dependencies(IREECompilerPythonModules IREECompilerPythonDylibFiles) +################################################################################ +# Windows DLL colocation fix +# On Windows, the nanobind-mlir.dll ends up in iree/build/_mlir_libs/ but we +# need to copy it to iree/compiler/_mlir_libs/ for the Python extensions to find +# it at runtime. +################################################################################ +if(WIN32) + set(_nanobind_src "${_PYTHON_BUILD_PREFIX}/iree/build/_mlir_libs/nanobind-mlir.dll") + set(_nanobind_dst "${_PYTHON_BUILD_PREFIX}/iree/compiler/_mlir_libs/nanobind-mlir.dll") + add_custom_command( + OUTPUT "${_nanobind_dst}" + DEPENDS "${_nanobind_src}" + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${_nanobind_src}" "${_nanobind_dst}" + COMMENT "Copying nanobind-mlir.dll to iree/compiler/_mlir_libs/ for Windows DLL loading" + ) + add_custom_target(IREECompilerPythonNanobindCopy + DEPENDS "${_nanobind_dst}" + ) + add_dependencies(IREECompilerPythonNanobindCopy IREECompilerBuildPythonModules) + add_dependencies(IREECompilerPythonModules IREECompilerPythonNanobindCopy) +endif() + ################################################################################ # Subdirectories ################################################################################