Skip to content

Commit 14c70f6

Browse files
committed
Merge remote-tracking branch 'origin' into cts_reduce_command_args
Signed-off-by: luis201420 <[email protected]>
2 parents eed8d83 + 56debb6 commit 14c70f6

File tree

134 files changed

+81589
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+81589
-1213
lines changed

BUILD.bazel

Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Copyright (c) 2025-2025, The OpenROAD Authors
33

44
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
5+
load("//bazel:python_wrap_cc.bzl", "PYTHON_STABLE_API_DEFINE", "python_wrap_cc")
56
load("//bazel:tcl_encode_or.bzl", "tcl_encode")
67
load("//bazel:tcl_wrap_cc.bzl", "tcl_wrap_cc")
7-
load("//bazel:python_wrap_cc.bzl", "python_wrap_cc", "PYTHON_STABLE_API_DEFINE")
88

99
package(
1010
features = [
@@ -44,8 +44,6 @@ config_setting(
4444
},
4545
)
4646

47-
# TODO: once project is properly decomposed, we don't
48-
# need these blanked dependencies in multiple places anymore.
4947
OPENROAD_LIBRARY_DEPS = [
5048
":openroad_version",
5149
":ord",
@@ -150,14 +148,14 @@ cc_binary(
150148
":openroad_lib",
151149
":openroad_version",
152150
":ord",
151+
"//bazel:runfiles",
153152
"//src/cut",
154153
"//src/gui",
155154
"//src/sta:opensta_lib",
156155
"//src/utl",
157156
"@boost.stacktrace",
158157
"@rules_cc//cc/runfiles",
159158
"@tk_tcl//:tcl",
160-
"//bazel:runfiles",
161159
],
162160
)
163161

@@ -168,25 +166,6 @@ GUI_BUILD_FLAGS = select(
168166
},
169167
)
170168

171-
cc_library(
172-
name = "openroad_lib_private",
173-
srcs = [
174-
"src/Design.cc",
175-
"src/Tech.cc",
176-
"src/Timing.cc",
177-
],
178-
copts = OPENROAD_COPTS,
179-
defines = OPENROAD_DEFINES + GUI_BUILD_FLAGS,
180-
features = ["-use_header_modules"],
181-
includes = [
182-
"include",
183-
],
184-
deps = OPENROAD_LIBRARY_DEPS + [
185-
"//src/sta:opensta_lib",
186-
"@tk_tcl//:tcl",
187-
],
188-
)
189-
190169
cc_library(
191170
name = "openroad_lib",
192171
srcs = [
@@ -270,39 +249,38 @@ tcl_wrap_cc(
270249
],
271250
)
272251

273-
274252
# This target compiles the SWIG C++ wrapper into a shared library (.so)
275253
# that Python can load dynamically.
276254
cc_binary(
277255
name = "_openroadpy.so",
278256
srcs = [":openroad_swig-py"],
257+
defines = [PYTHON_STABLE_API_DEFINE],
279258
linkshared = True,
280259
deps = [
281260
":openroad_lib", # Depends on the core odb C++ library
282261
":ord",
283-
"//src/odb",
284-
"//src/ifp",
285-
"//src/utl",
286-
"//src/gpl",
287262
"//src/ant",
288263
"//src/cts",
289264
"//src/dpl",
290265
"//src/drt",
291266
"//src/exa",
292267
"//src/fin",
268+
"//src/gpl",
293269
"//src/grt",
270+
"//src/gui",
271+
"//src/ifp",
272+
"//src/odb",
294273
"//src/par",
295274
"//src/pdn",
296275
"//src/ppl",
297276
"//src/psm",
298277
"//src/rcx",
299278
"//src/stt",
300-
"//src/gui",
301279
"//src/tap",
280+
"//src/utl",
302281
"@boost.stacktrace",
303282
"@openroad_rules_python//python/cc:current_py_cc_headers",
304283
],
305-
defines = [PYTHON_STABLE_API_DEFINE],
306284
)
307285

308286
# This packages the SWIG-generated Python wrapper (odb.py) and the
@@ -312,23 +290,23 @@ py_library(
312290
srcs = [":openroad_swig-py"], # Use the .py output from the swig-py rule
313291
# The data attribute makes the .so file available at runtime.
314292
data = [":_openroadpy.so"],
293+
# This allows imports relative to the workspace root.
294+
imports = ["."],
295+
visibility = ["//visibility:public"],
315296
deps = [
316-
"//src/utl:utl_py",
317297
"//src/odb:odb_py",
298+
"//src/utl:utl_py",
318299
],
319-
# This allows imports relative to the workspace root.
320-
imports = ["."],
321-
visibility = ["//visibility:public",]
322300
)
323301

324302
python_wrap_cc(
325303
name = "openroad_swig-py",
326304
srcs = [
327-
"src/OpenRoad-py.i",
328-
":error_swig-py",
329-
"include/ord/Tech.h",
330305
"include/ord/Design.h",
306+
"include/ord/Tech.h",
331307
"include/ord/Timing.h",
308+
"src/OpenRoad-py.i",
309+
":error_swig-py",
332310
],
333311
module = "openroadpy",
334312
root_swig_src = "src/OpenRoad-py.i",
@@ -337,25 +315,25 @@ python_wrap_cc(
337315
"src",
338316
],
339317
deps = [
340-
"//src/gpl:swig-py",
341-
"//src/ifp:swig-py",
342318
"//src/ant:swig-py",
343319
"//src/cts:swig-py",
344320
"//src/dpl:swig-py",
345321
"//src/drt:swig-py",
346322
"//src/exa:swig-py",
347323
"//src/fin:swig-py",
324+
"//src/gpl:swig-py",
348325
"//src/grt:swig-py",
326+
"//src/ifp:swig-py",
327+
"//src/odb:swig-py",
349328
"//src/par:swig-py",
350329
"//src/pdn:swig-py",
351330
"//src/ppl:swig-py",
352331
"//src/psm:swig-py",
353332
"//src/rcx:swig-py",
354333
"//src/stt:swig-py",
355334
"//src/tap:swig-py",
356-
"//src/odb:swig-py",
357335
"//src/utl:swig-py",
358-
]
336+
],
359337
)
360338

