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

Merge mistake

This commit is contained in:
Eddie Hung 2019-06-03 23:19:22 -07:00
parent f81a0ed92e
commit 23a73ca624
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
techlibs/xilinx/synth_xilinx.cc
View File

@ -259,13 +259,6 @@ struct SynthXilinxPass : public ScriptPass
run("dff2dffe"); run("dff2dffe");
run("opt -full"); run("opt -full");
if (vpr && !nocarry && !help_mode)
run("techmap -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
else if (abc == "abc9" && !nocarry && !help_mode)
run("techmap -map +/xilinx/arith_map.v -D _CLB_CARRY", "(skip if '-nocarry')");
else if (!nocarry || help_mode)
run("techmap -map +/xilinx/arith_map.v", "(skip if '-nocarry')");
if (!nosrl || help_mode) { if (!nosrl || help_mode) {
// shregmap operates on bit-level flops, not word-level, // shregmap operates on bit-level flops, not word-level,
// so break those down here // so break those down here
@ -274,13 +267,12 @@ struct SynthXilinxPass : public ScriptPass
run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')"); run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')");
} }
if (!nomux || help_mode) if (vpr && !nocarry && !help_mode)
run("techmap -map +/xilinx/cells_map.v"); run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
else if (abc == "abc9" && !nocarry && !help_mode)
if (!vpr || help_mode) run("techmap -map +/techmap.v -map +/xilinx/arith_map.v -D _CLB_CARRY", "(skip if '-nocarry')");
run("techmap -map +/techmap.v -map +/xilinx/arith_map.v"); else if (!nocarry || help_mode)
else run("techmap -map +/techmap.v -map +/xilinx/arith_map.v", "(skip if '-nocarry')");
run("techmap -map +/techmap.v +/xilinx/arith_map.v -D _EXPLICIT_CARRY");
run("opt -fast"); run("opt -fast");
} }