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

More cleanup

This commit is contained in:
Eddie Hung 2019-08-28 10:11:09 -07:00
parent c4d1bd988b
commit 86b538bd02
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
passes/pmgen/xilinx_srl.cc
View File

@ -36,8 +36,6 @@ void run_fixed(xilinx_srl_pm &pm)
auto &ud = pm.ud_fixed; auto &ud = pm.ud_fixed;
log("Found fixed chain of length %d (%s):\n", GetSize(ud.longest_chain), log_id(st.first->type)); log("Found fixed chain of length %d (%s):\n", GetSize(ud.longest_chain), log_id(st.first->type));
auto first_cell = ud.longest_chain.back();
SigSpec initval; SigSpec initval;
for (auto cell : ud.longest_chain) { for (auto cell : ud.longest_chain) {
log_debug(" %s\n", log_id(cell)); log_debug(" %s\n", log_id(cell));
@ -61,10 +59,10 @@ void run_fixed(xilinx_srl_pm &pm)
} }
else else
log_abort(); log_abort();
if (cell != first_cell) pm.autoremove(cell);
pm.autoremove(cell);
} }
auto first_cell = ud.longest_chain.back();
auto last_cell = ud.longest_chain.front(); auto last_cell = ud.longest_chain.front();
Cell *c = pm.module->addCell(NEW_ID, ID($__XILINX_SHREG_)); Cell *c = pm.module->addCell(NEW_ID, ID($__XILINX_SHREG_));
pm.module->swap_names(c, first_cell); pm.module->swap_names(c, first_cell);
@ -117,9 +115,6 @@ void run_variable(xilinx_srl_pm &pm)
log("Found variable chain of length %d (%s):\n", GetSize(ud.chain), log_id(st.first->type)); log("Found variable chain of length %d (%s):\n", GetSize(ud.chain), log_id(st.first->type));
auto first_cell = ud.chain.back().first;
auto first_slice = ud.chain.back().second;
SigSpec initval; SigSpec initval;
for (const auto &i : ud.chain) { for (const auto &i : ud.chain) {
auto cell = i.first; auto cell = i.first;
@ -139,11 +134,13 @@ void run_variable(xilinx_srl_pm &pm)
} }
else else
log_abort(); log_abort();
if (cell != first_cell) cell->connections_.at(ID(Q))[slice] = pm.module->addWire(NEW_ID);
cell->connections_.at(ID(Q))[slice] = pm.module->addWire(NEW_ID);
} }
pm.autoremove(st.shiftx); pm.autoremove(st.shiftx);
auto first_cell = ud.chain.back().first;
auto first_slice = ud.chain.back().second;
Cell *c = pm.module->addCell(NEW_ID, ID($__XILINX_SHREG_)); Cell *c = pm.module->addCell(NEW_ID, ID($__XILINX_SHREG_));
pm.module->swap_names(c, first_cell); pm.module->swap_names(c, first_cell);