Add new FF types to simplemap.

diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc
index 3c78fbdbf2a172bb89292d15ad5e3fb4ee0846ba..c8388e2d7f35608f1e4031eb0a926398e2c38bc6 100644 (file)
--- a/passes/techmap/simplemap.cc
+++ b/passes/techmap/simplemap.cc
@@ -474,29 +474,93 @@ void simplemap_dffsr(RTLIL::Module *module, RTLIL::Cell *cell)
        }
 }
 
-void simplemap_adff(RTLIL::Module *module, RTLIL::Cell *cell)
+void simplemap_dffsre(RTLIL::Module *module, RTLIL::Cell *cell)
 {
        int width = cell->parameters.at(ID::WIDTH).as_int();
        char clk_pol = cell->parameters.at(ID::CLK_POLARITY).as_bool() ? 'P' : 'N';
-       char rst_pol = cell->parameters.at(ID::ARST_POLARITY).as_bool() ? 'P' : 'N';
+       char set_pol = cell->parameters.at(ID::SET_POLARITY).as_bool() ? 'P' : 'N';
+       char clr_pol = cell->parameters.at(ID::CLR_POLARITY).as_bool() ? 'P' : 'N';
+       char en_pol = cell->parameters.at(ID::EN_POLARITY).as_bool() ? 'P' : 'N';
 
-       std::vector<RTLIL::State> rst_val = cell->parameters.at(ID::ARST_VALUE).bits;
+       RTLIL::SigSpec sig_clk = cell->getPort(ID::CLK);
+       RTLIL::SigSpec sig_s = cell->getPort(ID::SET);
+       RTLIL::SigSpec sig_r = cell->getPort(ID::CLR);
+       RTLIL::SigSpec sig_e = cell->getPort(ID::EN);
+       RTLIL::SigSpec sig_d = cell->getPort(ID::D);
+       RTLIL::SigSpec sig_q = cell->getPort(ID::Q);
+
+       IdString gate_type = stringf("$_DFFSR_%c%c%c%c_", clk_pol, set_pol, clr_pol, en_pol);
+
+       for (int i = 0; i < width; i++) {
+               RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type);
+               gate->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));
+               gate->setPort(ID::C, sig_clk);
+               gate->setPort(ID::S, sig_s[i]);
+               gate->setPort(ID::R, sig_r[i]);
+               gate->setPort(ID::E, sig_e);
+               gate->setPort(ID::D, sig_d[i]);
+               gate->setPort(ID::Q, sig_q[i]);
+       }
+}
+
+void simplemap_adff_sdff(RTLIL::Module *module, RTLIL::Cell *cell)
+{
+       int width = cell->parameters.at(ID::WIDTH).as_int();
+       bool is_async = cell->type == ID($adff);
+       char clk_pol = cell->parameters.at(ID::CLK_POLARITY).as_bool() ? 'P' : 'N';
+       char rst_pol = cell->parameters.at(is_async ? ID::ARST_POLARITY : ID::SRST_POLARITY).as_bool() ? 'P' : 'N';
+       const char *type = is_async ? "DFF" : "SDFF";
+
+       std::vector<RTLIL::State> rst_val = cell->parameters.at(is_async ? ID::ARST_VALUE : ID::SRST_VALUE).bits;
        while (int(rst_val.size()) < width)
                rst_val.push_back(RTLIL::State::S0);
 
        RTLIL::SigSpec sig_clk = cell->getPort(ID::CLK);
-       RTLIL::SigSpec sig_rst = cell->getPort(ID::ARST);
+       RTLIL::SigSpec sig_rst = cell->getPort(is_async ? ID::ARST : ID::SRST);
+       RTLIL::SigSpec sig_d = cell->getPort(ID::D);
+       RTLIL::SigSpec sig_q = cell->getPort(ID::Q);
+
+       IdString gate_type_0 = stringf("$_%s_%c%c0_", type, clk_pol, rst_pol);
+       IdString gate_type_1 = stringf("$_%s_%c%c1_", type, clk_pol, rst_pol);
+
+       for (int i = 0; i < width; i++) {
+               RTLIL::Cell *gate = module->addCell(NEW_ID, rst_val.at(i) == RTLIL::State::S1 ? gate_type_1 : gate_type_0);
+               gate->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));
+               gate->setPort(ID::C, sig_clk);
+               gate->setPort(ID::R, sig_rst);
+               gate->setPort(ID::D, sig_d[i]);
+               gate->setPort(ID::Q, sig_q[i]);
+       }
+}
+
+void simplemap_adffe_sdffe_sdffce(RTLIL::Module *module, RTLIL::Cell *cell)
+{
+       int width = cell->parameters.at(ID::WIDTH).as_int();
+       bool is_async = cell->type == ID($adffe);
+       char clk_pol = cell->parameters.at(ID::CLK_POLARITY).as_bool() ? 'P' : 'N';
+       char rst_pol = cell->parameters.at(is_async ? ID::ARST_POLARITY : ID::SRST_POLARITY).as_bool() ? 'P' : 'N';
+       char en_pol = cell->parameters.at(ID::EN_POLARITY).as_bool() ? 'P' : 'N';
+       const char *type = is_async ? "DFFE" : cell->type == ID($sdffe) ? "SDFFE" : "SDFFCE";
+
+       std::vector<RTLIL::State> rst_val = cell->parameters.at(is_async ? ID::ARST_VALUE : ID::SRST_VALUE).bits;
+       while (int(rst_val.size()) < width)
+               rst_val.push_back(RTLIL::State::S0);
+
+       RTLIL::SigSpec sig_clk = cell->getPort(ID::CLK);
+       RTLIL::SigSpec sig_rst = cell->getPort(is_async ? ID::ARST : ID::SRST);
+       RTLIL::SigSpec sig_e = cell->getPort(ID::EN);
        RTLIL::SigSpec sig_d = cell->getPort(ID::D);
        RTLIL::SigSpec sig_q = cell->getPort(ID::Q);
 
-       IdString gate_type_0 = stringf("$_DFF_%c%c0_", clk_pol, rst_pol);
-       IdString gate_type_1 = stringf("$_DFF_%c%c1_", clk_pol, rst_pol);
+       IdString gate_type_0 = stringf("$_%s_%c%c0%c_", type, clk_pol, rst_pol, en_pol);
+       IdString gate_type_1 = stringf("$_%s_%c%c1%c_", type, clk_pol, rst_pol, en_pol);
 
        for (int i = 0; i < width; i++) {
                RTLIL::Cell *gate = module->addCell(NEW_ID, rst_val.at(i) == RTLIL::State::S1 ? gate_type_1 : gate_type_0);
                gate->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));
                gate->setPort(ID::C, sig_clk);
                gate->setPort(ID::R, sig_rst);
