aboutsummaryrefslogtreecommitdiffstats
path: root/passes/pmgen/xilinx_srl.cc
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-08-28 10:11:09 -0700
committerEddie Hung <eddie@fpgeh.com>2019-08-28 10:11:09 -0700
commit86b538bd02cb3e4c7e14be2c6d2210eb39463b0f (patch)
tree6d91d4e6c620fabfee9bb972661353876878d584 /passes/pmgen/xilinx_srl.cc
parentc4d1bd988b1198f8a656576bd6cf67781aa5b156 (diff)
downloadyosys-86b538bd02cb3e4c7e14be2c6d2210eb39463b0f.tar.gz
yosys-86b538bd02cb3e4c7e14be2c6d2210eb39463b0f.tar.bz2
yosys-86b538bd02cb3e4c7e14be2c6d2210eb39463b0f.zip
More cleanup
Diffstat (limited to 'passes/pmgen/xilinx_srl.cc')
-rw-r--r--passes/pmgen/xilinx_srl.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/passes/pmgen/xilinx_srl.cc b/passes/pmgen/xilinx_srl.cc
index b3bab6021..f66582025 100644
--- a/passes/pmgen/xilinx_srl.cc
+++ b/passes/pmgen/xilinx_srl.cc
@@ -36,8 +36,6 @@ void run_fixed(xilinx_srl_pm &pm)
auto &ud = pm.ud_fixed;
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;
for (auto cell : ud.longest_chain) {
log_debug(" %s\n", log_id(cell));
@@ -61,10 +59,10 @@ void run_fixed(xilinx_srl_pm &pm)
}
else
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();
Cell *c = pm.module->addCell(NEW_ID, ID($__XILINX_SHREG_));
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));
- auto first_cell = ud.chain.back().first;
- auto first_slice = ud.chain.back().second;
-
SigSpec initval;
for (const auto &i : ud.chain) {
auto cell = i.first;
@@ -139,11 +134,13 @@ void run_variable(xilinx_srl_pm &pm)
}
else
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);
+ auto first_cell = ud.chain.back().first;
+ auto first_slice = ud.chain.back().second;
+
Cell *c = pm.module->addCell(NEW_ID, ID($__XILINX_SHREG_));
pm.module->swap_names(c, first_cell);