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

Fixed category assignement in device extractor

This commit is contained in:
Matthias Koefferlein 2023-09-26 22:45:13 +02:00
parent 30a5954f77
commit 883b7e7db8
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/db/dbNetlistDeviceExtractor.cc
View File

@ -571,7 +571,6 @@ void NetlistDeviceExtractor::error (const std::string &category_name, const std:
m_log_entries.push_back (db::LogEntryData (db::Error, cell_name (), msg)); m_log_entries.push_back (db::LogEntryData (db::Error, cell_name (), msg));
m_log_entries.back ().set_category_name (category_name); m_log_entries.back ().set_category_name (category_name);
m_log_entries.back ().set_category_description (category_description); m_log_entries.back ().set_category_description (category_description);
m_log_entries.back ().set_category_name ("device-extract");
if (tl::verbosity () >= 20) { if (tl::verbosity () >= 20) {
tl::error << m_log_entries.back ().to_string (); tl::error << m_log_entries.back ().to_string ();
@ -584,7 +583,6 @@ void NetlistDeviceExtractor::error (const std::string &category_name, const std:
m_log_entries.back ().set_category_name (category_name); m_log_entries.back ().set_category_name (category_name);
m_log_entries.back ().set_category_description (category_description); m_log_entries.back ().set_category_description (category_description);
m_log_entries.back ().set_geometry (poly); m_log_entries.back ().set_geometry (poly);
m_log_entries.back ().set_category_name ("device-extract");
if (tl::verbosity () >= 20) { if (tl::verbosity () >= 20) {
tl::error << m_log_entries.back ().to_string (); tl::error << m_log_entries.back ().to_string ();
@ -617,7 +615,6 @@ void NetlistDeviceExtractor::warn (const std::string &category_name, const std::
m_log_entries.push_back (db::LogEntryData (db::Warning, cell_name (), msg)); m_log_entries.push_back (db::LogEntryData (db::Warning, cell_name (), msg));
m_log_entries.back ().set_category_name (category_name); m_log_entries.back ().set_category_name (category_name);
m_log_entries.back ().set_category_description (category_description); m_log_entries.back ().set_category_description (category_description);
m_log_entries.back ().set_category_name ("device-extract");
if (tl::verbosity () >= 20) { if (tl::verbosity () >= 20) {
tl::warn << m_log_entries.back ().to_string (); tl::warn << m_log_entries.back ().to_string ();
@ -630,7 +627,6 @@ void NetlistDeviceExtractor::warn (const std::string &category_name, const std::
m_log_entries.back ().set_category_name (category_name); m_log_entries.back ().set_category_name (category_name);
m_log_entries.back ().set_category_description (category_description); m_log_entries.back ().set_category_description (category_description);
m_log_entries.back ().set_geometry (poly); m_log_entries.back ().set_geometry (poly);
m_log_entries.back ().set_category_name ("device-extract");
if (tl::verbosity () >= 20) { if (tl::verbosity () >= 20) {
tl::warn << m_log_entries.back ().to_string (); tl::warn << m_log_entries.back ().to_string ();

4
src/db/unit_tests/dbNetlistDeviceExtractorTests.cc
View File

@ -89,8 +89,8 @@ TEST(2_NetlistDeviceExtractorErrors)
std::vector<db::LogEntryData> errors (dummy_ex.begin_log_entries (), dummy_ex.end_log_entries ()); std::vector<db::LogEntryData> errors (dummy_ex.begin_log_entries (), dummy_ex.end_log_entries ());
EXPECT_EQ (int (errors.size ()), 4); EXPECT_EQ (int (errors.size ()), 4);
EXPECT_EQ (error2string (errors [0]), ":::():msg1"); EXPECT_EQ (error2string (errors [0]), ":device-extract::():msg1");
EXPECT_EQ (error2string (errors [1]), ":::(0,1;0,3;2,3;2,1):msg2"); EXPECT_EQ (error2string (errors [1]), ":device-extract::(0,1;0,3;2,3;2,1):msg2");
EXPECT_EQ (error2string (errors [2]), ":cat1:desc1:():msg1"); EXPECT_EQ (error2string (errors [2]), ":cat1:desc1:():msg1");
EXPECT_EQ (error2string (errors [3]), ":cat1:desc1:(10,11;10,13;12,13;12,11):msg3"); EXPECT_EQ (error2string (errors [3]), ":cat1:desc1:(10,11;10,13;12,13;12,11):msg3");
} }

2
testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 vendored
View File

@ -39,7 +39,7 @@ layout(
global(l10 SUBSTRATE) global(l10 SUBSTRATE)
# Log entries # Log entries
message(warning description('Must-connect nets VDD must be connected further up in the hierarchy - this is an error at the chip top level') cell(RINGO)) message(warning description('Must-connect nets VDD must be connected further up in the hierarchy - this is an error at chip top level') cell(RINGO) cat('must-connect'))
# Device class section # Device class section
class(PMOS MOS4) class(PMOS MOS4)