Skip to content

Commit 37c4a41

Browse files
committed
Merge remote-tracking branch 'private/master' into dpl-dpo-load-macro-flipping
2 parents 7787a4b + ec10d06 commit 37c4a41

48 files changed

Lines changed: 468 additions & 54 deletions

Some content is hidden

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

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ sh_binary(
666666
"$(rootpath @buildifier_prebuilt//:buildifier)",
667667
"$(rootpath //bazel:bzl_lint_test.sh)",
668668
"$(rootpath @buildifier_prebuilt//:buildifier)",
669+
"$(rootpath @git)",
669670
],
670671
data = [
671672
"MODULE.bazel",
@@ -677,5 +678,6 @@ sh_binary(
677678
"//bazel:tclfmt",
678679
"//bazel:tclint",
679680
"@buildifier_prebuilt//:buildifier",
681+
"@git",
680682
],
681683
)

MODULE.bazel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,12 @@ archive_override(
159159

160160
bazel_dep(name = "yosys", version = "0.62.bcr.2", dev_dependency = True)
161161
bazel_dep(name = "yosys-slang", version = "0.0.0", dev_dependency = True)
162+
archive_override(
163+
module_name = "yosys-slang",
164+
sha256 = "34198f2ed7b2d3175c3ce3c9fb1c6c91f28dbcfe531d97b91d6b12c48431bdef",
165+
strip_prefix = "sv-elab-6760afa2c9b9ba231a9c6a9e94f0939dd39f0a20",
166+
urls = ["https://github.com/povik/yosys-slang/archive/6760afa2c9b9ba231a9c6a9e94f0939dd39f0a20.tar.gz"],
167+
)
162168

163169
# --- Extensions ---
164170

MODULE.bazel.lock

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

bazel/fix_lint.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,27 @@
66
# that file-discovery logic is not duplicated (DRY).
77
set -euo pipefail
88

9+
TCL_TIDY_SH="$1"
10+
TCLFMT="$2"
11+
TCL_LINT_SH="$3"
12+
TCLINT="$4"
13+
BZL_TIDY_SH="$5"
14+
BZL_FMT_BUILDIFIER="$6"
15+
BZL_LINT_SH="$7"
16+
BZL_LINT_BUILDIFIER="$8"
17+
GIT="$9"
18+
919
export BUILD_WORKSPACE_DIRECTORY="${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
1020

1121
# TCL: auto-format then lint
12-
"$1" "$2"
13-
"$3" "$4" || rc=$?
22+
"${TCL_TIDY_SH}" "${TCLFMT}"
23+
"${TCL_LINT_SH}" "${TCLINT}" "${GIT}" || rc=$?
1424

1525
# Bazel: auto-format then lint
16-
"$5" "$6"
17-
"$7" "$8" || rc=$?
26+
"${BZL_TIDY_SH}" "${BZL_FMT_BUILDIFIER}"
27+
"${BZL_LINT_SH}" "${BZL_LINT_BUILDIFIER}" "${GIT}" || rc=$?
1828

19-
git -C "$BUILD_WORKSPACE_DIRECTORY" status
29+
"${GIT}" -C "$BUILD_WORKSPACE_DIRECTORY" status
2030

2131
if [ "${rc:-0}" -ne 0 ]; then
2232
echo "Error: lint violations remain that require manual fixes." >&2

src/Design.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ bool Design::isSequential(odb::dbMaster* master)
190190
if (!lib_cell) {
191191
return false;
192192
}
193-
return lib_cell->hasSequentials();
193+
return lib_cell->isSequential();
194194
}
195195

196196
bool Design::isInClock(odb::dbInst* inst)

src/cts/src/LatencyBalancer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ bool LatencyBalancer::propagateClock(odb::dbITerm* input)
582582
return true;
583583
}
584584
// Combinational components
585-
if (!libertyCell->hasSequentials()) {
585+
if (!libertyCell->isSequential()) {
586586
return true;
587587
}
588588
sta::LibertyPort* inputPort

src/cut/src/abc_library_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static bool IsCombinational(sta::LibertyCell* cell)
7878
return false;
7979
}
8080
return (!cell->isClockGate() && !cell->isPad() && !cell->isMacro()
81-
&& !cell->hasSequentials() && !cell->isLevelShifter()
81+
&& !cell->isSequential() && !cell->isLevelShifter()
8282
&& !cell->isIsolationCell() && !cell->isMemory());
8383
}
8484

src/cut/src/blif.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool Blif::writeBlif(const char* file_name, bool write_arrival_requireds)
9595
auto master_name = master->getName();
9696

9797
std::string current_gate
98-
= ((cell->hasSequentials()) ? ".mlatch " : ".gate ") + master_name;
98+
= ((cell->isSequential()) ? ".mlatch " : ".gate ") + master_name;
9999
std::string current_connections, current_clock;
100100
std::set<std::string> current_clocks;
101101

@@ -250,10 +250,10 @@ bool Blif::writeBlif(const char* file_name, bool write_arrival_requireds)
250250

251251
current_gate += current_connections;
252252

253-
if (cell->hasSequentials() && current_clocks.size() != 1) {
253+
if (cell->isSequential() && current_clocks.size() != 1) {
254254
continue;
255255
}
256-
if (cell->hasSequentials()) {
256+
if (cell->isSequential()) {
257257
current_gate += " " + current_clock;
258258
}
259259

src/cut/src/logic_cut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void ConnectPinToDriver(
212212
abc::Abc_Obj_t* abc_net = abc::Abc_NtkCreateNet(&abc_network);
213213

214214
if (network->isTopInstance(driver_instance)
215-
|| network->libertyCell(driver_instance)->hasSequentials()) {
215+
|| network->libertyCell(driver_instance)->isSequential()) {
216216
abc::Abc_Obj_t* abc_input = abc::Abc_NtkCreatePi(&abc_network);
217217
abc::Abc_ObjAddFanin(abc_net, abc_input);
218218
std::string driver_name = network->name(driver);

src/dbSta/src/dbNetwork.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5603,7 +5603,7 @@ bool dbNetwork::isValidFlop(odb::dbInst* FF) const
56035603
return false;
56045604
}
56055605
const LibertyCell* lib_cell = testCell(cell);
5606-
if (lib_cell == nullptr || !lib_cell->hasSequentials()) {
5606+
if (lib_cell == nullptr || !lib_cell->isSequential()) {
56075607
return false;
56085608
}
56095609

0 commit comments

Comments
 (0)