Add abc9_init wire, attach to abc9_flop cell

diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 5a9cbc24503d0ae0339a8eee9b2d28921473e8cd..5139cb80b620f83df7454cc5e36aa203d241ad5d 100644 (file)
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -1106,7 +1106,7 @@ struct Abc9Pass : public Pass {
                                if (delay_target.empty()) {
                                        Wire *abc9_clock_wire = module->wire(stringf("%s.$abc9_clock", cell->name.c_str()));
                                        if (abc9_clock_wire == NULL)
-                                               log_error("'%s$abc9_clock' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
+                                               log_error("'%s.$abc9_clock' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
                                        SigBit abc9_clock = sigmap(abc9_clock_wire);
                                        auto r = clocks.insert(abc9_clock.wire);
                                        if (r.second) {
@@ -1121,13 +1121,23 @@ struct Abc9Pass : public Pass {
 
                                Wire *abc9_control_wire = module->wire(stringf("%s.$abc9_control", cell->name.c_str()));
                                if (abc9_control_wire == NULL)
-                                       log_error("'%s$abc9_control' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
+                                       log_error("'%s.$abc9_control' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
                                SigSpec abc9_control = sigmap(abc9_control_wire);
 
                                ctrldomain_t key(cell->type, abc9_control);
                                auto r = mergeability_class.emplace(key, mergeability_class.size() + 1);
                                auto YS_ATTRIBUTE(unused) r2 = cell->attributes.insert(std::make_pair(ID(abc9_mergeability), r.first->second));
                                log_assert(r2.second);
+
+                               Wire *abc9_init_wire = module->wire(stringf("%s.$abc9_init", cell->name.c_str()));
+                               if (abc9_init_wire == NULL)
+                                       log_error("'%s.$abc9_init' is not a wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
+                               log_assert(GetSize(abc9_init_wire) == 1);
+                               SigSpec abc9_init = sigmap(abc9_init_wire);
+                               if (!abc9_init.is_fully_const())
+                                       log_error("'%s.$abc9_init' is not a constant wire present in module '%s'.\n", cell->name.c_str(), log_id(module));
+                               r2 = cell->attributes.insert(std::make_pair(ID(abc9_init), abc9_init.as_const()));
+                               log_assert(r2.second);
                        }
 
                        design->selected_active_module = module->name.str();

diff --git a/techlibs/xilinx/abc9_map.v b/techlibs/xilinx/abc9_map.v
index 29ddf713362ab443a5ff06ab3fba3fba8c17b4c9..98a4457ae6424be3f90b1daeef51a0abbd85055c 100644 (file)
--- a/techlibs/xilinx/abc9_map.v
+++ b/techlibs/xilinx/abc9_map.v
@@ -64,10 +64,12 @@
 //     the connectivity of its basic D-Q flop
 // (b) a special _TECHMAP_REPLACE_.$abc9_clock wire to indicate its clock
 //     signal, used to extract the delay target
-// (c) a special _TECHMAP_REPLACE_.$abc9_control that captures the control 
+// (c) a special _TECHMAP_REPLACE_.$abc9_control wire that captures the control
 //     domain (which, combined with this cell type, encodes to `abc9' which
 //     flops may be merged together)
-// (d) a special _TECHMAP_REPLACE_.$abc9_currQ wire that will be used for feedback
+// (d) a special _TECHMAP_REPLACE_.$abc9_init wire to encode the flop's initial
+//     state
+// (e) a special _TECHMAP_REPLACE_.$abc9_currQ wire that will be used for feedback
 //     into the (combinatorial) FD* cell to facilitate clock-enable behaviour
 module FDRE (output reg Q, input C, CE, D, R);
   parameter [0:0] INIT = 1'b0;
@@ -88,6 +90,7 @@ module FDRE (output reg Q, input C, CE, D, R);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, IS_D_INVERTED, R, IS_R_INVERTED};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = Q;
 endmodule
 module FDRE_1 (output reg Q, input C, CE, D, R);
@@ -103,6 +106,7 @@ module FDRE_1 (output reg Q, input C, CE, D, R);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, 1'b0 /* IS_D_INVERTED */, R, 1'b0 /* IS_R_INVERTED */};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = Q;
 endmodule
 
@@ -133,6 +137,7 @@ module FDCE (output reg Q, input C, CE, D, CLR);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, IS_D_INVERTED, CLR, IS_CLR_INVERTED};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = $abc9_currQ;
 endmodule
 module FDCE_1 (output reg Q, input C, CE, D, CLR);
@@ -154,6 +159,7 @@ module FDCE_1 (output reg Q, input C, CE, D, CLR);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, 1'b0 /* IS_D_INVERTED */, CLR, 1'b0 /* IS_CLR_INVERTED */};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = $abc9_currQ;
 endmodule
 
@@ -182,6 +188,7 @@ module FDPE (output reg Q, input C, CE, D, PRE);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, IS_D_INVERTED, PRE, IS_PRE_INVERTED};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = $abc9_currQ;
 endmodule
 module FDPE_1 (output reg Q, input C, CE, D, PRE);
@@ -203,6 +210,7 @@ module FDPE_1 (output reg Q, input C, CE, D, PRE);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, 1'b0 /* IS_D_INVERTED */, PRE, 1'b0 /* IS_PRE_INVERTED */};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = $abc9_currQ;
 endmodule
 
@@ -225,6 +233,7 @@ module FDSE (output reg Q, input C, CE, D, S);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, IS_D_INVERTED, S, IS_S_INVERTED};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = Q;
 endmodule
 module FDSE_1 (output reg Q, input C, CE, D, S);
@@ -240,6 +249,7 @@ module FDSE_1 (output reg Q, input C, CE, D, S);
   // Special signals
   wire [0:0] _TECHMAP_REPLACE_.$abc9_clock = C;
   wire [3:0] _TECHMAP_REPLACE_.$abc9_control = {CE, 1'b0 /* IS_D_INVERTED */, S, 1'b0 /* IS_S_INVERTED */};
+  wire [0:0] _TECHMAP_REPLACE_.$abc9_init = INIT;
   wire _TECHMAP_REPLACE_.$abc9_currQ = Q;
 endmodule