diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index f10690dfea4a..dcd97a9541d3 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -32,14 +32,6 @@ filegroup(
     srcs = glob(["include/mlir-c/**/*"]),  # <== i.e. match the entire tree
 )
 
-filegroup(
-    name = "ConversionPassDetail",
-    srcs = [
-        "include/mlir/Conversion/GPUToROCDL/Runtimes.h",
-        "lib/Conversion/PassDetail.h",
-    ],
-)
-
 exports_files(glob(["include/**/*.td"]))
 
 [
@@ -1440,7 +1432,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/ArmNeon2dToIntr/*.cpp",
         "lib/Conversion/ArmNeon2dToIntr/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/ArmNeon2dToIntr/*.h",
     ]),
@@ -2189,7 +2181,6 @@ cc_library(
     srcs = [
         "lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp",
         "lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp",
-        "lib/Dialect/NVGPU/Transforms/PassDetail.h",
     ],
     hdrs = [
         "include/mlir/Dialect/NVGPU/Passes.h",
@@ -2585,7 +2576,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/AsyncToLLVM/*.cpp",
         "lib/Conversion/AsyncToLLVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob(["include/mlir/Conversion/AsyncToLLVM/*.h"]),
     includes = ["include"],
     deps = [
@@ -2610,7 +2601,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/AffineToStandard/*.cpp",
         "lib/Conversion/AffineToStandard/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob(["include/mlir/Conversion/AffineToStandard/*.h"]),
     includes = ["include"],
     deps = [
@@ -2890,7 +2881,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/ShapeToStandard/*.cpp",
         "lib/Conversion/ShapeToStandard/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = ["include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h"],
     includes = ["include"],
     deps = [
@@ -3744,7 +3735,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/GPUToNVVM/*.cpp",
         "lib/Conversion/GPUToNVVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/GPUToNVVM/*.h",
     ]),
@@ -3779,7 +3770,8 @@ cc_library(
     srcs = glob([
         "lib/Conversion/AMDGPUToROCDL/*.cpp",
         "lib/Conversion/AMDGPUToROCDL/*.h",
-    ]) + [":ConversionPassDetail"],
+        "include/mlir/Conversion/GPUToROCDL/Runtimes.h",
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/AMDGPUToROCDL/*.h",
     ]),
@@ -3802,7 +3794,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/NVGPUToNVVM/*.cpp",
         "lib/Conversion/NVGPUToNVVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/NVGPUToNVVM/*.h",
     ]),
@@ -3825,7 +3817,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/VectorToSPIRV/*.cpp",
         "lib/Conversion/VectorToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/VectorToSPIRV/*.h",
     ]),
@@ -3862,8 +3854,8 @@ gentbl_cc_library(
 cc_library(
     name = "GPUToROCDLTransforms",
     srcs = [
+        "include/mlir/Conversion/GPUToROCDL/Runtimes.h",
         "lib/Conversion/GPUToROCDL/LowerGpuOpsToROCDLOps.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = ["include/mlir/Conversion/GPUToROCDL/GPUToROCDLPass.h"],
     includes = ["include"],
@@ -3897,7 +3889,6 @@ cc_library(
     srcs = [
         "lib/Conversion/GPUToVulkan/ConvertGPULaunchFuncToVulkanLaunchFunc.cpp",
         "lib/Conversion/GPUToVulkan/ConvertLaunchFuncToVulkanCalls.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = ["include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h"],
     includes = ["include"],
@@ -3919,7 +3910,6 @@ cc_library(
     name = "GPUToGPURuntimeTransforms",
     srcs = [
         "lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = ["include/mlir/Conversion/GPUCommon/GPUCommonPass.h"],
     includes = ["include"],
@@ -3949,7 +3939,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/GPUToSPIRV/*.cpp",
         "lib/Conversion/GPUToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/GPUToSPIRV/*.h",
     ]),
@@ -3981,7 +3971,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/PDLToPDLInterp/*.cpp",
         "lib/Conversion/PDLToPDLInterp/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = ["include/mlir/Conversion/PDLToPDLInterp/PDLToPDLInterp.h"],
     includes = ["include"],
     deps = [
@@ -4000,7 +3990,7 @@ cc_library(
     name = "SPIRVToLLVM",
     srcs = glob([
         "lib/Conversion/SPIRVToLLVM/*.cpp",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/SPIRVToLLVM/*.h",
     ]),
@@ -4688,7 +4678,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/MathToSPIRV/*.cpp",
         "lib/Conversion/MathToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/MathToSPIRV/*.h",
     ]),
@@ -4715,7 +4705,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/FuncToSPIRV/*.cpp",
         "lib/Conversion/FuncToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/FuncToSPIRV/*.h",
     ]),
@@ -4747,7 +4737,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/TensorToLinalg/*.cpp",
         "lib/Conversion/TensorToLinalg/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/TensorToLinalg/*.h",
     ]),
@@ -4776,7 +4766,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/TensorToSPIRV/*.cpp",
         "lib/Conversion/TensorToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/TensorToSPIRV/*.h",
     ]),
@@ -5371,7 +5361,7 @@ cc_library(
 
 cc_library(
     name = "SCFToGPU",
-    srcs = glob(["lib/Conversion/SCFToGPU/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/SCFToGPU/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/SCFToGPU/*.h"]),
     includes = ["include"],
     deps = [
@@ -5399,7 +5389,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/SCFToSPIRV/*.cpp",
         "lib/Conversion/SCFToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/SCFToSPIRV/*.h",
     ]),
@@ -5427,7 +5417,6 @@ cc_library(
     name = "SCFToOpenMP",
     srcs = [
         "lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = ["include/mlir/Conversion/SCFToOpenMP/SCFToOpenMP.h"],
     includes = ["include"],
@@ -5452,7 +5441,6 @@ cc_library(
     name = "SCFToControlFlow",
     srcs = [
         "lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = ["include/mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h"],
     includes = ["include"],
@@ -5489,7 +5477,7 @@ cc_library(
 
 cc_library(
     name = "ReconcileUnrealizedCasts",
-    srcs = glob(["lib/Conversion/ReconcileUnrealizedCasts/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/ReconcileUnrealizedCasts/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/ReconcileUnrealizedCasts/*.h"]),
     includes = ["include"],
     deps = [
@@ -5504,7 +5492,6 @@ cc_library(
     name = "FuncToLLVM",
     srcs = [
         "lib/Conversion/FuncToLLVM/FuncToLLVM.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = [
         "include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h",
@@ -5539,7 +5526,6 @@ cc_library(
     name = "ControlFlowToLLVM",
     srcs = [
         "lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = [
         "include/mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h",
@@ -5569,7 +5555,7 @@ cc_library(
 
 cc_library(
     name = "ControlFlowToSPIRV",
-    srcs = glob(["lib/Conversion/ControlFlowToSPIRV/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/ControlFlowToSPIRV/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/ControlFlowToSPIRV/*.h"]),
     includes = ["include"],
     deps = [
@@ -5589,7 +5575,7 @@ cc_library(
 
 cc_library(
     name = "MemRefToLLVM",
-    srcs = glob(["lib/Conversion/MemRefToLLVM/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/MemRefToLLVM/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/MemRefToLLVM/*.h"]),
     includes = ["include"],
     deps = [
@@ -5614,7 +5600,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/MemRefToSPIRV/*.cpp",
         "lib/Conversion/MemRefToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/MemRefToSPIRV/*.h",
     ]),
@@ -5638,7 +5624,7 @@ cc_library(
 
 cc_library(
     name = "ArithmeticToLLVM",
-    srcs = glob(["lib/Conversion/ArithmeticToLLVM/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/ArithmeticToLLVM/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/ArithmeticToLLVM/*.h"]),
     includes = ["include"],
     deps = [
@@ -5656,7 +5642,7 @@ cc_library(
 
 cc_library(
     name = "ArithmeticToSPIRV",
-    srcs = glob(["lib/Conversion/ArithmeticToSPIRV/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/ArithmeticToSPIRV/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/ArithmeticToSPIRV/*.h"]),
     includes = ["include"],
     deps = [
@@ -5676,7 +5662,7 @@ cc_library(
 
 cc_library(
     name = "MathToLLVM",
-    srcs = glob(["lib/Conversion/MathToLLVM/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/MathToLLVM/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/MathToLLVM/*.h"]),
     includes = ["include"],
     deps = [
@@ -5695,7 +5681,7 @@ cc_library(
 
 cc_library(
     name = "MathToFuncs",
-    srcs = glob(["lib/Conversion/MathToFuncs/*.cpp"]) + [":ConversionPassDetail"],
+    srcs = glob(["lib/Conversion/MathToFuncs/*.cpp"]),
     hdrs = glob(["include/mlir/Conversion/MathToFuncs/*.h"]),
     includes = ["include"],
     deps = [
@@ -6962,7 +6948,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/OpenACCToSCF/*.cpp",
         "lib/Conversion/OpenACCToSCF/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/OpenACCToSCF/*.h",
     ]),
@@ -6984,7 +6970,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/OpenACCToLLVM/*.cpp",
         "lib/Conversion/OpenACCToLLVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/OpenACCToLLVM/*.h",
     ]),
@@ -7008,7 +6994,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/OpenMPToLLVM/*.cpp",
         "lib/Conversion/OpenMPToLLVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/OpenMPToLLVM/*.h",
     ]),
@@ -7339,7 +7325,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/LinalgToLLVM/*.cpp",
         "lib/Conversion/LinalgToLLVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/LinalgToLLVM/*.h",
     ]),
@@ -7372,7 +7358,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/LinalgToStandard/*.cpp",
         "lib/Conversion/LinalgToStandard/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/LinalgToStandard/*.h",
     ]),
@@ -7400,7 +7386,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/LinalgToSPIRV/*.cpp",
         "lib/Conversion/LinalgToSPIRV/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/LinalgToSPIRV/*.h",
     ]),
@@ -7698,7 +7684,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/VectorToLLVM/*.cpp",
         "lib/Conversion/VectorToLLVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/VectorToLLVM/*.h",
     ]),
@@ -7736,7 +7722,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/VectorToGPU/*.cpp",
         "lib/Conversion/VectorToGPU/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/VectorToGPU/*.h",
     ]),
@@ -7771,7 +7757,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/VectorToSCF/*.cpp",
         "lib/Conversion/VectorToSCF/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/VectorToSCF/*.h",
     ]),
@@ -7920,7 +7906,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/TosaToArith/*.cpp",
         "lib/Conversion/TosaToArith/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/TosaToArith/*.h",
     ]),
@@ -7944,7 +7930,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/TosaToLinalg/*.cpp",
         "lib/Conversion/TosaToLinalg/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/TosaToLinalg/*.h",
     ]),
@@ -7974,7 +7960,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/TosaToSCF/*.cpp",
         "lib/Conversion/TosaToSCF/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/TosaToSCF/*.h",
     ]),
@@ -7984,6 +7970,7 @@ cc_library(
     ],
     deps = [
         ":ConversionPassIncGen",
+        ":FuncDialect",
         ":IR",
         ":Pass",
         ":SCFDialect",
@@ -7998,7 +7985,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/TosaToTensor/*.cpp",
         "lib/Conversion/TosaToTensor/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/TosaToTensor/*.h",
     ]),
@@ -8276,7 +8263,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/ComplexToLLVM/*.cpp",
         "lib/Conversion/ComplexToLLVM/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/ComplexToLLVM/*.h",
     ]),
@@ -8302,7 +8289,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/ComplexToLibm/*.cpp",
         "lib/Conversion/ComplexToLibm/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/ComplexToLibm/*.h",
     ]),
@@ -8326,7 +8313,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/ComplexToStandard/*.cpp",
         "lib/Conversion/ComplexToStandard/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/ComplexToStandard/*.h",
     ]),
@@ -8636,7 +8623,7 @@ cc_library(
     srcs = glob([
         "lib/Conversion/MathToLibm/*.cpp",
         "lib/Conversion/MathToLibm/*.h",
-    ]) + [":ConversionPassDetail"],
+    ]),
     hdrs = glob([
         "include/mlir/Conversion/MathToLibm/*.h",
     ]),
@@ -9140,7 +9127,6 @@ cc_library(
     name = "BufferizationToMemRef",
     srcs = [
         "lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp",
-        ":ConversionPassDetail",
     ],
     hdrs = [
         "include/mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h",