From 84573a21cedd5e99d5f8b743f0055b7bb5f9a426 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 2 Aug 2020 11:31:37 +0200
Subject: [PATCH] Skip END LIBRARY, so LEF files can be cat together

---
 .../lefdef/db_plugin/dbLEFImporter.cc         |   4 +-
 .../lefdef/unit_tests/dbLEFDEFImportTests.cc  |   9 +++
 testdata/lefdef/lef-skips-end-library/au.oas  | Bin 0 -> 596 bytes
 testdata/lefdef/lef-skips-end-library/in.def  |  34 +++++++++
 testdata/lefdef/lef-skips-end-library/in.lef  |  67 ++++++++++++++++++
 5 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 testdata/lefdef/lef-skips-end-library/au.oas
 create mode 100644 testdata/lefdef/lef-skips-end-library/in.def
 create mode 100644 testdata/lefdef/lef-skips-end-library/in.lef

diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
index a3da23ab1..c4060aec4 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
@@ -1046,9 +1046,9 @@ LEFImporter::do_read (db::Layout &layout)
 
     if (test ("END")) {
 
-      //  END LIBRARY terminates the file
       expect ("LIBRARY");
-      break;
+      //  END LIBRARY should terminate the file, but we allow to continue, so we can cat LEF files:
+      //  break;
 
     } else if (test ("VERSION")) {
 
diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
index 593aa04d6..bc9526c93 100644
--- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
+++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
@@ -512,3 +512,12 @@ TEST(113_masks_1)
   )
 }
 
+TEST(114_lef_skips_end_library)
+{
+  db::LEFDEFReaderOptions opt = default_options ();
+  opt.set_produce_pin_names (true);
+  opt.set_pin_property_name (2);
+  opt.set_cell_outline_layer ("OUTLINE (13/0)");
+  run_test (_this, "lef-skips-end-library", "lef:in.lef+def:in.def", "au.oas", opt, false);
+}
+
diff --git a/testdata/lefdef/lef-skips-end-library/au.oas b/testdata/lefdef/lef-skips-end-library/au.oas
new file mode 100644
index 0000000000000000000000000000000000000000..436fa32c63d123c4e7396be278b2389fb0dec065
GIT binary patch
literal 596
zcmd^1J5Iwu5S`tPv59wyL~shUvP6NX2#^~%cx6`dPacO)wFN?=ClW13h&VwS4njxi
zV<1k!5Gahq4VdE1`^_ApDeQ5TphY!g;%s^f?>_WLNBiiC<l3RlN|QQUwk9);yRvC}
z5e&4_-|?dStDvJHy0)s_xyf@mSl&G>{T*~!imq;|+BEIWwzy1F0z|RNy)R9G82Z(s
z&24Ff5+M5`+$v_%+Ll5JE_*x-$j_6x$thv-mkN0?BNyb)R<L)g;O&`padaX%<4@k|
zg}?F;x_DO~LBK~W3RYSl5QFg}lZ?tRzNdWh0c+*~qk}G{0vo|Z0&EyP`p*OK3A81_
AdjJ3c

literal 0
HcmV?d00001

diff --git a/testdata/lefdef/lef-skips-end-library/in.def b/testdata/lefdef/lef-skips-end-library/in.def
new file mode 100644
index 000000000..6220e6ab0
--- /dev/null
+++ b/testdata/lefdef/lef-skips-end-library/in.def
@@ -0,0 +1,34 @@
+VERSION 5.7 ;
+DIVIDERCHAR "/" ;
+BUSBITCHARS "[]" ;
+DESIGN test ;
+UNITS DISTANCE MICRONS 2000 ;
+
+DIEAREA ( 0 0 ) ( 37520 7840 ) ;
+
+PINS 12 ;
+- VDD + NET VDD + SPECIAL + DIRECTION INOUT + USE POWER
+  + LAYER M2 ( -320 0 ) ( 320 37520 )
++ FIXED ( 37520 3920 ) W ;
+- VSS + NET VSS + SPECIAL + DIRECTION INOUT + USE GROUND
+ + PORT
+  + LAYER M2 ( -18760 0 ) ( 18760 640 )
++ FIXED ( 18760 -320 ) N
+ + PORT
+  + LAYER M2 ( -18760 0 ) ( 18760 640 )
++ FIXED ( 18760 8160 ) S
+ ;
+END PINS
+
+SPECIALNETS 4 ;
+- VSS  ( * VSS )
++ ROUTED M2 640 + SHAPE FOLLOWPIN ( 0 0 ) ( 37520 * )
+NEW M2 640 + SHAPE FOLLOWPIN ( 0 7840 ) ( 37520 * )
+  + USE GROUND
+ ;
+- VDD  ( * VDD )
++ ROUTED M2 640 + SHAPE FOLLOWPIN ( 0 3920 ) ( 37520 * )
+  + USE POWER
+ ;
+END SPECIALNETS
+END DESIGN
diff --git a/testdata/lefdef/lef-skips-end-library/in.lef b/testdata/lefdef/lef-skips-end-library/in.lef
new file mode 100644
index 000000000..26ff0b93c
--- /dev/null
+++ b/testdata/lefdef/lef-skips-end-library/in.lef
@@ -0,0 +1,67 @@
+VERSION 5.7 ;
+
+BUSBITCHARS "[]" ;
+DIVIDERCHAR "/" ;
+UNITS
+	DATABASE MICRONS 1000 ;
+END UNITS
+
+MANUFACTURINGGRID 0.002 ;
+
+USEMINSPACING OBS OFF ;
+
+END LIBRARY
+
+LAYER overlap
+	TYPE OVERLAP ;
+END overlap
+
+LAYER contact
+	TYPE CUT ;
+END contact
+
+END LIBRARY
+
+LAYER metal1
+	TYPE ROUTING ;
+	DIRECTION HORIZONTAL ;
+END metal1
+
+LAYER via1
+	TYPE CUT ;
+END via1
+
+LAYER metal2
+	TYPE ROUTING ;
+	DIRECTION VERTICAL ;
+END metal2
+
+LAYER via2
+	TYPE CUT ;
+END via2
+
+LAYER metal3
+	TYPE ROUTING ;
+	DIRECTION HORIZONTAL ;
+END metal3
+
+LAYER via3
+	TYPE CUT ;
+END via3
+
+LAYER metal4
+	TYPE ROUTING ;
+	DIRECTION VERTICAL ;
+END metal4
+
+END LIBRARY
+LAYER via4
+	TYPE CUT ;
+END via4
+
+LAYER metal5
+	TYPE ROUTING ;
+	DIRECTION HORIZONTAL ;
+END metal5
+
+END LIBRARY