From c70e622590dcef64c6b1c6fdc46af482c10d9697 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 30 May 2024 16:21:52 +0200 Subject: [PATCH] Fixing issue #1724 (avoid duplicate LEF files) --- .../lefdef/db_plugin/dbLEFDEFPlugin.cc | 16 ++++++--- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 27 +++++++++++++++ testdata/lefdef/issue-1724/au.oas | Bin 0 -> 574 bytes testdata/lefdef/issue-1724/blocks.lef | 31 ++++++++++++++++++ testdata/lefdef/issue-1724/d/tech.lef | 12 +++++++ testdata/lefdef/issue-1724/tech.map | 6 ++++ testdata/lefdef/issue-1724/top | 10 ++++++ testdata/lefdef/issue-1724/top.def | 1 + 8 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 testdata/lefdef/issue-1724/au.oas create mode 100644 testdata/lefdef/issue-1724/blocks.lef create mode 100644 testdata/lefdef/issue-1724/d/tech.lef create mode 100644 testdata/lefdef/issue-1724/tech.map create mode 100644 testdata/lefdef/issue-1724/top create mode 120000 testdata/lefdef/issue-1724/top.def diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc index b9f1e9dcb..b15d76dc7 100644 --- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc +++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc @@ -160,9 +160,12 @@ LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &opti DEFImporter importer (warn_level ()); + std::set lef_files_read; + for (std::vector::const_iterator l = effective_options.begin_lef_files (); l != effective_options.end_lef_files (); ++l) { std::string lp = correct_path (*l, layout, base_path); + lef_files_read.insert (tl::normalize_path (lp)); tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); @@ -187,11 +190,16 @@ LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &opti std::string lp = tl::combine_path (input_dir, *e); - tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); + // skip if already read (issue-1724) + if (lef_files_read.find (tl::normalize_path (lp)) == lef_files_read.end ()) { - tl::InputStream lef_stream (lp); - tl::log << tl::to_string (tr ("Reading")) << " " << lp; - importer.read_lef (lef_stream, layout, state); + tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file: ")) + lp); + + tl::InputStream lef_stream (lp); + tl::log << tl::to_string (tr ("Reading")) << " " << lp; + importer.read_lef (lef_stream, layout, state); + + } } diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 6646fbe6d..25175470b 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -1050,3 +1050,30 @@ TEST(212_widthtable) run_test (_this, "issue-1528", "map:gds.map+lef:tech.lef+def:routed.def", "au.oas", default_options (), false); } +// issue-1724 (skip duplicate LEF) +TEST(213_no_duplicate_LEF) +{ + db::Layout ly; + + std::string fn_path (tl::testdata ()); + fn_path += "/lefdef/issue-1724/"; + + db::LEFDEFReaderOptions lefdef_opt = default_options (); + lefdef_opt.set_map_file ("tech.map"); + std::vector lf; + lf.push_back ("d/tech.lef"); + lf.push_back ("blocks.lef"); + lefdef_opt.set_lef_files (lf); + lefdef_opt.set_read_lef_with_def (true); + db::LoadLayoutOptions opt; + opt.set_options (lefdef_opt); + + { + tl::InputStream is (fn_path + "top.def"); + db::Reader reader (is); + reader.read (ly, opt); + } + + db::compare_layouts (_this, ly, fn_path + "au.oas", db::WriteOAS); +} + diff --git a/testdata/lefdef/issue-1724/au.oas b/testdata/lefdef/issue-1724/au.oas new file mode 100644 index 0000000000000000000000000000000000000000..02bb446865b5da48a048da26c2f367b86d5e9830 GIT binary patch literal 574 zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKC?n3q!6L)YEF;ds&!EJR>XUoMnybM;fb~F; z;|1o9>4KX(8~>b$4qRRSKbqrK6n{_8gJqfNT9PTCm&e!2&y8CXr%BhK8*Y3l7Nv6^c|cKbRrjuuK*xyI>9@FQdp|Mur3DRYYzw zFW9UM6afh`2p(XTQD@{}F=Hbm(7KTY7#INc{pia8 literal 0 HcmV?d00001 diff --git a/testdata/lefdef/issue-1724/blocks.lef b/testdata/lefdef/issue-1724/blocks.lef new file mode 100644 index 000000000..1ac45cb8b --- /dev/null +++ b/testdata/lefdef/issue-1724/blocks.lef @@ -0,0 +1,31 @@ +VERSION 5.8 ; + +MACRO a + ORIGIN 0 0 ; + SIZE 600 BY 600 ; + OBS + LAYER M1 ; + RECT 10 10 590 590 ; + END +END a + +MACRO b + ORIGIN -600 0 ; + SIZE 400 BY 500 ; + OBS + LAYER M1 ; + RECT 610 10 990 490 ; + END +END b + +MACRO c + ORIGIN -500 -500 ; + SIZE 500 BY 500 ; + OBS + LAYER M1 ; + POLYGON 510 610 610 610 610 510 990 510 990 990 510 990 ; + LAYER overlap ; + RECT 500 700 1000 1000 ; + POLYGON 500 600 600 600 600 500 1000 500 1000 700 500 700 ; + END +END c diff --git a/testdata/lefdef/issue-1724/d/tech.lef b/testdata/lefdef/issue-1724/d/tech.lef new file mode 100644 index 000000000..606730c96 --- /dev/null +++ b/testdata/lefdef/issue-1724/d/tech.lef @@ -0,0 +1,12 @@ +VERSION 5.8 ; + +LAYER M1 + TYPE ROUTING ; + DIRECTION HORIZONTAL ; + WIDTH 0.1 ; + PITCH 0.1 ; +END M1 + +LAYER overlap + TYPE OVERLAP ; +END overlap diff --git a/testdata/lefdef/issue-1724/tech.map b/testdata/lefdef/issue-1724/tech.map new file mode 100644 index 000000000..e848325a6 --- /dev/null +++ b/testdata/lefdef/issue-1724/tech.map @@ -0,0 +1,6 @@ +DIEAREA ALL 1 0 +#BOUNDARY DIEAREA 1 0 +BOUNDARY MACRO 1 0 +#M1 LEFOBS 2 0 +M1 LEFOBS 3 0 +M1 BLOCKAGE 3 0 diff --git a/testdata/lefdef/issue-1724/top b/testdata/lefdef/issue-1724/top new file mode 100644 index 000000000..1e1cd5c32 --- /dev/null +++ b/testdata/lefdef/issue-1724/top @@ -0,0 +1,10 @@ +VERSION 5.8 ; +DESIGN top ; +UNITS DISTANCE MICRONS 1000 ; +DIEAREA ( 0 0 ) ( 1000000 1000000 ) ; +COMPONENTS 3 ; +- a a + PLACED ( 0 0 ) N ; +- b b + PLACED ( 600000 0 ) N ; +- c c + PLACED ( 500000 500000 ) N ; +END COMPONENTS +END DESIGN diff --git a/testdata/lefdef/issue-1724/top.def b/testdata/lefdef/issue-1724/top.def new file mode 120000 index 000000000..83a3157d1 --- /dev/null +++ b/testdata/lefdef/issue-1724/top.def @@ -0,0 +1 @@ +top \ No newline at end of file