Skip to content

Commit 1affbec

Browse files
hzellerhzeller
committed
bazel: fix ambiguous header definitions.
It should be possible to identify exactly the library that provides a particular header and its implementation. Make sure ther is an exact 1:1 relationship between header and the library it is provided by. Found using bant, printing the headers and the libraries they are part of and showing the duplicates: ``` bant -q lib-headers | awk '{print $1}' | sort | uniq -cd ``` Signed-off-by: Henner Zeller <[email protected]>
1 parent 8796891 commit 1affbec

File tree

12 files changed

+22
-69
lines changed

12 files changed

+22
-69
lines changed

‎src/ant/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ cc_library(
4646
":tcl",
4747
],
4848
hdrs = [
49-
"include/ant/AntennaChecker.hh",
5049
"include/ant/MakeAntennaChecker.hh",
5150
],
5251
includes = ["include"],
5352
deps = [
53+
":ant",
5454
"//:ord",
5555
"//src/odb",
5656
"//src/utl",

‎src/cts/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ cc_library(
7676
],
7777
hdrs = [
7878
"include/cts/MakeTritoncts.h",
79-
"include/cts/TritonCTS.h",
8079
],
8180
copts = [
8281
"-Isrc/cts/src",

‎src/dbSta/BUILD‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ cc_library(
1313
name = "dbSta",
1414
srcs = [
1515
"src/SpefWriter.cc",
16+
"src/dbEditHierarchy.cc",
17+
"src/dbEditHierarchy.hh",
1618
"src/dbNetwork.cc",
1719
"src/dbReadVerilog.cc",
1820
"src/dbSdcNetwork.cc",
1921
"src/dbSdcNetwork.hh",
20-
"src/dbEditHierarchy.cc",
21-
"src/dbEditHierarchy.hh",
2222
"src/dbSta.cc",
2323
],
2424
hdrs = [
@@ -50,10 +50,6 @@ cc_library(
5050
],
5151
hdrs = [
5252
"include/db_sta/MakeDbSta.hh",
53-
"include/db_sta/SpefWriter.hh",
54-
"include/db_sta/dbNetwork.hh",
55-
"include/db_sta/dbReadVerilog.hh",
56-
"include/db_sta/dbSta.hh",
5753
],
5854
copts = [
5955
"-Isrc/dbSta/src",
@@ -63,6 +59,7 @@ cc_library(
6359
"include",
6460
],
6561
deps = [
62+
":dbSta",
6663
"//:ord",
6764
"//src/odb",
6865
"//src/sta:opensta_lib",

‎src/dpl/BUILD‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ cc_library(
7171
"src/util/utility.h",
7272
],
7373
hdrs = [
74-
"include/dpl/MakeOpendp.h",
7574
"include/dpl/Opendp.h",
7675
"include/dpl/OptMirror.h",
7776
],
@@ -114,14 +113,13 @@ cc_library(
114113
],
115114
hdrs = [
116115
"include/dpl/MakeOpendp.h",
117-
"include/dpl/Opendp.h",
118-
"include/dpl/OptMirror.h",
119116
],
120117
includes = [
121118
"include",
122119
"src",
123120
],
124121
deps = [
122+
":dpl",
125123
"//:ord",
126124
"//src/gui",
127125
"//src/odb",

‎src/est/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ cc_library(
5151
"@spdlog",
5252
],
5353
)
54+
5455
cc_library(
5556
name = "ui",
5657
srcs = [
@@ -60,7 +61,6 @@ cc_library(
6061
":tcl",
6162
],
6263
hdrs = [
63-
"include/est/EstimateParasitics.h",
6464
"include/est/MakeEstimateParasitics.h",
6565
],
6666
copts = [

‎src/exa/BUILD‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,20 @@ cc_library(
3333
cc_library(
3434
name = "ui",
3535
srcs = [
36-
"src/MakeExample.cpp",
3736
"src/graphics.cpp",
3837
"src/graphics.h",
3938
"src/observer.h",
4039
":swig",
4140
":tcl",
4241
],
43-
hdrs = [
44-
"include/exa/MakeExample.h",
45-
"include/exa/example.h",
46-
],
4742
copts = [
4843
"-Isrc/exa/src",
4944
],
5045
includes = [
5146
"include",
5247
],
5348
deps = [
49+
":exa",
5450
"//:ord",
5551
"//src/gui",
5652
"//src/odb",

‎src/grt/BUILD‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,25 @@ cc_library(
2121
],
2222
)
2323

24+
cc_library(
25+
name = "groute",
26+
hdrs = ["include/grt/GRoute.h"],
27+
)
28+
2429
cc_library(
2530
name = "fastroute",
2631
srcs = [
2732
"src/fastroute/src/FastRoute.cpp",
2833
"src/fastroute/src/FastRouteRenderer.cpp",
29-
"src/fastroute/src/graph2d.cpp",
3034
"src/fastroute/src/RSMT.cpp",
3135
"src/fastroute/src/RipUp.cpp",
36+
"src/fastroute/src/graph2d.cpp",
3237
"src/fastroute/src/maze.cpp",
3338
"src/fastroute/src/maze3D.cpp",
3439
"src/fastroute/src/route.cpp",
3540
"src/fastroute/src/utility.cpp",
3641
],
3742
hdrs = [
38-
"include/grt/GRoute.h",
3943
"src/fastroute/include/FastRoute.h",
4044
"src/fastroute/include/FastRouteRenderer.h",
4145
"src/fastroute/include/Graph2D.h",
@@ -46,6 +50,7 @@ cc_library(
4650
],
4751
deps = [
4852
":abstract-fastroute",
53+
":groute",
4954
"//src/dbSta",
5055
"//src/gui",
5156
"//src/odb",
@@ -75,7 +80,6 @@ cc_library(
7580
"src/Rudy.cpp",
7681
],
7782
hdrs = [
78-
"include/grt/GRoute.h",
7983
"include/grt/GlobalRouter.h",
8084
"include/grt/PinGridLocation.h",
8185
"include/grt/RoutePt.h",
@@ -90,6 +94,7 @@ cc_library(
9094
deps = [
9195
":abstract-fastroute",
9296
":fastroute",
97+
":groute",
9398
"//src/ant",
9499
"//src/dbSta",
95100
"//src/dpl",
@@ -125,12 +130,7 @@ cc_library(
125130
":tcl",
126131
],
127132
hdrs = [
128-
"include/grt/GRoute.h",
129-
"include/grt/GlobalRouter.h",
130133
"include/grt/MakeGlobalRouter.h",
131-
"include/grt/PinGridLocation.h",
132-
"include/grt/RoutePt.h",
133-
"include/grt/Rudy.h",
134134
],
135135
copts = [
136136
"-Isrc/grt/src",
@@ -143,6 +143,8 @@ cc_library(
143143
deps = [
144144
":abstract-fastroute",
145145
":fastroute",
146+
":groute",
147+
":grt",
146148
"//:ord",
147149
"//src/ant",
148150
"//src/dbSta",

‎src/par/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ cc_library(
7373
],
7474
hdrs = [
7575
"include/par/MakePartitionMgr.h",
76-
"include/par/PartitionMgr.h",
7776
],
7877
copts = [
7978
"-Wno-missing-braces", # from TCL swigging
@@ -82,6 +81,7 @@ cc_library(
8281
"include",
8382
],
8483
deps = [
84+
":par",
8585
"//:ord",
8686
"//src/dbSta",
8787
"//src/gui",

‎src/rmp/BUILD‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ cc_library(
6767
],
6868
hdrs = [
6969
"include/rmp/MakeRestructure.h",
70-
"include/rmp/Restructure.h",
71-
"include/rmp/unique_name.h",
7270
],
7371
copts = [
7472
"-Isrc/rmp/src",

‎src/rsz/BUILD‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ cc_library(
4848
"src/SwapPinsMove.hh",
4949
"src/UnbufferMove.cc",
5050
"src/UnbufferMove.hh",
51-
"src/VTSwapMove.hh",
5251
"src/VTSwapMove.cc",
52+
"src/VTSwapMove.hh",
5353
],
5454
hdrs = [
55-
"include/rsz/MakeResizer.hh",
5655
"include/rsz/OdbCallBack.hh",
5756
"include/rsz/Resizer.hh",
5857
],
@@ -87,8 +86,6 @@ cc_library(
8786
],
8887
hdrs = [
8988
"include/rsz/MakeResizer.hh",
90-
"include/rsz/OdbCallBack.hh",
91-
"include/rsz/Resizer.hh",
9289
],
9390
copts = [
9491
"-Isrc/rsz/src",
@@ -97,6 +94,7 @@ cc_library(
9794
"include",
9895
],
9996
deps = [
97+
":rsz",
10098
"//:ord",
10199
"//src/dbSta",
102100
"//src/dpl",

0 commit comments

Comments
 (0)