+               gate->setPort(ID::E, sig_e);
                gate->setPort(ID::D, sig_d[i]);
                gate->setPort(ID::Q, sig_q[i]);
        }
@@ -522,6 +586,60 @@ void simplemap_dlatch(RTLIL::Module *module, RTLIL::Cell *cell)
        }
 }
 
+void simplemap_adlatch(RTLIL::Module *module, RTLIL::Cell *cell)
+{
+       int width = cell->parameters.at(ID::WIDTH).as_int();
+       char en_pol = cell->parameters.at(ID::EN_POLARITY).as_bool() ? 'P' : 'N';
+       char rst_pol = cell->parameters.at(ID::ARST_POLARITY).as_bool() ? 'P' : 'N';
+
+       std::vector<RTLIL::State> rst_val = cell->parameters.at(ID::ARST_VALUE).bits;
+       while (int(rst_val.size()) < width)
+               rst_val.push_back(RTLIL::State::S0);
+
+       RTLIL::SigSpec sig_en = cell->getPort(ID::EN);
+       RTLIL::SigSpec sig_rst = cell->getPort(ID::ARST);
+       RTLIL::SigSpec sig_d = cell->getPort(ID::D);
+       RTLIL::SigSpec sig_q = cell->getPort(ID::Q);
+
+       IdString gate_type_0 = stringf("$_DLATCH_%c%c0_", en_pol, rst_pol);
+       IdString gate_type_1 = stringf("$_DLATCH_%c%c1_", en_pol, rst_pol);
+
+       for (int i = 0; i < width; i++) {
+               RTLIL::Cell *gate = module->addCell(NEW_ID, rst_val.at(i) == RTLIL::State::S1 ? gate_type_1 : gate_type_0);
+               gate->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));
+               gate->setPort(ID::E, sig_en);
+               gate->setPort(ID::R, sig_rst);
+               gate->setPort(ID::D, sig_d[i]);
+               gate->setPort(ID::Q, sig_q[i]);
+       }
+}
+
+void simplemap_dlatchsr(RTLIL::Module *module, RTLIL::Cell *cell)
+{
+       int width = cell->parameters.at(ID::WIDTH).as_int();
+       char en_pol = cell->parameters.at(ID::EN_POLARITY).as_bool() ? 'P' : 'N';
+       char set_pol = cell->parameters.at(ID::SET_POLARITY).as_bool() ? 'P' : 'N';
+       char clr_pol = cell->parameters.at(ID::CLR_POLARITY).as_bool() ? 'P' : 'N';
+
+       RTLIL::SigSpec sig_en = cell->getPort(ID::EN);
+       RTLIL::SigSpec sig_s = cell->getPort(ID::SET);
+       RTLIL::SigSpec sig_r = cell->getPort(ID::CLR);
+       RTLIL::SigSpec sig_d = cell->getPort(ID::D);
+       RTLIL::SigSpec sig_q = cell->getPort(ID::Q);
+
+       IdString gate_type = stringf("$_DLATCHSR_%c%c%c_", en_pol, set_pol, clr_pol);
+
+       for (int i = 0; i < width; i++) {
+               RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type);
+               gate->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));
+               gate->setPort(ID::E, sig_en);
+               gate->setPort(ID::S, sig_s[i]);
+               gate->setPort(ID::R, sig_r[i]);
+               gate->setPort(ID::D, sig_d[i]);
+               gate->setPort(ID::Q, sig_q[i]);
+       }
+}
+
 void simplemap_get_mappers(dict<IdString, void(*)(RTLIL::Module*, RTLIL::Cell*)> &mappers)
 {
        mappers[ID($not)]         = simplemap_not;
@@ -553,8 +671,15 @@ void simplemap_get_mappers(dict<IdString, void(*)(RTLIL::Module*, RTLIL::Cell*)>
        mappers[ID($dff)]         = simplemap_dff;
        mappers[ID($dffe)]        = simplemap_dffe;
        mappers[ID($dffsr)]       = simplemap_dffsr;
-       mappers[ID($adff)]        = simplemap_adff;
+       mappers[ID($dffsre)]      = simplemap_dffsre;
+       mappers[ID($adff)]        = simplemap_adff_sdff;
+       mappers[ID($sdff)]        = simplemap_adff_sdff;
+       mappers[ID($adffe)]       = simplemap_adffe_sdffe_sdffce;
+       mappers[ID($sdffe)]       = simplemap_adffe_sdffe_sdffce;
+       mappers[ID($sdffce)]      = simplemap_adffe_sdffe_sdffce;
        mappers[ID($dlatch)]      = simplemap_dlatch;
+       mappers[ID($adlatch)]     = simplemap_adlatch;
+       mappers[ID($dlatchsr)]    = simplemap_dlatchsr;
 }
 
 void simplemap(RTLIL::Module *module, RTLIL::Cell *cell)
@@ -587,7 +712,7 @@ struct SimplemapPass : public Pass {
                log("  $not, $pos, $and, $or, $xor, $xnor\n");
                log("  $reduce_and, $reduce_or, $reduce_xor, $reduce_xnor, $reduce_bool\n");
                log("  $logic_not, $logic_and, $logic_or, $mux, $tribuf\n");
-               log("  $sr, $ff, $dff, $dffsr, $adff, $dlatch\n");
+               log("  $sr, $ff, $dff, $dffe, $dffsr, $dffsre, $adff, $adffe, $sdff, $sdffe, $sdffce, $dlatch, $adlatch, $dlatchsr\n");
                log("\n");
        }
        void execute(std::vector<std::string> args, RTLIL::Design *design) override

diff --git a/techlibs/common/techmap.v b/techlibs/common/techmap.v
index eafe8d4da43d243458c7ea45c3431a4a6ea75e5e..9607302b70d01e341bf4de62f35717a5ef53f08b 100644 (file)
--- a/techlibs/common/techmap.v
+++ b/techlibs/common/techmap.v
@@ -64,7 +64,7 @@ module _90_simplemap_various;
 endmodule
 
 (* techmap_simplemap *)
-(* techmap_celltype = "$sr $ff $dff $dffe $adff $dffsr $dlatch" *)
+(* techmap_celltype = "$sr $ff $dff $dffe $adff $adffe $sdff $sdffe $sdffce $dffsr $dffsre $dlatch $adlatch $dlatchsr" *)
 module _90_simplemap_registers;
 endmodule