riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed "dff2dffe -direct-match"

This commit is contained in:
Clifford Wolf 2015-04-16 11:47:59 +02:00
parent 3e9e6e1c22
commit dc30b034f7
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
passes/techmap/dff2dffe.cc
View File

@ -243,10 +243,12 @@ struct Dff2dffeWorker
void run() void run()
{ {
log("Transforming $dff to $dffe cells in module %s:\n", log_id(module)); log("Transforming FF to FF+Enable cells in module %s:\n", log_id(module));
for (auto dff_cell : dff_cells) for (auto dff_cell : dff_cells) {
// log("Handling candidate %s:\n", log_id(dff_cell));
handle_dff_cell(dff_cell); handle_dff_cell(dff_cell);
} }
}
}; };
struct Dff2dffePass : public Pass { struct Dff2dffePass : public Pass {
@ -301,23 +303,32 @@ struct Dff2dffePass : public Pass {
continue; continue;
} }
if (args[argidx] == "-direct-match" && argidx + 1 < args.size()) { if (args[argidx] == "-direct-match" && argidx + 1 < args.size()) {
bool found_match = false;
const char *pattern = args[++argidx].c_str(); const char *pattern = args[++argidx].c_str();
if (patmatch(pattern, "$_DFF_P_" )) direct_dict["$_DFF_P_" ] = "$_DFFE_P_"; if (patmatch(pattern, "$_DFF_P_" )) found_match = true, direct_dict["$_DFF_P_" ] = "$_DFFE_P_";
if (patmatch(pattern, "$_DFF_N_" )) direct_dict["$_DFF_N_" ] = "$_DFFE_N_"; if (patmatch(pattern, "$_DFF_N_" )) found_match = true, direct_dict["$_DFF_N_" ] = "$_DFFE_N_";
if (patmatch(pattern, "$_DFF_NN0_")) direct_dict["$_DFF_NN0"] = "$__DFFE_NN0"; if (patmatch(pattern, "$_DFF_NN0_")) found_match = true, direct_dict["$_DFF_NN0_"] = "$__DFFE_NN0";
if (patmatch(pattern, "$_DFF_NN1_")) direct_dict["$_DFF_NN1"] = "$__DFFE_NN1"; if (patmatch(pattern, "$_DFF_NN1_")) found_match = true, direct_dict["$_DFF_NN1_"] = "$__DFFE_NN1";
if (patmatch(pattern, "$_DFF_NP0_")) direct_dict["$_DFF_NP0"] = "$__DFFE_NP0"; if (patmatch(pattern, "$_DFF_NP0_")) found_match = true, direct_dict["$_DFF_NP0_"] = "$__DFFE_NP0";
if (patmatch(pattern, "$_DFF_NP1_")) direct_dict["$_DFF_NP1"] = "$__DFFE_NP1"; if (patmatch(pattern, "$_DFF_NP1_")) found_match = true, direct_dict["$_DFF_NP1_"] = "$__DFFE_NP1";
if (patmatch(pattern, "$_DFF_PN0_")) direct_dict["$_DFF_PN0"] = "$__DFFE_PN0"; if (patmatch(pattern, "$_DFF_PN0_")) found_match = true, direct_dict["$_DFF_PN0_"] = "$__DFFE_PN0";
if (patmatch(pattern, "$_DFF_PN1_")) direct_dict["$_DFF_PN1"] = "$__DFFE_PN1"; if (patmatch(pattern, "$_DFF_PN1_")) found_match = true, direct_dict["$_DFF_PN1_"] = "$__DFFE_PN1";
if (patmatch(pattern, "$_DFF_PP0_")) direct_dict["$_DFF_PP0"] = "$__DFFE_PP0"; if (patmatch(pattern, "$_DFF_PP0_")) found_match = true, direct_dict["$_DFF_PP0_"] = "$__DFFE_PP0";
if (patmatch(pattern, "$_DFF_PP1_")) direct_dict["$_DFF_PP1"] = "$__DFFE_PP1"; if (patmatch(pattern, "$_DFF_PP1_")) found_match = true, direct_dict["$_DFF_PP1_"] = "$__DFFE_PP1";
if (!found_match)
log_cmd_error("No cell types matched pattern '%s'.\n", pattern);
continue; continue;
} }
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
if (!direct_dict.empty()) {
log("Selected cell types for direct conversion:\n");
for (auto &it : direct_dict)
log(" %s -> %s\n", log_id(it.first), log_id(it.second));
}
for (auto mod : design->selected_modules()) for (auto mod : design->selected_modules())
if (!mod->has_processes_warn()) if (!mod->has_processes_warn())
{ {

2
techlibs/ice40/synth_ice40.cc
View File

@ -72,6 +72,7 @@ struct SynthIce40Pass : public Pass {
log(" map_ffs:\n"); log(" map_ffs:\n");
log(" dff2dffe -direct-match $_DFF_*\n"); log(" dff2dffe -direct-match $_DFF_*\n");
log(" techmap -map +/ice40/cells_map.v\n"); log(" techmap -map +/ice40/cells_map.v\n");
log(" opt_const -mux_undef\n");
log(" simplemap\n"); log(" simplemap\n");
log(" clean\n"); log(" clean\n");
log("\n"); log("\n");
@ -145,6 +146,7 @@ struct SynthIce40Pass : public Pass {
{ {
Pass::call(design, "dff2dffe -direct-match $_DFF_*"); Pass::call(design, "dff2dffe -direct-match $_DFF_*");
Pass::call(design, "techmap -map +/ice40/cells_map.v"); Pass::call(design, "techmap -map +/ice40/cells_map.v");
Pass::call(design, "opt_const -mux_undef");
Pass::call(design, "simplemap"); Pass::call(design, "simplemap");
Pass::call(design, "clean"); Pass::call(design, "clean");
} }