Merge pull request #2065 from KLayout/feature/issue-2041

Feature/issue 2041

Author: klayoutmatthias

src/buddies/src/bd/bdReaderOptions.cc

@@ -846,12 +846,20 @@ static std::vector<std::string> split_file_list (const std::string &infile)
 
 void read_files (db::Layout &layout, const std::string &infile, const db::LoadLayoutOptions &options)
 {
+  //  We may do this:
+  //    db::LayoutLocker locker (&layout);
+  //  but there are yet unknown side effects
+
+  //  enter a LEF caching context for chaining multiple DEF with the same LEF
+  db::LoadLayoutOptions local_options (options);
+  local_options.set_option_by_name ("lefdef_config.lef_context_enabled", true);
+
   std::vector<std::string> files = split_file_list (infile);
 
   for (std::vector<std::string>::const_iterator f = files.begin (); f != files.end (); ++f) {
     tl::InputStream stream (*f);
     db::Reader reader (stream);
-    reader.read (layout, options);
+    reader.read (layout, local_options);
   }
 }
 

src/buddies/unit_tests/bdConverterTests.cc

@@ -186,3 +186,327 @@ TEST(6)
 
   db::compare_layouts (this, layout, input_au, db::WriteGDS2);
 }
+
+//  Large LEF/DEF to OAS converter test
+TEST(10)
+{
+  test_is_long_runner ();
+
+  std::string input_dir = tl::testdata_private ();
+  input_dir += "/lefdef/strm2oas/";
+
+  std::string lef_dir = input_dir + "/lef";
+  std::string def_dir = input_dir + "/def";
+  std::string gds_dir = input_dir + "/gds";
+
+  std::string input_au = input_dir + "/strm2oas_au.oas";
+
+  std::string output = this->tmp_file ("strm2oas.oas");
+  std::string map_arg = "--lefdef-map=" + input_dir + "/sky130.map";
+
+  const char *lef_files[] = {
+    "sky130_fd_sc_hd.tlef",
+    "sky130_fd_sc_hd_merged.lef",
+    "sky130_fd_sc_hs_merged.lef",
+    "sky130_ef_sc_hd__decap_20_12.lef",
+    "sky130_ef_sc_hd__decap_80_12.lef",
+    "sky130_ef_sc_hd__fill_4.lef",
+    "sky130_ef_sc_hd__decap_40_12.lef",
+    "sky130_ef_sc_hd__decap_60_12.lef",
+    "sky130_ef_io__analog_esd_pad.lef",
+    "sky130_ef_io__analog_noesd_pad.lef",
+    "sky130_ef_io__analog_pad.lef",
+    "sky130_ef_io__bare_pad.lef",
+    "sky130_ef_io__com_bus_slice_10um.lef",
+    "sky130_ef_io__com_bus_slice_1um.lef",
+    "sky130_ef_io__com_bus_slice_20um.lef",
+    "sky130_ef_io__com_bus_slice_5um.lef",
+    "sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.lef",
+    "sky130_ef_io__corner_pad.lef",
+    "sky130_ef_io__disconnect_vccd_slice_5um.lef",
+    "sky130_ef_io__disconnect_vdda_slice_5um.lef",
+    "sky130_ef_io__gpiov2_pad.lef",
+    "sky130_ef_io__gpiov2_pad_wrapped.lef",
+    "sky130_ef_io__top_power_hvc.lef",
+    "sky130_ef_io__vccd_hvc_pad.lef",
+    "sky130_ef_io__vccd_lvc_clamped2_pad.lef",
+    "sky130_ef_io__vccd_lvc_clamped3_pad.lef",
+    "sky130_ef_io__vccd_lvc_clamped_pad.lef",
+    "sky130_ef_io__vccd_lvc_pad.lef",
+    "sky130_ef_io__vdda_hvc_clamped_pad.lef",
+    "sky130_ef_io__vdda_hvc_pad.lef",
+    "sky130_ef_io__vdda_lvc_pad.lef",
+    "sky130_ef_io__vddio_hvc_clamped_pad.lef",
+    "sky130_ef_io__vddio_hvc_pad.lef",
+    "sky130_ef_io__vddio_lvc_pad.lef",
+    "sky130_ef_io__vssa_hvc_clamped_pad.lef",
+    "sky130_ef_io__vssa_hvc_pad.lef",
+    "sky130_ef_io__vssa_lvc_pad.lef",
+    "sky130_ef_io__vssd_hvc_pad.lef",
+    "sky130_ef_io__vssd_lvc_clamped2_pad.lef",
+    "sky130_ef_io__vssd_lvc_clamped3_pad.lef",
+    "sky130_ef_io__vssd_lvc_clamped_pad.lef",
+    "sky130_ef_io__vssd_lvc_pad.lef",
+    "sky130_ef_io__vssio_hvc_clamped_pad.lef",
+    "sky130_ef_io__vssio_hvc_pad.lef",
+    "sky130_ef_io__vssio_lvc_pad.lef",
+    "sky130_fd_io__signal_5_sym_hv_local_5term.lef",
+    "sky130_fd_io__top_gpiov2.lef",
+    "sky130_fd_io__top_power_hvc_wpadv2.lef",
+    "sky130_fd_sc_hvl__a21o_1.lef",
+    "sky130_fd_sc_hvl__a21oi_1.lef",
+    "sky130_fd_sc_hvl__a22o_1.lef",
+    "sky130_fd_sc_hvl__a22oi_1.lef",
+    "sky130_fd_sc_hvl__and2_1.lef",
+    "sky130_fd_sc_hvl__and3_1.lef",
+    "sky130_fd_sc_hvl__buf_1.lef",
+    "sky130_fd_sc_hvl__buf_16.lef",
+    "sky130_fd_sc_hvl__buf_2.lef",
+    "sky130_fd_sc_hvl__buf_32.lef",
+    "sky130_fd_sc_hvl__buf_4.lef",
+    "sky130_fd_sc_hvl__buf_8.lef",
+    "sky130_fd_sc_hvl__conb_1.lef",
+    "sky130_fd_sc_hvl__decap_4.lef",
+    "sky130_fd_sc_hvl__decap_8.lef",
+    "sky130_fd_sc_hvl__dfrbp_1.lef",
+    "sky130_fd_sc_hvl__dfrtp_1.lef",
+    "sky130_fd_sc_hvl__dfsbp_1.lef",
+    "sky130_fd_sc_hvl__dfstp_1.lef",
+    "sky130_fd_sc_hvl__dfxbp_1.lef",
+    "sky130_fd_sc_hvl__dfxtp_1.lef",
+    "sky130_fd_sc_hvl__diode_2.lef",
+    "sky130_fd_sc_hvl__dlclkp_1.lef",
+    "sky130_fd_sc_hvl__dlrtp_1.lef",
+    "sky130_fd_sc_hvl__dlxtp_1.lef",
+    "sky130_fd_sc_hvl__einvn_1.lef",
+    "sky130_fd_sc_hvl__einvp_1.lef",
+    "sky130_fd_sc_hvl__fill_1.lef",
+    "sky130_fd_sc_hvl__fill_2.lef",
+    "sky130_fd_sc_hvl__fill_4.lef",
+    "sky130_fd_sc_hvl__fill_8.lef",
+    "sky130_fd_sc_hvl__inv_1.lef",
+    "sky130_fd_sc_hvl__inv_16.lef",
+    "sky130_fd_sc_hvl__inv_2.lef",
+    "sky130_fd_sc_hvl__inv_4.lef",
+    "sky130_fd_sc_hvl__inv_8.lef",
+    "sky130_fd_sc_hvl__lsbufhv2hv_hl_1.lef",
+    "sky130_fd_sc_hvl__lsbufhv2hv_lh_1.lef",
+    "sky130_fd_sc_hvl__lsbufhv2lv_1.lef",
+    "sky130_fd_sc_hvl__lsbufhv2lv_simple_1.lef",
+    "sky130_fd_sc_hvl__lsbuflv2hv_1.lef",
+    "sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.lef",
+    "sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.lef",
+    "sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.lef",
+    "sky130_fd_sc_hvl__mux2_1.lef",
+    "sky130_fd_sc_hvl__mux4_1.lef",
+    "sky130_fd_sc_hvl__nand2_1.lef",
+    "sky130_fd_sc_hvl__nand3_1.lef",
+    "sky130_fd_sc_hvl__nor2_1.lef",
+    "sky130_fd_sc_hvl__nor3_1.lef",
+    "sky130_fd_sc_hvl__o21a_1.lef",
+    "sky130_fd_sc_hvl__o21ai_1.lef",
+    "sky130_fd_sc_hvl__o22a_1.lef",
+    "sky130_fd_sc_hvl__o22ai_1.lef",
+    "sky130_fd_sc_hvl__or2_1.lef",
+    "sky130_fd_sc_hvl__or3_1.lef",
+    "sky130_fd_sc_hvl__probe_p_8.lef",
+    "sky130_fd_sc_hvl__probec_p_8.lef",
+    "sky130_fd_sc_hvl__schmittbuf_1.lef",
+    "sky130_fd_sc_hvl__sdfrbp_1.lef",
+    "sky130_fd_sc_hvl__sdfrtp_1.lef",
+    "sky130_fd_sc_hvl__sdfsbp_1.lef",
+    "sky130_fd_sc_hvl__sdfstp_1.lef",
+    "sky130_fd_sc_hvl__sdfxbp_1.lef",
+    "sky130_fd_sc_hvl__sdfxtp_1.lef",
+    "sky130_fd_sc_hvl__sdlclkp_1.lef",
+    "sky130_fd_sc_hvl__sdlxtp_1.lef",
+    "sky130_fd_sc_hvl__xnor2_1.lef",
+    "sky130_fd_sc_hvl__xor2_1.lef",
+    "caravel.lef",
+    "caravel_clocking.lef",
+    "caravel_core.lef",
+    "gpio_defaults_block.lef",
+    "gpio_logic_high.lef",
+    "housekeeping.lef",
+    "mgmt_protect_hv.lef",
+    "mprj2_logic_high.lef",
+    "mprj_io_buffer.lef",
+    "mprj_logic_high.lef",
+    "spare_logic_block.lef",
+    "user_project_wrapper.lef",
+    "xres_buf.lef",
+    "caravel_logo-stub.lef",
+    "caravel_motto-stub.lef",
+    "chip_io.lef",
+    "copyright_block-stub.lef",
+    "empty_macro.lef",
+    "manual_power_connections.lef",
+    "open_source-stub.lef",
+    "simple_por.lef",
+    "user_id_programming.lef",
+    "user_id_textblock-stub.lef",
+    "RAM128.lef"
+  };
+
+  std::string lefs_arg = "--lefdef-lefs=";
+  for (size_t i = 0; i < sizeof (lef_files) / sizeof (lef_files[0]); ++i) {
+    if (i > 0) {
+      lefs_arg += ",";
+    }
+    lefs_arg += lef_dir + "/" + lef_files[i];
+  }
+
+  const char *lefdef_layout_files[] = {
+    "sky130_fd_sc_hd.gds",
+    "sky130_fd_sc_hvl__sdlxtp_1.gds",
+    "sky130_fd_sc_hvl__decap_8.gds",
+    "sky130_fd_sc_hvl__decap_4.gds",
+    "sky130_fd_sc_hvl__nand3_1.gds",
+    "sky130_fd_sc_hvl__sdfxbp_1.gds",
+    "sky130_fd_sc_hvl__lsbufhv2hv_hl_1.gds",
+    "sky130_fd_sc_hvl__sdfrbp_1.gds",
+    "sky130_fd_sc_hvl__a21o_1.gds",
+    "sky130_fd_sc_hvl__inv_2.gds",
+    "sky130_fd_sc_hvl__inv_16.gds",
+    "sky130_fd_sc_hvl__inv_1.gds",
+    "sky130_fd_sc_hvl__inv_4.gds",
+    "sky130_fd_sc_hvl__inv_8.gds",
+    "sky130_fd_sc_hvl__nand2_1.gds",
+    "sky130_fd_sc_hvl__dfstp_1.gds",
+    "sky130_fd_sc_hvl__a22o_1.gds",
+    "sky130_fd_sc_hvl__schmittbuf_1.gds",
+    "sky130_fd_sc_hvl__a22oi_1.gds",
+    "sky130_fd_sc_hvl__lsbuflv2hv_1.gds",
+    "sky130_fd_sc_hvl__fill_4.gds",
+    "sky130_fd_sc_hvl__fill_1.gds",
+    "sky130_fd_sc_hvl__fill_2.gds",
+    "sky130_fd_sc_hvl__fill_8.gds",
+    "sky130_fd_sc_hvl__sdfrtp_1.gds",
+    "sky130_fd_sc_hvl__sdfxtp_1.gds",
+    "sky130_fd_sc_hvl__o22a_1.gds",
+    "sky130_fd_sc_hvl__dfsbp_1.gds",
+    "sky130_fd_sc_hvl__o21a_1.gds",
+    "sky130_fd_sc_hvl__a21oi_1.gds",
+    "sky130_fd_sc_hvl__buf_1.gds",
+    "sky130_fd_sc_hvl__buf_2.gds",
+    "sky130_fd_sc_hvl__buf_4.gds",
+    "sky130_fd_sc_hvl__buf_32.gds",
+    "sky130_fd_sc_hvl__buf_16.gds",
+    "sky130_fd_sc_hvl__buf_8.gds",
+    "sky130_fd_sc_hvl__einvp_1.gds",
+    "sky130_fd_sc_hvl__conb_1.gds",
+    "sky130_fd_sc_hvl__and3_1.gds",
+    "sky130_fd_sc_hvl__lsbufhv2lv_1.gds",
+    "sky130_fd_sc_hvl__and2_1.gds",
+    "sky130_fd_sc_hvl__nor3_1.gds",
+    "sky130_fd_sc_hvl__dlclkp_1.gds",
+    "sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.gds",
+    "sky130_fd_sc_hvl__sdfstp_1.gds",
+    "sky130_fd_sc_hvl__dfrbp_1.gds",
+    "sky130_fd_sc_hvl__dfxbp_1.gds",
+    "sky130_fd_sc_hvl__nor2_1.gds",
+    "sky130_fd_sc_hvl__diode_2.gds",
+    "sky130_fd_sc_hvl__dlrtp_1.gds",
+    "sky130_fd_sc_hvl__dlxtp_1.gds",
+    "sky130_fd_sc_hvl__lsbufhv2lv_simple_1.gds",
+    "sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.gds",
+    "sky130_fd_sc_hvl__sdlclkp_1.gds",
+    "sky130_fd_sc_hvl__o22ai_1.gds",
+    "sky130_fd_sc_hvl__or3_1.gds",
+    "sky130_fd_sc_hvl__sdfsbp_1.gds",
+    "sky130_fd_sc_hvl__xor2_1.gds",
+    "sky130_fd_sc_hvl__mux4_1.gds",
+    "sky130_fd_sc_hvl__or2_1.gds",
+    "sky130_fd_sc_hvl__probe_p_8.gds",
+    "sky130_fd_sc_hvl__dfxtp_1.gds",
+    "sky130_fd_sc_hvl__mux2_1.gds",
+    "sky130_fd_sc_hvl__dfrtp_1.gds",
+    "sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.gds",
+    "sky130_fd_sc_hvl__probec_p_8.gds",
+    "sky130_fd_sc_hvl__xnor2_1.gds",
+    "sky130_fd_sc_hvl__einvn_1.gds",
+    "sky130_fd_sc_hvl__o21ai_1.gds",
+    "sky130_fd_sc_hvl__lsbufhv2hv_lh_1.gds",
+    "sky130_ef_io__analog.gds",
+    "sky130_ef_io__bare_pad.gds",
+    "sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds",
+    "sky130_ef_io__disconnect_vccd_slice_5um.gds",
+    "sky130_ef_io__disconnect_vdda_slice_5um.gds",
+    "sky130_ef_io__gpiov2_pad_wrapped.gds",
+    "sky130_ef_sc_hd__decap_12.gds",
+    "sky130_ef_sc_hd__decap_20_12.gds",
+    "sky130_ef_sc_hd__decap_40_12.gds",
+    "sky130_ef_sc_hd__decap_60_12.gds",
+    "sky130_ef_sc_hd__decap_80_12.gds",
+    "sky130_ef_sc_hd__fill_12.gds",
+    "sky130_ef_sc_hd__fill_2.gds",
+    "sky130_ef_sc_hd__fill_4.gds",
+    "sky130_ef_sc_hd__fill_8.gds",
+    "sky130_ef_sc_hvl__fill_8.gds",
+    "caravel_logo.gds.gz",
+    "caravel_motto.gds.gz",
+    "chip_io.gds.gz",
+    "copyright_block.gds.gz",
+    "empty_macro.gds.gz",
+    "manual_power_connections.gds.gz",
+    "open_source.gds.gz",
+    "simple_por.gds.gz",
+    "user_id_programming.gds.gz",
+    "user_id_textblock.gds.gz",
+    "RAM128.gds.gz"
+  };
+
+  std::string lefdef_layouts_arg = "--lefdef-lef-layouts=";
+  for (size_t i = 0; i < sizeof (lefdef_layout_files) / sizeof (lefdef_layout_files[0]); ++i) {
+    if (i > 0) {
+      lefdef_layouts_arg += ",";
+    }
+    lefdef_layouts_arg += gds_dir + "/" + lefdef_layout_files[i];
+  }
+
+  const char *def_files[] = {
+    "caravel.def",
+    "caravel_clocking.def",
+    "caravel_core.def.gz",
+    "gpio_defaults_block.def",
+    "gpio_logic_high.def",
+    "housekeeping.def",
+    "mgmt_protect_hv.def",
+    "mprj2_logic_high.def",
+    "mprj_io_buffer.def",
+    "mprj_logic_high.def",
+    "spare_logic_block.def",
+    "user_project_wrapper.def",
+    "xres_buf.def"
+  };
+
+  std::string input;
+  for (size_t i = 0; i < sizeof (def_files) / sizeof (def_files[0]); ++i) {
+    if (i > 0) {
+      input += ",";
+    }
+    input += def_dir + "/" + def_files[i];
+  }
+
+  const char *argv[] = { "x",
+                         "--lefdef-no-implicit-lef",
+                         map_arg.c_str (),
+                         lefs_arg.c_str (),
+                         lefdef_layouts_arg.c_str (),
+                         input.c_str (),
+                         output.c_str ()
+                       };
+
+  EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), (char **) argv, bd::GenericWriterOptions::oasis_format_name), 0);
+
+  db::Layout layout;
+
+  {
+    tl::InputStream stream (output);
+    db::LoadLayoutOptions options;
+    db::Reader reader (stream);
+    reader.read (layout, options);
+  }
+
+  db::compare_layouts (this, layout, input_au, db::WriteOAS);
+}

src/db/db/dbCommonReader.cc

@@ -314,8 +314,13 @@ CommonReaderBase::merge_cell_without_instances (db::Layout &layout, db::cell_ind
 }
 
 void
-CommonReaderBase::init ()
+CommonReaderBase::start ()
 {
+  m_id_map.clear ();
+  m_name_map.clear ();
+  m_temp_cells.clear ();
+  m_name_for_id.clear ();
+
   m_layer_map_out.clear ();
   m_multi_mapping_placeholders.clear ();
   m_layer_cache.clear ();
@@ -621,7 +626,7 @@ void
 CommonReader::init (const LoadLayoutOptions &options)
 {
   ReaderBase::init (options);
-  CommonReaderBase::init ();
+  CommonReaderBase::start ();
 
   db::CommonReaderOptions common_options = options.get_options<db::CommonReaderOptions> ();
   set_conflict_resolution_mode (common_options.cell_conflict_resolution);

src/db/db/dbCommonReader.h

@@ -207,7 +207,7 @@ class DB_PUBLIC CommonReaderBase
   /**
    *  @brief Re-initialize: clears the tables and caches
    */
-  void init ();
+  void start ();
 
   /**
    *  @brief Sets a value indicating whether to create layers