Merge pull request #776 from mmicko/unify_noflatten

Unify usage of noflatten among architectures
This commit is contained in:
Clifford Wolf 2019-01-04 14:56:04 +01:00 committed by GitHub
commit 7a2db03aa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions

View File

@ -95,8 +95,8 @@ struct SynthAchronixPass : public ScriptPass {
run_to = args[argidx].substr(pos+1); run_to = args[argidx].substr(pos+1);
continue; continue;
} }
if (args[argidx] == "-flatten") { if (args[argidx] == "-noflatten") {
flatten = true; flatten = false;
continue; continue;
} }
if (args[argidx] == "-retime") { if (args[argidx] == "-retime") {

View File

@ -129,7 +129,7 @@ struct SynthCoolrunner2Pass : public ScriptPass
run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str())); run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
} }
if (check_label("flatten", "(unless -noflatten)") && flatten) if (flatten && check_label("flatten", "(unless -noflatten)"))
{ {
run("proc"); run("proc");
run("flatten"); run("flatten");

View File

@ -52,6 +52,9 @@ struct SynthGowinPass : public ScriptPass
log(" -nobram\n"); log(" -nobram\n");
log(" do not use BRAM cells in output netlist\n"); log(" do not use BRAM cells in output netlist\n");
log("\n"); log("\n");
log(" -noflatten\n");
log(" do not flatten design before synthesis\n");
log("\n");
log(" -retime\n"); log(" -retime\n");
log(" run 'abc' with -dff option\n"); log(" run 'abc' with -dff option\n");
log("\n"); log("\n");
@ -62,14 +65,15 @@ struct SynthGowinPass : public ScriptPass
} }
string top_opt, vout_file; string top_opt, vout_file;
bool retime, nobram; bool retime, flatten, nobram;
void clear_flags() YS_OVERRIDE void clear_flags() YS_OVERRIDE
{ {
top_opt = "-auto-top"; top_opt = "-auto-top";
vout_file = ""; vout_file = "";
retime = false; retime = false;
nobram = true; flatten = true;
nobram = true;
} }
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
@ -104,6 +108,10 @@ struct SynthGowinPass : public ScriptPass
nobram = true; nobram = true;
continue; continue;
} }
if (args[argidx] == "-noflatten") {
flatten = false;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -127,7 +135,7 @@ struct SynthGowinPass : public ScriptPass
run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str())); run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
} }
if (check_label("flatten") && check_label("flatten", "(unless -noflatten)")) if (flatten && check_label("flatten", "(unless -noflatten)"))
{ {
run("proc"); run("proc");
run("flatten"); run("flatten");

View File

@ -131,8 +131,8 @@ struct SynthIntelPass : public ScriptPass {
nobram = true; nobram = true;
continue; continue;
} }
if (args[argidx] == "-flatten") { if (args[argidx] == "-noflatten") {
flatten = true; flatten = false;
continue; continue;
} }
if (args[argidx] == "-retime") { if (args[argidx] == "-retime") {