Skip to content

Commit 09d5694

Browse files
committed
Merge remote-tracking branch 'origin/master' into odb-read-def-update
2 parents 0698c11 + 2ef7fd0 commit 09d5694

File tree

213 files changed

+295225
-1634
lines changed

Some content is hidden

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

213 files changed

+295225
-1634
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ TAGS
2121
Makefile
2222
__pycache__
2323
venv/
24+
.abc_history
2425

2526
include/ord/Version.hh
2627

BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ OPENROAD_LIBRARY_DEPS = [
5050
":ord",
5151
"//src/ant",
5252
"//src/ant:ui",
53+
"//src/cgt",
5354
"//src/cts",
5455
"//src/cts:ui",
56+
"//src/cut",
5557
"//src/dbSta",
5658
"//src/dbSta:ui",
5759
"//src/dft",
@@ -141,6 +143,7 @@ cc_binary(
141143
":openroad_lib",
142144
":openroad_version",
143145
"//:ord",
146+
"//src/cut",
144147
"//src/gui",
145148
"//src/sta:opensta_lib",
146149
"//src/utl",

MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ bazel_dep(name = "googletest", version = "1.16.0", dev_dependency = True)
110110
bazel_dep(name = "glpk", version = "5.0.bcr.3", repo_name = "org_gnu_glpk")
111111

112112
## Fix the compiler version and avoid any local compiler
113-
bazel_dep(name = "toolchains_llvm", version = "1.4.0")
113+
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
114114

115115
# Configure and register the toolchain.
116116
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
117117
llvm.toolchain(
118-
llvm_version = "20.1.2",
118+
llvm_version = "20.1.8",
119119
)
120120
use_repo(llvm, "llvm_toolchain")
121121
# use_repo(llvm, "llvm_toolchain_llvm") # if you depend on specific tools in scripts
@@ -161,10 +161,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
161161
# To bump version, run: bazelisk run @bazel-orfs//:bump
162162
orfs.default(
163163
# Official image https://hub.docker.com/r/openroad/orfs/tags
164-
image = "docker.io/openroad/orfs:v3.0-3749-g8443d760",
164+
image = "docker.io/openroad/orfs:v3.0-3766-g33e29bff",
165165
# Use OpenROAD of this repo instead of from the docker image
166166
openroad = "//:openroad",
167-
sha256 = "f84c76855e854e89e54eb87fac2b65038567205ced5f8051e34e2e842047d78a",
167+
sha256 = "edaf81aaab215ffa82e21f1b98fadb0d42da35444b39b524452a6ee52db5fea5",
168168
)
169169
use_repo(orfs, "com_github_nixos_patchelf_download")
170170
use_repo(orfs, "docker_orfs")
@@ -196,8 +196,8 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
196196
maven.install(
197197
name = "openroad_maven",
198198
artifacts = [
199-
"org.chipsalliance:chisel_2.13:7.0.0-RC3",
200-
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0-RC3",
199+
"org.chipsalliance:chisel_2.13:7.0.0",
200+
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0",
201201
],
202202
repositories = [
203203
"https://repo1.maven.org/maven2",

MODULE.bazel.lock

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

docs/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ entries:
6262
title: Static Timing Analyzer (external)
6363
- file: main/src/rsz/README
6464
title: Gate Resizing
65+
- file: main/src/cgt/README
66+
title: Clock gating
6567
- file: main/src/dpl/README
6668
title: Detailed Placement
6769
- file: main/src/cts/README

include/ord/Design.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ namespace tap {
6363
class Tapcell;
6464
}
6565

66+
namespace cgt {
67+
class ClockGating;
68+
}
69+
6670
namespace cts {
6771
class TritonCTS;
6872
}
@@ -156,6 +160,7 @@ class Design
156160

157161
// Services
158162
ant::AntennaChecker* getAntennaChecker();
163+
cgt::ClockGating* getClockGating();
159164
cts::TritonCTS* getTritonCts();
160165
dft::Dft* getDft();
161166
dpl::Opendp* getOpendp();

include/ord/OpenRoad.hh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ namespace ppl {
3636
class IOPlacer;
3737
}
3838

39+
namespace cgt {
40+
class ClockGating;
41+
}
42+
3943
namespace rmp {
4044
class Restructure;
4145
}
@@ -147,6 +151,7 @@ class OpenRoad
147151
odb::dbDatabase* getDb() { return db_; }
148152
sta::dbSta* getSta() { return sta_; }
149153
sta::dbNetwork* getDbNetwork();
154+
cgt::ClockGating* getClockGating() { return clock_gating_; }
150155
rsz::Resizer* getResizer() { return resizer_; }
151156
rmp::Restructure* getRestructure() { return restructure_; }
152157
cts::TritonCTS* getTritonCts() { return tritonCts_; }
@@ -252,6 +257,7 @@ class OpenRoad
252257
mpl::MacroPlacer* macro_placer_ = nullptr;
253258
exa::Example* example_ = nullptr;
254259
grt::GlobalRouter* global_router_ = nullptr;
260+
cgt::ClockGating* clock_gating_ = nullptr;
255261
rmp::Restructure* restructure_ = nullptr;
256262
cts::TritonCTS* tritonCts_ = nullptr;
257263
tap::Tapcell* tapcell_ = nullptr;

src/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,9 @@ add_subdirectory(exa)
264264
add_subdirectory(fin)
265265
add_subdirectory(ppl)
266266
add_subdirectory(rmp)
267+
add_subdirectory(cgt)
267268
add_subdirectory(cts)
269+
add_subdirectory(cut)
268270
add_subdirectory(grt)
269271
add_subdirectory(tap)
270272
add_subdirectory(rcx)
@@ -328,7 +330,9 @@ target_link_libraries(openroad
328330
odbtcl
329331
rcx
330332
rmp
333+
cgt
331334
cts
335+
cut
332336
grt
333337
tap
334338
gui
@@ -409,6 +413,7 @@ if (Python3_FOUND AND BUILD_PYTHON)
409413
exa_py
410414
ppl_py
411415
tap_py
416+
cgt_py
412417
cts_py
413418
drt_py
414419
fin_py

src/Design.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,11 @@ tap::Tapcell* Design::getTapcell()
272272
return getOpenRoad()->getTapcell();
273273
}
274274

275+
cgt::ClockGating* Design::getClockGating()
276+
{
277+
return getOpenRoad()->getClockGating();
278+
}
279+
275280
cts::TritonCTS* Design::getTritonCts()
276281
{
277282
return getOpenRoad()->getTritonCts();

src/Main.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <tclExtend.h>
3434
#endif
3535

36+
#include "cut/abc_init.h"
3637
#include "gui/gui.h"
3738
#include "ord/Design.h"
3839
#include "ord/InitOpenRoad.hh"
@@ -67,6 +68,7 @@ using std::string;
6768
X(par) \
6869
X(rcx) \
6970
X(rmp) \
71+
X(cgt) \
7072
X(stt) \
7173
X(psm) \
7274
X(pdn) \
@@ -301,6 +303,9 @@ int main(int argc, char* argv[])
301303
// Set argc to 1 so Tcl_Main doesn't source any files.
302304
// Tcl_Main never returns.
303305
Tcl_Main(1, argv, ord::tclAppInit);
306+
307+
cut::abcStop();
308+
304309
return 0;
305310
}
306311

0 commit comments

Comments
 (0)