361339
filegroup(
@@ -379,4 +357,4 @@ filegroup(
379357
srcs = [
380358
"src/Design.i",
381359
],
382-
)
360+
)

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ bazel_dep(name = "bazel-orfs")
153153
# To bump version, run: bazelisk run @bazel-orfs//:bump
154154
git_override(
155155
module_name = "bazel-orfs",
156-
commit = "f9c37f21de8e1095276e878d1628ac7a2f7908ab",
156+
commit = "2cf0198a49a220cfcabae35bba64b0034bbdbffc",
157157
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
158158
)
159159

@@ -162,10 +162,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
162162
# To bump version, run: bazelisk run @bazel-orfs//:bump
163163
orfs.default(
164164
# Official image https://hub.docker.com/r/openroad/orfs/tags
165-
image = "docker.io/openroad/orfs:v3.0-3780-g2f349ade",
165+
image = "docker.io/openroad/orfs:v3.0-3845-gbefd38218",
166166
# Use OpenROAD of this repo instead of from the docker image
167167
openroad = "//:openroad",
168-
sha256 = "637ffa1af0f224e17e3d5cddbe6b45d9b00102016acc9e866226e8c4e830aeab",
168+
sha256 = "4982a5b87588e4699f11deaed3286cba8b65d144e439c6f5845656abebfc0971",
169169
)
170170
use_repo(orfs, "com_github_nixos_patchelf_download")
171171
use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cts/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cc_library(
1717
"src/Clustering.h",
1818
"src/CtsObserver.h",
1919
"src/HTreeBuilder.h",
20+
"src/LatencyBalancer.h",
2021
"src/LevelBalancer.h",
2122
"src/SinkClustering.h",
2223
"src/TreeBuilder.h",
@@ -38,6 +39,7 @@ cc_library(
3839
"src/Clustering.cpp",
3940
"src/CtsOptions.cpp",
4041
"src/HTreeBuilder.cpp",
42+
"src/LatencyBalancer.cpp",
4143
"src/LevelBalancer.cpp",
4244
"src/SinkClustering.cpp",
4345
"src/TechChar.cpp",

src/cts/src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ add_library(cts_lib
1515
TritonCTS.cpp
1616
Clustering.cpp
1717
LevelBalancer.cpp
18+
LatencyBalancer.cpp
1819
CtsOptions.cpp
1920
)
2021

0 commit comments

Comments
 (0)