luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also fixed issue #1470 (def pinname VDD.extra1 should be written as VDD TEXT in gds/oasis)

This commit is contained in:
Matthias Koefferlein 2023-09-09 21:47:25 +02:00
parent d52087fab4
commit 5c0f810006
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
View File

@ -1150,6 +1150,22 @@ DEFImporter::read_vias (db::Layout &layout, db::Cell & /*design*/, double scale)
}
}
// issue #1470
static std::string fix_pin_name (const std::string &pin_name)
{
auto pos = pin_name.find (".extra");
if (pos == std::string::npos) {
return pin_name;
} else {
// TODO: do we need to be more specific?
// Formally, the allowed specs are:
// pinname.extraN
// pinname.extraN[n]
// pinname.extraN[n][m]...
return std::string (pin_name.begin (), pin_name.begin () + pos);
}
}
void
DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale)
{
@ -1282,7 +1298,7 @@ DEFImporter::read_pins (db::Layout &layout, db::Cell &design, double scale)
if (flush || ! peek ("+")) {
// TODO: put a label on every single object?
std::string label = pin_name;
std::string label = fix_pin_name (pin_name);
/* don't add the direction currently, a name is sufficient
if (! dir.empty ()) {
label += ":";

2
src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
View File

@ -333,7 +333,7 @@ TEST(def2)
{
db::LEFDEFReaderOptions options = default_options ();
options.set_cell_outline_layer ("OUTLINE (10/0)");
run_test (_this, "def2", "lef:0.lef+lef:1.lef+def:in.def.gz", "au_2.oas.gz", options);
run_test (_this, "def2", "lef:0.lef+lef:1.lef+def:in.def.gz", "au_3.oas.gz", options);
}
TEST(def3)