mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 18:56:43 +00:00
Code Issues Projects Releases Wiki Activity

[bazel] Separate capi_deps from deps in mlir_c_api_cc_library.

Browse Source 
This is important because *Objects targets need to only depend on other *Objects targets, not on the unsuffixed CAPI rules. Depending on how it is linked in the current setup, it can cause duplicate symbols.

Differential Revision: https://reviews.llvm.org/D117176
This commit is contained in:
Stella Laurenzo 2022-01-13 01:35:29 +00:00
parent 88c0e0806b
commit b93eded7b9
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
View File

@ -382,9 +382,11 @@ mlir_c_api_cc_library(
srcs = [
"lib/CAPI/Interfaces/Interfaces.cpp",
],
capi_deps = [
":CAPIIR",
],
includes = ["include"],
deps = [
":CAPIIR",
":IR",
":InferTypeOpInterface",
"//llvm:Support",
@ -398,15 +400,16 @@ mlir_c_api_cc_library(
"lib/CAPI/Dialect/AsyncPasses.cpp",
],
hdrs = ["include/mlir-c/Dialect/Async.h"],
capi_deps = [
":CAPIIR",
],
header_deps = [
":AsyncPassIncGen",
":CAPIIRHeaders",
],
includes = ["include"],
deps = [
":Async",
":AsyncTransforms",
":CAPIIR",
":Pass",
],
)
@ -420,13 +423,14 @@ mlir_c_api_cc_library(
hdrs = [
"include/mlir-c/Dialect/Linalg.h",
],
capi_deps = [
":CAPIIR",
],
header_deps = [
":CAPIIRHeaders",
":LinalgPassIncGen",
],
includes = ["include"],
deps = [
":CAPIIR",
":LinalgOps",
":LinalgTransforms",
":Pass",
@ -441,12 +445,11 @@ mlir_c_api_cc_library(
hdrs = [
"include/mlir-c/Dialect/LLVM.h",
],
header_deps = [
":CAPIIRHeaders",
capi_deps = [
":CAPIIR",
],
includes = ["include"],
deps = [
":CAPIIR",
":LLVMDialect",
],
)
@ -460,13 +463,14 @@ mlir_c_api_cc_library(
hdrs = [
"include/mlir-c/Dialect/GPU.h",
],
capi_deps = [
":CAPIIR",
],
header_deps = [
":CAPIIRHeaders",
":GPUPassIncGen",
],
includes = ["include"],
deps = [
":CAPIIR",
":GPUDialect",
":GPUTransforms",
":Pass",
@ -482,13 +486,14 @@ mlir_c_api_cc_library(
hdrs = [
"include/mlir-c/Dialect/SparseTensor.h",
],
capi_deps = [
":CAPIIR",
],
header_deps = [
":CAPIIRHeaders",
":SparseTensorPassIncGen",
],
includes = ["include"],
deps = [
":CAPIIR",
":Pass",
":SparseTensor",
":SparseTensorTransforms",
@ -504,12 +509,11 @@ mlir_c_api_cc_library(
hdrs = [
"include/mlir-c/Dialect/Quant.h",
],
header_deps = [
":CAPIIRHeaders",
capi_deps = [
":CAPIIR",
],
includes = ["include"],
deps = [
":CAPIIR",
":QuantOps",
],
)
@ -538,13 +542,14 @@ mlir_c_api_cc_library(
name = "CAPIConversion",
srcs = ["lib/CAPI/Conversion/Passes.cpp"],
hdrs = ["include/mlir-c/Conversion.h"],
capi_deps = [
":CAPIIR",
],
header_deps = [
":CAPIIRHeaders",
":ConversionPassIncGen",
],
includes = ["include"],
deps = [
":CAPIIR",
":ConversionPasses",
":Pass",
],
@ -554,12 +559,11 @@ mlir_c_api_cc_library(
name = "CAPIDebug",
srcs = ["lib/CAPI/Debug/Debug.cpp"],
hdrs = ["include/mlir-c/Debug.h"],
header_deps = [
":CAPIIRHeaders",
capi_deps = [
":CAPIIR",
],
includes = ["include"],
deps = [
":CAPIIR",
":Support",
"//llvm:Support",
],
@ -572,13 +576,14 @@ mlir_c_api_cc_library(
"include/mlir-c/ExecutionEngine.h",
"include/mlir/CAPI/ExecutionEngine.h",
],
capi_deps = [
":CAPIIR",
],
header_deps = [
":CAPIIRHeaders",
":ExecutionEngine",
],
includes = ["include"],
deps = [
":CAPIIR",
":ExecutionEngineUtils",
":LLVMToLLVMIRTranslation",
"//llvm:OrcJIT",
@ -590,13 +595,14 @@ mlir_c_api_cc_library(
name = "CAPITransforms",
srcs = ["lib/CAPI/Transforms/Passes.cpp"],
hdrs = ["include/mlir-c/Transforms.h"],
capi_deps = [
":CAPIIR",
],
header_deps = [
":CAPIIRHeaders",
":TransformsPassIncGen",
],
includes = ["include"],
deps = [
":CAPIIR",
":Pass",
":Transforms",
],
@ -606,13 +612,12 @@ mlir_c_api_cc_library(
name = "CAPIRegistration",
srcs = ["lib/CAPI/Registration/Registration.cpp"],
hdrs = ["include/mlir-c/Registration.h"],
header_deps = [
":CAPIIRHeaders",
capi_deps = [
":CAPIIR",
],
includes = ["include"],
deps = [
":AllPassesAndDialects",
":CAPIIR",
":LLVMToLLVMIRTranslation",
],
)

16
utils/bazel/llvm-project-overlay/mlir/build_defs.bzl
View File

@ -31,6 +31,7 @@ def mlir_c_api_cc_library(
hdrs = [],
deps = [],
header_deps = [],
capi_deps = [],
**kwargs):
"""Macro that generates three targets for MLIR C API libraries.
@ -38,26 +39,33 @@ def mlir_c_api_cc_library(
* A header-only cc_library target ("NameHeaders")
* An implementation cc_library target tagged `alwayslink` suitable for
inclusion in a shared library built with cc_binary() ("NameObjects").
"""
In order to avoid duplicate symbols, it is important that
mlir_c_api_cc_library targets only depend on other mlir_c_api_cc_library
targets via the "capi_deps" parameter. This makes it so that "FooObjects"
depend on "BarObjects" targets and "Foo" targets depend on "Bar" targets.
Don't cross the streams.
"""
capi_header_deps = ["%sHeaders" % d for d in capi_deps]
capi_object_deps = ["%sObjects" % d for d in capi_deps]
native.cc_library(
name = name,
srcs = srcs,
hdrs = hdrs,
deps = deps + header_deps,
deps = deps + capi_deps + header_deps,
**kwargs
)
native.cc_library(
name = name + "Headers",
hdrs = hdrs,
deps = header_deps,
deps = header_deps + capi_header_deps,
**kwargs
)
native.cc_library(
name = name + "Objects",
srcs = srcs,
hdrs = hdrs,
deps = deps + header_deps,
deps = deps + capi_object_deps + capi_header_deps + header_deps,
alwayslink = True,
**kwargs
)