Skip to content

Commit 0de2572

Browse files
committed
Merge remote-tracking branch 'upstream/master' into gpl-binSize-float
2 parents ffd6857 + d706e8c commit 0de2572

16 files changed

Lines changed: 13083 additions & 186 deletions

.bazelignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ build/
22
debug/
33
src/sta/build/
44
src/sta/debug/
5+
# delete line below when CI can handle it and it runs in minutes
6+
test/orfs/

MODULE.bazel

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,25 @@ pip.parse(
9898
requirements_lock = "//bazel:requirements_lock_3_13.txt",
9999
)
100100
use_repo(pip, "openroad-pip")
101+
102+
bazel_dep(name = "bazel-orfs")
103+
104+
# To bump version, run: bazelisk run @bazel-orfs//:bump
105+
git_override(
106+
module_name = "bazel-orfs",
107+
commit = "126765508161956f8f82ae169084da0235230637",
108+
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
109+
)
110+
111+
orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
112+
113+
# To bump version, run: bazelisk run @bazel-orfs//:bump
114+
orfs.default(
115+
# Official image https://hub.docker.com/r/openroad/orfs/tags
116+
image = "docker.io/openroad/orfs:v3.0-2883-ge22e4fc7",
117+
# Use OpenROAD of this repo instead of from the docker image
118+
openroad = "//:openroad",
119+
sha256 = "6ad0b1b7fbf290f33f0050ead4da181c83c6e8a9337b65f5f9cff65d67788424",
120+
)
121+
use_repo(orfs, "com_github_nixos_patchelf_download")
122+
use_repo(orfs, "docker_orfs")

MODULE.bazel.lock

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

src/gpl/src/graphics.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Graphics::Graphics(utl::Logger* logger,
5959
gui::Gui::get()->registerRenderer(this);
6060
initHeatmap();
6161
if (inst) {
62-
for (GCell* cell : nbc_->gCells()) {
62+
for (GCell* cell : nbc_->getGCells()) {
6363
if (cell->contains(inst)) {
6464
selected_ = cell;
6565
break;
@@ -249,9 +249,9 @@ void Graphics::drawNesterov(gui::Painter& painter)
249249

250250
// Draw the placeable objects
251251
painter.setPen(gui::Painter::white);
252-
drawCells(nbc_->gCells(), painter);
252+
drawCells(nbc_->getGCells(), painter);
253253
for (const auto& nb : nbVec_) {
254-
drawCells(nb->gCells(), painter);
254+
drawCells(nb->getGCells(), painter);
255255
}
256256

257257
painter.setBrush(gui::Painter::Color(gui::Painter::light_gray, 50));
@@ -387,7 +387,7 @@ gui::SelectionSet Graphics::select(odb::dbTechLayer* layer,
387387
return gui::SelectionSet();
388388
}
389389

390-
for (GCell* cell : nbc_->gCells()) {
390+
for (GCell* cell : nbc_->getGCells()) {
391391
const int gcx = cell->dCx();
392392
const int gcy = cell->dCy();
393393

0 commit comments

Comments
 (0)