Merge remote-tracking branch 'origin/master' into xaig_dff

diff --cc passes/techmap/techmap.cc
index c2dc9b959533539a72eddb8a7f31f4bea1f4606b,0c57733d41f1996a49f0df06d9bc3f28ee4abf71..a07a2f2804619593c7bbd54074c13e6761e2582f
--- 1/passes/techmap/techmap.cc
--- 2/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@@ -256,15 -256,13 +256,21 @@@ struct TechmapWorke
                                if (w->attributes.count(ID(src)))
                                        w->add_strpool_attribute(ID(src), extra_src_attrs);
                        }
 +
 +
 +                      if (it.second->name.begins_with("\\_TECHMAP_REPLACE_")) {
 +                              IdString replace_name = stringf("%s%s", orig_cell_name.c_str(), it.second->name.c_str() + strlen("\\_TECHMAP_REPLACE_"));
 +                              Wire *replace_w = module->addWire(replace_name, it.second);
 +                              module->connect(replace_w, w);
 +                      }
 +
                        design->select(module, w);
+ 
+                       if (it.second->name.begins_with("\\_TECHMAP_REPLACE_.")) {
+                               IdString replace_name = stringf("%s%s", orig_cell_name.c_str(), it.second->name.c_str() + strlen("\\_TECHMAP_REPLACE_"));
+                               Wire *replace_w = module->addWire(replace_name, it.second);
+                               module->connect(replace_w, w);
+                       }
                }
  
                SigMap tpl_sigmap(tpl);