[bazel] Fix layering checks

chsigg · web-flow · commit afd53ae84b49 · 2026-02-09T20:25:39.000+01:00
diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -575,28 +575,20 @@ mlir_c_api_cc_library(
     name = "CAPIAMDGPU",
     srcs = ["lib/CAPI/Dialect/AMDGPU.cpp"],
     hdrs = ["include/mlir-c/Dialect/AMDGPU.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":AMDGPUPassIncGen"],
     includes = ["include"],
-    deps = [
-        ":AMDGPUDialect",
-        ":AMDGPUPassIncGen",
-    ],
+    deps = [":AMDGPUDialect"],
 )
 
 mlir_c_api_cc_library(
     name = "CAPIArith",
     srcs = ["lib/CAPI/Dialect/Arith.cpp"],
     hdrs = ["include/mlir-c/Dialect/Arith.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":ArithPassIncGen"],
     includes = ["include"],
-    deps = [
-        ":ArithDialect",
-        ":ArithPassIncGen",
-    ],
+    deps = [":ArithDialect"],
 )
 
 mlir_c_api_cc_library(
@@ -699,14 +691,12 @@ mlir_c_api_cc_library(
     hdrs = [
         "include/mlir-c/Dialect/LLVM.h",
     ],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":LLVMPassIncGen"],
     includes = ["include"],
     deps = [
         ":LLVMDialect",
-        ":LLVMPassIncGen",
-        "//llvm:Support",
+        "//third_party/llvm/llvm-project/llvm:Support",
     ],
 )
 
@@ -724,28 +714,22 @@ mlir_c_api_cc_library(
     name = "CAPIMemRef",
     srcs = ["lib/CAPI/Dialect/MemRef.cpp"],
     hdrs = ["include/mlir-c/Dialect/MemRef.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":MemRefPassIncGen"],
     includes = ["include"],
-    deps = [
-        ":MemRefDialect",
-        ":MemRefPassIncGen",
-    ],
+    deps = [":MemRefDialect"],
 )
 
 mlir_c_api_cc_library(
     name = "CAPINVGPU",
     srcs = ["lib/CAPI/Dialect/NVGPU.cpp"],
     hdrs = ["include/mlir-c/Dialect/NVGPU.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":NVGPUPassIncGen"],
     includes = ["include"],
     deps = [
         ":IR",
         ":NVGPUDialect",
-        ":NVGPUPassIncGen",
     ],
 )
 
@@ -766,14 +750,10 @@ mlir_c_api_cc_library(
     name = "CAPIShape",
     srcs = ["lib/CAPI/Dialect/Shape.cpp"],
     hdrs = ["include/mlir-c/Dialect/Shape.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
     includes = ["include"],
-    deps = [
-        ":ShapeDialect",
-        ":ShapeTransformsPassIncGen",
-    ],
+    header_deps = [":ShapeTransformsPassIncGen"],
+    deps = [":ShapeDialect"],
 )
 
 mlir_c_api_cc_library(
@@ -801,14 +781,10 @@ mlir_c_api_cc_library(
     name = "CAPITensor",
     srcs = ["lib/CAPI/Dialect/Tensor.cpp"],
     hdrs = ["include/mlir-c/Dialect/Tensor.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
     includes = ["include"],
-    deps = [
-        ":TensorDialect",
-        ":TensorPassIncGen",
-    ],
+    header_deps = [":TensorPassIncGen"],
+    deps = [":TensorDialect"],
 )
 
 mlir_c_api_cc_library(
@@ -927,14 +903,10 @@ mlir_c_api_cc_library(
     hdrs = [
         "include/mlir-c/Dialect/Transform.h",
     ],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":TransformDialectTransformsIncGen"],
     includes = ["include"],
-    deps = [
-        ":TransformDialect",
-        ":TransformDialectTransformsIncGen",
-    ],
+    deps = [":TransformDialect"],
 )
 
 mlir_c_api_cc_library(
@@ -967,13 +939,13 @@ mlir_c_api_cc_library(
     ],
     header_deps = [
         ":CAPIIRHeaders",
+        ":MLProgramPassIncGen",
     ],
     includes = ["include"],
     deps = [
         ":CAPIIR",
         ":MLProgramDialect",
         ":MLProgramOpsIncGen",
-        ":MLProgramPassIncGen",
         ":MLProgramTypesIncGen",
     ],
 )
@@ -982,14 +954,10 @@ mlir_c_api_cc_library(
     name = "CAPIVector",
     srcs = ["lib/CAPI/Dialect/Vector.cpp"],
     hdrs = ["include/mlir-c/Dialect/Vector.h"],
-    capi_deps = [
-        ":CAPIIR",
-    ],
+    capi_deps = [":CAPIIR"],
+    header_deps = [":VectorPassIncGen"],
     includes = ["include"],
-    deps = [
-        ":VectorDialect",
-        ":VectorPassIncGen",
-    ],
+    deps = [":VectorDialect"],
 )
 
 mlir_c_api_cc_library(
