From 26cb2be83e95c2471acb4c9791eb55df29772c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20K=C3=B6fferlein?= <matthias@koefferlein.de>
Date: Sun, 11 Feb 2024 10:38:53 +0100
Subject: [PATCH] Lefdef all should not map boundary (#1614)

* As suggested by Stefan Thiede: LEF/DEF 'ALL' purpose should not match obs and fill

* Updated unit tests

---------

Co-authored-by: Matthias Koefferlein <matthias@klayout.de>
---
 .../lefdef/db_plugin/dbLEFDEFImporter.cc        |   2 +-
 .../lefdef/unit_tests/dbLEFDEFImportTests.cc    |   6 +++---
 testdata/lefdef/patternname/au.oas.gz           | Bin 249 -> 336 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
index fc9df3080..5f0394057 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
@@ -1098,7 +1098,7 @@ LEFDEFReaderState::read_single_map_file (const std::string &path, std::map<std::
 
   //  List of purposes corresponding to ALL
   LayerPurpose all_purposes[] = {
-    LEFPins, Pins, Fills, FillsOPC, Obstructions, SpecialRouting, Routing, ViaGeometry
+    LEFPins, Pins, SpecialRouting, Routing, ViaGeometry
   };
 
   while (! ts.at_end ()) {
diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
index a795186ae..6646fbe6d 100644
--- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
+++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
@@ -420,7 +420,7 @@ TEST(def15)
 {
   db::LEFDEFReaderOptions opt = default_options ();
   opt.set_macro_resolution_mode (1);
-  run_test (_this, "def15", "map:test.map+lef:tech.lef+def:test.def", "au2.oas.gz", opt);
+  run_test (_this, "def15", "map:test.map+lef:tech.lef+def:test.def", "au2_2.oas.gz", opt);
 }
 
 TEST(def16)
@@ -814,7 +814,7 @@ TEST(117_mapfile_all)
       "'+M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/SPNET/...\\' (1/5)';"
       "'+M1.NET;M1.SPNET : \\'M1.NET/SPNET\\' (16/0)';"
       "'+M1.NET : M1.NET (18/0)';"
-      "'+M1.FILL;M1.FILLOPC;M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/FILL/...\\' (22/2)';"
+      "'+M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/SPNET/...\\' (22/2)';"
       "'+\\'M1.NET:1\\';\\'M1.PIN:1\\';\\'M1.SPNET:1\\';\\'M1.VIA:1\\' : \\'M1.NET:1/PIN:1/...\\' (6/0)';"
       "'+\\'M1.NET:1\\' : \\'M1.NET:1\\' (7/0)';"
       "'+M1.PIN : M1.PIN (3/0)';"
@@ -822,7 +822,7 @@ TEST(117_mapfile_all)
       "'+M1.FILL : M1.FILL (14/0)';"
       "'+M1.FILL : M1.FILL (15/0)';"
       "'+M1.FILL : M1.FILL (17/0)';"
-      "'+M1.FILLOPC : M1.FILLOPC (9/0)';"
+      "'M1.FILLOPC : M1.FILLOPC (9/0)';"
       "'\\'M1.FILLOPC:1\\' : \\'M1.FILLOPC:1\\' (10/0)';"
       "'\\'M1.FILLOPC:2\\' : \\'M1.FILLOPC:2\\' (11/0)';"
       "'\\'M1.VIA:SIZE0.05X0.05\\' : \\'M1.VIA:SIZE0.05X0.05\\' (20/0)';"
diff --git a/testdata/lefdef/patternname/au.oas.gz b/testdata/lefdef/patternname/au.oas.gz
index f63a9686369c1962f863620e32d92e82d07bdf41..b6ae4e87d5ab41aa59e3fe2e8512028365c3a3a5 100644
GIT binary patch
delta 320
zcmV-G0l)tF0nh>#ABzYG`5eJz00VSwa9=THW@RxpIbo3u8-FMx&cwkY!_O=u&ce^2
z#E|Nfd&Zip!9alZK#}7G=8oxtn>!o-oQMuwUH(6s<5m=ZPtSv8nj5S5O=li>aNt_@
z<-F}@65{lg+7|U~oWb_iX7T3OY3KVst!B>Hy7wnDCv!=DffB<4Mw7>4A5E`(F6O<+
z|KZDJem;hcUw^)QnelX{WJSTLg6<zui4y}EULRCEtSk2HWye{Y<OO;*MGU-*qSo>Z
zj7%GZKZyS1y2&YOsldqeL9|2oDCbWuQCnk1rXQ?7ST}NR<m6`B!X_Xkz{?<bfRPzw
zr;IoQ$0J5&*)UJXcwa-0cweJ1T|*NC0|?>h<D+Y&Yas+uw2_gC@i`+S1EVryF=GWI
SL&FFI3=9BbO%G2O0ssJIn3ekg

literal 249
zcmV<V00#dbiwFo2oKRu_17US8Z((x)Qw?_Y_0;uu4E7A><zi$u)H7gs!OnmTWJINc
z<9!_?;)6Zi{ajt*J^eyl-Ccv?!#!O>JUCcncx52cp?=sD$cS<U$A|a_#5=qC`0y~7
z<QFi53E41D$9P{uk9c3BFkM3v0|N-*=;Nbnq-(@2>}#m!=Nh6P;OVFD=IP_3ucxQS
zEYHlqgG&Oa!w6GC0jvYN1h**A30Mp>2I|2r#mgvaEziKnv_bfT=ufVjoT8Qrj7%Ry
zJA{vN{^Sz1HD+Y`!TN)BBj-j=Zl*140#X9J41xz3nHokiU|;|Mw6XlpW&!{J-nDgL