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

Improvements in SF2 flow and demo 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-03-05 19:49:39 -08:00
parent d03780c3f4
commit da5181a3df
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/igloo2/.gitignore vendored
View File

@ -1,3 +1,4 @@
/netlist.edn /netlist.edn
/netlist.vm /netlist.vm
/example.stp
/proj /proj

2
examples/igloo2/runme.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
yosys -p 'synth_sf2 -top example -edif netlist.edn -vlog netlist.vm' example.v yosys -p 'synth_sf2 -noclkbuf -top example -edif netlist.edn -vlog netlist.vm' example.v
export LM_LICENSE_FILE=${LM_LICENSE_FILE:-1702@localhost} export LM_LICENSE_FILE=${LM_LICENSE_FILE:-1702@localhost}
/opt/microsemi/Libero_SoC_v12.0/Libero/bin/libero SCRIPT:libero.tcl /opt/microsemi/Libero_SoC_v12.0/Libero/bin/libero SCRIPT:libero.tcl
cp proj/designer/example/export/example.stp . cp proj/designer/example/export/example.stp .

15
techlibs/sf2/sf2_iobs.cc
View File

@ -33,18 +33,23 @@ struct Sf2IobsPass : public Pass {
log("\n"); log("\n");
log("Add SF2 I/O buffers to top module IOs as needed.\n"); log("Add SF2 I/O buffers to top module IOs as needed.\n");
log("\n"); log("\n");
log(" -noclkbuf\n");
log(" Do not insert clock buffers\n");
log("\n");
} }
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
{ {
bool noclkbuf_mode = false;
log_header(design, "Executing sf2_iobs pass (insert IO buffers).\n"); log_header(design, "Executing sf2_iobs pass (insert IO buffers).\n");
size_t argidx; size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) for (argidx = 1; argidx < args.size(); argidx++)
{ {
// if (args[argidx] == "-singleton") { if (args[argidx] == "-noclkbuf") {
// singleton_mode = true; noclkbuf_mode = true;
// continue; continue;
// } }
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -94,7 +99,7 @@ struct Sf2IobsPass : public Pass {
if (wire->port_output) { if (wire->port_output) {
buf_type = "\\OUTBUF"; buf_type = "\\OUTBUF";
buf_port = "\\D"; buf_port = "\\D";
} else if (clk_bits.count(canonical_bit)) { } else if (clk_bits.count(canonical_bit) && !noclkbuf_mode) {
buf_type = "\\CLKBUF"; buf_type = "\\CLKBUF";
buf_port = "\\Y"; buf_port = "\\Y";
} else { } else {

16
techlibs/sf2/synth_sf2.cc
View File

@ -63,6 +63,9 @@ struct SynthSf2Pass : public ScriptPass
log(" -noiobs\n"); log(" -noiobs\n");
log(" run synthesis in \"block mode\", i.e. do not insert IO buffers\n"); log(" run synthesis in \"block mode\", i.e. do not insert IO buffers\n");
log("\n"); log("\n");
log(" -noclkbuf\n");
log(" do not inser clock buffers, only simpe IO buffers\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");
@ -73,7 +76,7 @@ struct SynthSf2Pass : public ScriptPass
} }
string top_opt, edif_file, vlog_file, json_file; string top_opt, edif_file, vlog_file, json_file;
bool flatten, retime, iobs; bool flatten, retime, iobs, clkbuf;
void clear_flags() YS_OVERRIDE void clear_flags() YS_OVERRIDE
{ {
@ -84,6 +87,7 @@ struct SynthSf2Pass : public ScriptPass
flatten = true; flatten = true;
retime = false; retime = false;
iobs = true; iobs = true;
clkbuf = 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
@ -130,6 +134,10 @@ struct SynthSf2Pass : public ScriptPass
iobs = false; iobs = false;
continue; continue;
} }
if (args[argidx] == "-noclkbuf") {
clkbuf = false;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -201,8 +209,10 @@ struct SynthSf2Pass : public ScriptPass
if (check_label("map_iobs")) if (check_label("map_iobs"))
{ {
if (iobs || help_mode) if (help_mode)
run("sf2_iobs", "(unless -noiobs)"); run("sf2_iobs [-noclkbuf]", "(unless -noiobs)");
else if (iobs)
run(clkbuf ? "sf2_iobs" : "sf2_iobs -noclkbuf");
run("clean"); run("clean");
} }