luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #356 from The-OpenROAD-Project-staging/sta_fix_spefrdr 

SpefReader: rescue findInstance/findNet for flat names with literal '/' or escaped specials
This commit is contained in:
Matt Liberty 2026-04-30 18:43:15 +00:00 committed by GitHub
parent 35e778a9b0 7edfb12825
commit d503c0ede5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
parasitics/SpefReader.cc
View File

@ -133,10 +133,39 @@ SpefReader::setBusBrackets(char left,
bus_brkt_right_ = right;
}
std::string
SpefReader::stripped(std::string_view spef_name) const
{
std::string out;
out.reserve(spef_name.size());
for (size_t i = 0; i < spef_name.size(); i++) {
char ch = spef_name[i];
if (ch == '\\' && i + 1 < spef_name.size())
out += spef_name[++i];
else
out += ch;
}
return out;
}
Instance *
SpefReader::findInstanceRelative(std::string_view name)
{
return sdc_network_->findInstanceRelative(instance_, name);
// Network::findInstanceRelative splits at unescaped '/' and walks
// hierarchy. That misses flat instance names with a literal '/' (e.g.
// post-CTS buffers like "u_x/g1234") because there is no parent module
// matching the pre-'/' segment; it also misses bracket-escaped names
// ("bus\[0\]") whose unescaped form is what the DEF reader stored.
// dbNetwork::findInstance has a flat block_->findInst() fallback that
// both cases need.
Instance *inst = sdc_network_->findInstanceRelative(instance_, name);
if (inst == nullptr)
inst = network_->findChild(instance_, name);
if (inst == nullptr && name.find('\\') != std::string_view::npos)
inst = network_->findChild(instance_, stripped(name));
debugPrint(debug_, "spef_lookup", 1, "findInstance '{}' -> {}", name,
inst ? "found" : "miss");
return inst;
}
Net *
@ -147,6 +176,14 @@ SpefReader::findNetRelative(std::string_view name)
// don't follow the rules.
if (net == nullptr)
net = sdc_network_->findNetRelative(instance_, name);
// dbNetwork::findNet at top scope does a literal block_->findNet() which
// finds flat names with '/' that findNetRelative cannot.
if (net == nullptr)
net = network_->findNet(instance_, name);
if (net == nullptr && name.find('\\') != std::string_view::npos)
net = network_->findNet(instance_, stripped(name));
debugPrint(debug_, "spef_lookup", 1, "findNet '{}' -> {}", name,
net ? "found" : "miss");
return net;
}

1
parasitics/SpefReaderPvt.hh
View File

@ -121,6 +121,7 @@ private:
Pin *findPortPinRelative(std::string_view name);
Net *findNetRelative(std::string_view name);
Instance *findInstanceRelative(std::string_view name);
std::string stripped(std::string_view spef_name) const;
ParasiticNode *findParasiticNode(std::string_view name,
bool local_only);