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

Merge branch 'master' of github.com:cliffordwolf/yosys

This commit is contained in:
Clifford Wolf 2013-09-03 19:10:25 +02:00
parent 73914d1a41 09e200797a
commit 70476e2431
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
backends/edif/edif.cc
View File

@ -196,21 +196,44 @@ struct EdifBackend : public Backend {
dir = "INPUT"; dir = "INPUT";
else if (!wire->port_input) else if (!wire->port_input)
dir = "OUTPUT"; dir = "OUTPUT";
for (int i = 0; i < wire->width; i++) { if (wire->width == 1) {
std::string portname = wire->width > 1 ? stringf("%s[%d]", RTLIL::id2cstr(wire->name), fprintf(f, " (port %s (direction %s))\n", EDIF_NAME(wire->name), dir);
i+wire->start_offset) : RTLIL::id2cstr(wire->name); RTLIL::SigSpec sig = sigmap(RTLIL::SigSpec(wire));
fprintf(f, " (port %s (direction %s))\n", edif_names(portname).c_str(), dir); net_join_db[sig].insert(stringf("(portRef %s)", EDIF_NAME(wire->name)));
RTLIL::SigSpec sig = sigmap(RTLIL::SigSpec(wire, 1, i)); } else {
net_join_db[sig].insert(stringf("(portRef %s)", edif_names(portname).c_str())); fprintf(f, " (port (array %s %d) (direction %s))\n", EDIF_NAME(wire->name), wire->width, dir);
for (int i = 0; i < wire->width; i++) {
RTLIL::SigSpec sig = sigmap(RTLIL::SigSpec(wire, 1, i));
net_join_db[sig].insert(stringf("(portRef (member %s %d))", EDIF_NAME(wire->name), i));
}
} }
} }
fprintf(f, " )\n"); fprintf(f, " )\n");
fprintf(f, " (contents\n"); fprintf(f, " (contents\n");
for (auto &cell_it : module->cells) { for (auto &cell_it : module->cells) {
RTLIL::Cell *cell = cell_it.second; RTLIL::Cell *cell = cell_it.second;
fprintf(f, " (instance %s (viewRef VIEW_NETLIST (cellRef %s%s)))\n", fprintf(f, " (instance %s\n", EDIF_NAME(cell->name));
EDIF_NAME(cell->name), EDIF_NAME(cell->type), fprintf(f, " (viewRef VIEW_NETLIST (cellRef %s%s))", EDIF_NAME(cell->type),
lib_cell_ports.count(cell->type) > 0 ? " (libraryRef LIB)" : ""); lib_cell_ports.count(cell->type) > 0 ? " (libraryRef LIB)" : "");
for (auto &p : cell->parameters)
if (!p.second.str.empty())
fprintf(f, "\n (property %s (string \"%s\"))", EDIF_NAME(p.first), p.second.str.c_str());
else if (p.second.bits.size() <= 32 && RTLIL::SigSpec(p.second).is_fully_def())
fprintf(f, "\n (property %s (integer %u))", EDIF_NAME(p.first), p.second.as_int());
else {
std::string hex_string = "";
for (size_t i = 0; i < p.second.bits.size(); i += 4) {
int digit_value = 0;
if (i+0 < p.second.bits.size() && p.second.bits.at(i+0) == RTLIL::State::S1) digit_value += 1;
if (i+1 < p.second.bits.size() && p.second.bits.at(i+1) == RTLIL::State::S1) digit_value += 2;
if (i+2 < p.second.bits.size() && p.second.bits.at(i+2) == RTLIL::State::S1) digit_value += 3;
if (i+3 < p.second.bits.size() && p.second.bits.at(i+3) == RTLIL::State::S1) digit_value += 4;
char digit_str[2] = { "0123456789abcdef"[digit_value], 0 };
hex_string = std::string(digit_str) + hex_string;
}
fprintf(f, "\n (property %s (string \"%s\"))", EDIF_NAME(p.first), hex_string.c_str());
}
fprintf(f, ")\n");
for (auto &p : cell->connections) { for (auto &p : cell->connections) {
RTLIL::SigSpec sig = sigmap(p.second); RTLIL::SigSpec sig = sigmap(p.second);
sig.expand(); sig.expand();

14
techlibs/xilinx7/run_testbench.sh
View File

@ -2,7 +2,7 @@
set -ex set -ex
XILINX_DIR=/opt/Xilinx/14.5/ISE_DS/ISE/ XILINX_DIR=/opt/Xilinx/14.2/ISE_DS/ISE/
../../yosys - <<- EOT ../../yosys - <<- EOT
# read design # read design
@ -20,6 +20,7 @@ XILINX_DIR=/opt/Xilinx/14.5/ISE_DS/ISE/
# write netlist # write netlist
write_verilog -noattr testbench_synth.v write_verilog -noattr testbench_synth.v
write_edif testbench_synth.edif
EOT EOT
iverilog -o testbench_gold counter_tb.v counter.v iverilog -o testbench_gold counter_tb.v counter.v
@ -35,7 +36,14 @@ else
exit 1 exit 1
fi fi
if [ "$*" = "-clean" ]; then if [ "$*" = "-map" ]; then
rm -f testbench_{synth.v,{gold,gate}{,.txt}} set -x
$XILINX_DIR/bin/lin64/edif2ngd testbench_synth.edif
$XILINX_DIR/bin/lin64/ngdbuild -p xc7k70t testbench_synth
fi
if [ "$*" = "-clean" ]; then
rm -rf netlist.lst _xmsgs/
rm -f testbench_{synth,gold,gate}*
fi fi