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

Rename "write_verilog -nobasenradix" to "write_verilog -decimal"

This commit is contained in:
Clifford Wolf 2017-10-03 17:31:21 +02:00
parent 4718e65763
commit 65f91e5120
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backends/verilog/verilog_backend.cc
View File

@ -33,7 +33,7 @@
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN PRIVATE_NAMESPACE_BEGIN
bool verbose, norename, noattr, attr2comment, noexpr, nodec, nohex, nostr, defparam, nobasenradix; bool verbose, norename, noattr, attr2comment, noexpr, nodec, nohex, nostr, defparam, decimal;
int auto_name_counter, auto_name_offset, auto_name_digits; int auto_name_counter, auto_name_offset, auto_name_digits;
std::map<RTLIL::IdString, int> auto_name_map; std::map<RTLIL::IdString, int> auto_name_map;
std::set<RTLIL::IdString> reg_wires, reg_ct; std::set<RTLIL::IdString> reg_wires, reg_ct;
@ -172,14 +172,12 @@ void dump_const(std::ostream &f, const RTLIL::Const &data, int width = -1, int o
if (data.bits[i] == RTLIL::S1) if (data.bits[i] == RTLIL::S1)
val |= 1 << (i - offset); val |= 1 << (i - offset);
} }
if (set_signed && val < 0) if (decimal)
f << stringf("%d", val);
else if (set_signed && val < 0)
f << stringf("-32'sd%u", -val); f << stringf("-32'sd%u", -val);
else { else
if(nobasenradix) f << stringf("32'%sd%u", set_signed ? "s" : "", val);
f << stringf("%u", val); // There's no signed parameter on megawizard IP
else
f << stringf("32'%sd%u", set_signed ? "s" : "", val);
}
} else { } else {
dump_hex: dump_hex:
if (nohex) if (nohex)
@ -1462,6 +1460,9 @@ struct VerilogBackend : public Backend {
log(" not bit pattern. This option decativates this feature and instead\n"); log(" not bit pattern. This option decativates this feature and instead\n");
log(" will write out all constants in binary.\n"); log(" will write out all constants in binary.\n");
log("\n"); log("\n");
log(" -decimal\n");
log(" dump 32-bit constants in decimal and without size and radix\n");
log("\n");
log(" -nohex\n"); log(" -nohex\n");
log(" constant values that are compatible with hex output are usually\n"); log(" constant values that are compatible with hex output are usually\n");
log(" dumped as hex values. This option decativates this feature and\n"); log(" dumped as hex values. This option decativates this feature and\n");
@ -1489,10 +1490,6 @@ struct VerilogBackend : public Backend {
log(" -v\n"); log(" -v\n");
log(" verbose output (print new names of all renamed wires and cells)\n"); log(" verbose output (print new names of all renamed wires and cells)\n");
log("\n"); log("\n");
log(" -nobasenradix\n");
log(" dump defparam constants without size and radix for align with legacy\n");
log(" MegaWizard primitive template implementation.\n");
log("\n");
log("Note that RTLIL processes can't always be mapped directly to Verilog\n"); log("Note that RTLIL processes can't always be mapped directly to Verilog\n");
log("always blocks. This frontend should only be used to export an RTLIL\n"); log("always blocks. This frontend should only be used to export an RTLIL\n");
log("netlist, i.e. after the \"proc\" pass has been used to convert all\n"); log("netlist, i.e. after the \"proc\" pass has been used to convert all\n");
@ -1513,7 +1510,7 @@ struct VerilogBackend : public Backend {
nohex = false; nohex = false;
nostr = false; nostr = false;
defparam = false; defparam = false;
nobasenradix= false; decimal = false;
auto_prefix = ""; auto_prefix = "";
bool blackboxes = false; bool blackboxes = false;
@ -1584,9 +1581,9 @@ struct VerilogBackend : public Backend {
defparam = true; defparam = true;
continue; continue;
} }
if (arg == "-nobasenradix") { if (arg == "-decimal") {
nobasenradix = true; decimal = true;
continue; continue;
} }
if (arg == "-blackboxes") { if (arg == "-blackboxes") {
blackboxes = true; blackboxes = true;

5
techlibs/intel/synth_intel.cc
View File

@ -63,9 +63,6 @@ struct SynthIntelPass : public ScriptPass {
log(" -retime\n"); log(" -retime\n");
log(" run 'abc' with -dff option\n"); log(" run 'abc' with -dff option\n");
log("\n"); log("\n");
log(" -nobasenradix\n");
log(" dump the VQM netlist in clearbox format for certain defparam primitives\n");
log("\n");
log("The following commands are executed by this synthesis command:\n"); log("The following commands are executed by this synthesis command:\n");
help_script(); help_script();
log("\n"); log("\n");
@ -232,7 +229,7 @@ struct SynthIntelPass : public ScriptPass {
if (check_label("vqm")) if (check_label("vqm"))
{ {
if (!vout_file.empty() || help_mode) if (!vout_file.empty() || help_mode)
run(stringf("write_verilog -attr2comment -defparam -nohex -nobasenradix -renameprefix syn_ %s", run(stringf("write_verilog -attr2comment -defparam -nohex -decimal -renameprefix syn_ %s",
help_mode ? "<file-name>" : vout_file.c_str())); help_mode ? "<file-name>" : vout_file.c_str()));
} }
} }