Skip to content

Commit 4d774bc

Browse files
committed
Merge branch 'master' of github.com:The-OpenROAD-Project-private/OpenROAD into grt-resistance-aware-update
2 parents 18d7841 + f091c6e commit 4d774bc

24 files changed

+3651
-252
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ obj-x86_64-linux-gnu/
5757

5858
user.bazelrc
5959

60-
bazel-bin
61-
bazel-out
62-
bazel-testlogs
63-
bazel-OpenROAD
60+
bazel-*
6461

6562
projectview.bazelproject
6663
.bsp/

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
109109
# BCR, they should depend on their own version.
110110
bazel_dep(name = "glpk", version = "5.0.bcr.3", repo_name = "org_gnu_glpk")
111111

112-
## Fix the compiler version and avoid any local compiler
112+
## Lock the compiler version and avoid any local compiler
113113
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
114114

115115
# Configure and register the toolchain.

src/dbSta/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ cc_library(
143143

144144
tcl_encode(
145145
name = "tcl",
146+
# Encode sta:tcl_scripts before dbSta.tcl, as dbSta.tcl will
147+
# override sta_error and sta_warn.
146148
srcs = ["//src/sta:tcl_scripts"] + [
147149
"src/dbReadVerilog.tcl",
148150
"src/dbSta.tcl",

src/odb/src/db/dbChipInst.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,7 @@ dbTransform dbChipInst::getTransform() const
162162

163163
Rect dbChipInst::getBBox() const
164164
{
165-
_dbChipInst* _chipinst = (_dbChipInst*) this;
166165
Rect box = getMasterChip()->getBBox();
167-
box.moveTo(_chipinst->loc_.x(), _chipinst->loc_.y());
168166
getTransform().apply(box);
169167
return box;
170168
}
@@ -310,4 +308,4 @@ void dbChipInst::destroy(dbChipInst* chipInst)
310308
}
311309
// User Code End dbChipInstPublicMethods
312310
} // namespace odb
313-
// Generator Code End Cpp
311+
// Generator Code End Cpp

src/ram/src/ram.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ void RamGen::generate(const int bytes_per_word,
572572
int max_x_coord = ram_grid.getRowWidth();
573573

574574
block_->setDieArea(odb::Rect(0, 0, max_x_coord, max_y_coord));
575+
block_->setCoreArea(block_->computeCoreArea());
575576
}
576577

577578
} // namespace ram

src/ram/test/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ package(features = ["layering_check"])
66

77
# From CMakeLists.txt or_integration_tests(TESTS
88
COMPULSORY_TESTS = [
9+
]
10+
11+
MANUAL_FOR_BAZEL_TESTS = [
912
"make_8x8",
1013
]
1114

@@ -53,7 +56,7 @@ filegroup(
5356
regression_test(
5457
name = test_name,
5558
data = [":" + test_name + "_resources"],
56-
tags = [] if test_name in COMPULSORY_TESTS else ["manual"],
59+
tags = ["manual"] if test_name in MANUAL_FOR_BAZEL_TESTS else [],
5760
visibility = ["//visibility:public"],
5861
)
5962
for test_name in ALL_TESTS

src/ram/test/make_8x8.defok

Lines changed: 2968 additions & 183 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)