diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index ae73355..6284eeb 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -5,8 +5,8 @@
 a5d9d0f7d368054fd1691aedf1db4116efcc233e third_party/flatbuffers
 4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc
 f2fb48c3b3d79a75a88a99fba6576b25d42ec528 third_party/googletest
-7be07b54245dfb34e8f3daf8cfb5736583e8dbc8 third_party/llvm-bazel
-9bb9b737c5573cf3850230bc4db8dac7be0e1e85 third_party/llvm-project
+ed8d41d7ec309c0a28d1be5a0f4814bd3029bc66 third_party/llvm-bazel
+756f5978410809530150f5e1cd425e85ad94d1cd third_party/llvm-project
 17b12a4481daa150e2d1ea3ada086b551b856707 third_party/marl
 9e970e18057e80e8af07f96d73714e395bac98d1 third_party/mlir-emitc
 d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11
@@ -14,7 +14,7 @@
 a1390ed39ec77ecfb574bc6fcd5bfc5e3adbdea9 third_party/sdl2
 685f86471e9d26b3eb7676695a2e2cefb4551ae9 third_party/spirv_cross
 f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
-a77e4aec3fee5de724b88a33ca1810276f015366 third_party/tensorflow
+ce153b249dad7fdedb3982d28c48d16fa882b148 third_party/tensorflow
 a9a09ab0940408898fccfdcfe2bb8dc19b50f13c third_party/tracy
 9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
 3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator
diff --git a/iree/compiler/Conversion/HLOToLinalg/test/slice.mlir b/iree/compiler/Conversion/HLOToLinalg/test/slice.mlir
index 0c17311..406a62b 100644
--- a/iree/compiler/Conversion/HLOToLinalg/test/slice.mlir
+++ b/iree/compiler/Conversion/HLOToLinalg/test/slice.mlir
@@ -72,7 +72,7 @@
   // CHECK-SAME:   [%[[ONE]], %[[ONE]]]
   // CHECK-SAME:   [%[[DIM0]], %[[DIM1]]]
   // CHECK-SAME:   [%[[ONE]], %[[ONE]]]
-  // CHECK-SAME: : memref<3x4xi32> to memref<?x?xi32, #map0>
+  // CHECK-SAME: : memref<3x4xi32> to memref<?x?xi32, #map>
   //       CHECK: linalg.copy
   func @slice_stride_part()
     attributes {signature = (tensor<3x4xi32>) -> (tensor<1x2xi32>)} {
diff --git a/iree/compiler/Dialect/HAL/Target/LLVM/LLVMIRPasses.cpp b/iree/compiler/Dialect/HAL/Target/LLVM/LLVMIRPasses.cpp
index 0725b17..de66446 100644
--- a/iree/compiler/Dialect/HAL/Target/LLVM/LLVMIRPasses.cpp
+++ b/iree/compiler/Dialect/HAL/Target/LLVM/LLVMIRPasses.cpp
@@ -57,8 +57,8 @@
       /*DebugLogging=*/false);
   standardInstrumentations.registerCallbacks(passInstrumentationCallbacks);
 
-  llvm::PassBuilder passBuilder(machine, options.pipelineTuningOptions, {},
-                                &passInstrumentationCallbacks);
+  llvm::PassBuilder passBuilder(false, machine, options.pipelineTuningOptions,
+                                {}, &passInstrumentationCallbacks);
   llvm::AAManager aa = passBuilder.buildDefaultAAPipeline();
   functionAnalysisManager.registerPass([&] { return std::move(aa); });
 
diff --git a/third_party/llvm-bazel b/third_party/llvm-bazel
index 7be07b5..ed8d41d 160000
--- a/third_party/llvm-bazel
+++ b/third_party/llvm-bazel
@@ -1 +1 @@
-Subproject commit 7be07b54245dfb34e8f3daf8cfb5736583e8dbc8
+Subproject commit ed8d41d7ec309c0a28d1be5a0f4814bd3029bc66
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 9bb9b73..756f597 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 9bb9b737c5573cf3850230bc4db8dac7be0e1e85
+Subproject commit 756f5978410809530150f5e1cd425e85ad94d1cd
diff --git a/third_party/tensorflow b/third_party/tensorflow
index a77e4ae..ce153b2 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit a77e4aec3fee5de724b88a33ca1810276f015366
+Subproject commit ce153b249dad7fdedb3982d28c48d16fa882b148