Skip to content

Commit a9f87e0

Browse files
committed
Merge remote-tracking branch 'private/master' into gpl-extend-max-iter-by-routability
2 parents 50bc7f2 + abdaff9 commit a9f87e0

File tree

100 files changed

+6061
-3033
lines changed

Some content is hidden

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

100 files changed

+6061
-3033
lines changed

.whitespace

Lines changed: 0 additions & 1 deletion
This file was deleted.

MODULE.bazel

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ bazel_dep(name = "toolchains_llvm", version = "1.4.0")
114114
# Configure and register the toolchain.
115115
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
116116
llvm.toolchain(
117-
llvm_version = "20.1.0",
117+
llvm_version = "20.1.2",
118118
)
119119
use_repo(llvm, "llvm_toolchain")
120120
# use_repo(llvm, "llvm_toolchain_llvm") # if you depend on specific tools in scripts
@@ -151,7 +151,7 @@ bazel_dep(name = "bazel-orfs")
151151
# To bump version, run: bazelisk run @bazel-orfs//:bump
152152
git_override(
153153
module_name = "bazel-orfs",
154-
commit = "72078ddd575513b35bd3cdfdb5c115949fc44e97",
154+
commit = "abacf584d7515bebec96491c757a806431b7f9f7",
155155
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
156156
)
157157

@@ -160,10 +160,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
160160
# To bump version, run: bazelisk run @bazel-orfs//:bump
161161
orfs.default(
162162
# Official image https://hub.docker.com/r/openroad/orfs/tags
163-
image = "docker.io/openroad/orfs:v3.0-3455-g9638e97b",
163+
image = "docker.io/openroad/orfs:v3.0-3503-gd7c7e73f",
164164
# Use OpenROAD of this repo instead of from the docker image
165165
openroad = "//:openroad",
166-
sha256 = "7d6478d96c474f29f21e700f723d30b70d44e88686c3801688a22b35c35698e7",
166+
sha256 = "d5539ade517724de3765362589be443afb2624b14391b365612c8949a7c99a19",
167167
)
168168
use_repo(orfs, "com_github_nixos_patchelf_download")
169169
use_repo(orfs, "docker_orfs")
@@ -195,12 +195,13 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
195195
maven.install(
196196
name = "openroad_maven",
197197
artifacts = [
198-
"org.chipsalliance:chisel_2.13:7.0.0-RC1+22-2cb90ea2-SNAPSHOT",
199-
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0-RC1+22-2cb90ea2-SNAPSHOT",
198+
"org.chipsalliance:chisel_2.13:7.0.0-RC3",
199+
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0-RC3",
200200
],
201201
repositories = [
202-
"https://s01.oss.sonatype.org/content/repositories/snapshots",
203202
"https://repo1.maven.org/maven2",
203+
"https://s01.oss.sonatype.org/content/repositories/releases",
204+
"https://s01.oss.sonatype.org/content/repositories/snapshots",
204205
],
205206
)
206207
use_repo(maven, "openroad_maven")

MODULE.bazel.lock

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

etc/DependencyInstaller.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _versionCompare() {
1212
}
1313

1414
_equivalenceDeps() {
15-
yosysVersion=v0.53
15+
yosysVersion=v0.55
1616

1717
# yosys
1818
yosysPrefix=${PREFIX:-"/usr/local"}

src/cts/src/TritonCTS.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2449,7 +2449,9 @@ void TritonCTS::adjustLatencies(TreeBuilder* macroBuilder,
24492449
driverOutputTerm->disconnect();
24502450
// hierarchical fix. guarded by network has hierarchy
24512451
if (candidate_hier_net && network_->hasHierarchy()) {
2452-
driverOutputTerm->connect(orig_flat_net, candidate_hier_net);
2452+
network_->connectPin((sta::Pin*) driverOutputTerm,
2453+
(sta::Net*) orig_flat_net,
2454+
(sta::Net*) candidate_hier_net);
24532455
} else {
24542456
driverOutputTerm->connect(outputNet);
24552457
}

src/dbSta/include/db_sta/dbNetwork.hh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include <set>
7+
#include <unordered_set>
78

89
#include "odb/db.h"
910
#include "sta/ConcreteNetwork.hh"
@@ -66,6 +67,7 @@ class dbNetwork : public ConcreteNetwork
6667
void clear() override;
6768
CellPortIterator* portIterator(const Cell* cell) const override;
6869

70+
void AxiomCheck();
6971
void readLefAfter(dbLib* lib);
7072
void readDefAfter(dbBlock* block);
7173
void readDbAfter(dbDatabase* db);
@@ -275,6 +277,7 @@ class dbNetwork : public ConcreteNetwork
275277
// Net functions
276278
ObjectId id(const Net* net) const override;
277279
Net* findNet(const Instance* instance, const char* net_name) const override;
280+
Net* findNetAllScopes(const char* net_name) const;
278281
void findInstNetsMatching(const Instance* instance,
279282
const PatternMatch* pattern,
280283
// Return value.
@@ -327,6 +330,13 @@ class dbNetwork : public ConcreteNetwork
327330
dbNet* new_flat_net,
328331
dbNet* orig_flat_net);
329332

333+
void reassociateFromDbNetView(dbNet* flat_net, dbModNet* mod_net);
334+
335+
void accumulateFlatLoadPinsOnNet(
336+
Net* net,
337+
Pin* drvr_pin,
338+
std::unordered_set<const Pin*>& accumulated_pins);
339+
330340
int fromIndex(const Port* port) const override;
331341
int toIndex(const Port* port) const override;
332342
bool isBus(const Port*) const override;

0 commit comments

Comments
 (0)