[llvm] [mlir][bazel] Don't expose interface headers from //mlir:IR. (PR #85867)
Christian Sigg via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 19 14:12:41 PDT 2024
https://github.com/chsigg created https://github.com/llvm/llvm-project/pull/85867
Header files should not be added to multiple targets, but this is hard to avoid because CMake is less strict with headers. But we should at least avoid exposing them as headers by multiple targets because it confuses tooling.
>From b34ea3464bc11719a530b66da6bf7cbbaafafcba Mon Sep 17 00:00:00 2001
From: Christian Sigg <csigg at google.com>
Date: Tue, 19 Mar 2024 22:06:16 +0100
Subject: [PATCH] [mlir][bazel] Don't expose interface headers from //mlir:IR.
---
.../llvm-project-overlay/mlir/BUILD.bazel | 23 ++++++++++++++++---
.../mlir/examples/toy/Ch5/BUILD.bazel | 1 +
.../mlir/examples/toy/Ch6/BUILD.bazel | 1 +
.../mlir/examples/toy/Ch7/BUILD.bazel | 1 +
.../mlir/test/BUILD.bazel | 4 ++++
.../mlir/unittests/BUILD.bazel | 1 +
6 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index 57d4e1a91f06d5..fd97a28d1a648f 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -330,16 +330,16 @@ cc_library(
"lib/Bytecode/*.h",
]) + [
"include/mlir/IR/PDLPatternMatch.h.inc",
+ "include/mlir/Interfaces/CallInterfaces.h",
+ "include/mlir/Interfaces/DataLayoutInterfaces.h",
+ "include/mlir/Interfaces/SideEffectInterfaces.h",
"lib/Bytecode/BytecodeOpInterface.cpp",
],
hdrs = glob([
"include/mlir/IR/*.h",
"include/mlir/Bytecode/*.h",
]) + [
- "include/mlir/Interfaces/CallInterfaces.h",
- "include/mlir/Interfaces/DataLayoutInterfaces.h",
"include/mlir/Interfaces/FoldInterfaces.h",
- "include/mlir/Interfaces/SideEffectInterfaces.h",
],
includes = ["include"],
deps = [
@@ -1643,6 +1643,7 @@ cc_library(
":IR",
":MemRefDialect",
":Pass",
+ ":SideEffectInterfaces",
":Support",
":TransformUtils",
":Transforms",
@@ -3130,6 +3131,7 @@ cc_library(
":DialectUtils",
":IR",
":InferTypeOpInterface",
+ ":SideEffectInterfaces",
":SparseTensorAttrDefsIncGen",
":SparseTensorEnums",
":SparseTensorInterfacesIncGen",
@@ -4014,6 +4016,7 @@ cc_library(
":AffineDialect",
":Analysis",
":ArithDialect",
+ ":CallOpInterfaces",
":DialectUtils",
":FuncDialect",
":IR",
@@ -4097,6 +4100,7 @@ cc_library(
":Pass",
":SCFDialect",
":SCFUtils",
+ ":SideEffectInterfaces",
":Support",
":TensorDialect",
":Transforms",
@@ -6941,6 +6945,7 @@ cc_library(
]),
includes = ["include"],
deps = [
+ ":CallOpInterfaces",
":CommonFolders",
":ControlFlowInterfaces",
":FunctionInterfaces",
@@ -7584,6 +7589,7 @@ cc_library(
includes = ["include"],
deps = [
":Analysis",
+ ":CallOpInterfaces",
":ControlFlowInterfaces",
":FunctionInterfaces",
":IR",
@@ -7914,6 +7920,7 @@ cc_library(
includes = ["include"],
deps = [
":Analysis",
+ ":CallOpInterfaces",
":ControlFlowInterfaces",
":FunctionInterfaces",
":IR",
@@ -7923,6 +7930,7 @@ cc_library(
":Pass",
":Rewrite",
":RuntimeVerifiableOpInterface",
+ ":SideEffectInterfaces",
":Support",
":TransformUtils",
":TransformsPassIncGen",
@@ -8074,6 +8082,7 @@ cc_library(
hdrs = glob(["include/mlir/Conversion/LLVMCommon/*.h"]),
includes = ["include"],
deps = [
+ ":DataLayoutInterfaces",
":IR",
":LLVMDialect",
":Support",
@@ -9045,6 +9054,7 @@ cc_library(
includes = ["include"],
deps = [
":DLTIDialect",
+ ":DataLayoutInterfaces",
":IR",
":LLVMConversionIncGen",
":LLVMDialect",
@@ -12075,6 +12085,7 @@ cc_library(
":CastInterfaces",
":IR",
":Rewrite",
+ ":SideEffectInterfaces",
":Support",
":TransformDialectInterfacesIncGen",
":TransformDialectUtils",
@@ -12662,6 +12673,7 @@ cc_library(
":ArithOpsIncGen",
":ArithOpsInterfacesIncGen",
":BufferizationInterfaces",
+ ":CallOpInterfaces",
":CastInterfaces",
":CommonFolders",
":ControlFlowInterfaces",
@@ -12673,6 +12685,7 @@ cc_library(
":InferTypeOpInterface",
":InliningUtils",
":Pass",
+ ":SideEffectInterfaces",
":Support",
":UBDialect",
":ValueBoundsOpInterfaceIncGen",
@@ -12979,6 +12992,7 @@ cc_library(
":ArithDialect",
":ArithUtils",
":BufferizationInterfaces",
+ ":CallOpInterfaces",
":CastInterfaces",
":ComplexDialect",
":ControlFlowInterfaces",
@@ -12993,6 +13007,7 @@ cc_library(
":MemorySlotInterfaces",
":RuntimeVerifiableOpInterface",
":ShapedOpInterfaces",
+ ":SideEffectInterfaces",
":Support",
":ValueBoundsOpInterface",
":ViewLikeInterface",
@@ -13239,6 +13254,7 @@ cc_library(
hdrs = glob(["include/mlir/Dialect/MLProgram/IR/*.h"]),
includes = ["include"],
deps = [
+ ":CallOpInterfaces",
":ControlFlowInterfaces",
":FunctionInterfaces",
":IR",
@@ -13247,6 +13263,7 @@ cc_library(
":MLProgramOpsIncGen",
":MLProgramTypesIncGen",
":Pass",
+ ":SideEffectInterfaces",
":Support",
":Transforms",
"//llvm:Support",
diff --git a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel
index ce48e249489d35..2c49d52f1ed0ae 100644
--- a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel
@@ -102,6 +102,7 @@ cc_binary(
"//mlir:Analysis",
"//mlir:ArithDialect",
"//mlir:BytecodeReader",
+ "//mlir:CallOpInterfaces",
"//mlir:CastInterfaces",
"//mlir:FuncDialect",
"//mlir:FuncExtensions",
diff --git a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel
index 286c080656456e..cd7f7f01816613 100644
--- a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel
@@ -108,6 +108,7 @@ cc_binary(
"//mlir:ArithToLLVM",
"//mlir:BuiltinToLLVMIRTranslation",
"//mlir:BytecodeReader",
+ "//mlir:CallOpInterfaces",
"//mlir:CastInterfaces",
"//mlir:ControlFlowToLLVM",
"//mlir:ExecutionEngine",
diff --git a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel
index f4037cab03f6a8..c03672eb4136ed 100644
--- a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel
@@ -108,6 +108,7 @@ cc_binary(
"//mlir:ArithToLLVM",
"//mlir:BuiltinToLLVMIRTranslation",
"//mlir:BytecodeReader",
+ "//mlir:CallOpInterfaces",
"//mlir:CastInterfaces",
"//mlir:ControlFlowToLLVM",
"//mlir:ExecutionEngine",
diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
index ccfef3f243409d..f17d70ce618a03 100644
--- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
@@ -94,12 +94,14 @@ cc_library(
"//mlir:AffineAnalysis",
"//mlir:AffineDialect",
"//mlir:Analysis",
+ "//mlir:CallOpInterfaces",
"//mlir:ControlFlowInterfaces",
"//mlir:FuncDialect",
"//mlir:FunctionInterfaces",
"//mlir:IR",
"//mlir:MemRefDialect",
"//mlir:Pass",
+ "//mlir:SideEffectInterfaces",
"//mlir:Support",
],
)
@@ -385,6 +387,7 @@ cc_library(
":TestTypeDefsIncGen",
"//llvm:Support",
"//mlir:ArithDialect",
+ "//mlir:CallOpInterfaces",
"//mlir:ControlFlowInterfaces",
"//mlir:CopyOpInterface",
"//mlir:DLTIDialect",
@@ -569,6 +572,7 @@ cc_library(
"//mlir:Pass",
"//mlir:SCFDialect",
"//mlir:SPIRVDialect",
+ "//mlir:SideEffectInterfaces",
"//mlir:Support",
"//mlir:Transforms",
],
diff --git a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel
index 252b9ec951f6bd..c6b630230bb32b 100644
--- a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel
@@ -40,6 +40,7 @@ cc_test(
deps = [
"//llvm:Support",
"//mlir:BytecodeReader",
+ "//mlir:CallOpInterfaces",
"//mlir:FunctionInterfaces",
"//mlir:IR",
"//mlir:Parser",
More information about the llvm-commits
mailing list