caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move DelayInfo into loop

Browse Source
This commit is contained in:
Eddie Hung 2018-09-04 10:35:12 -07:00
parent db6e81d6c3
commit c7f0bdfc1b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xc7/arch.cc
View File

@ -149,11 +149,11 @@ std::vector<DelayInfo> TorcInfo::construct_wire_to_delay(const std::vector<Tilew
const boost::regex re_124 = boost::regex("[NESW][NESWLR](\\d)BEG(_[NS])?\\d"); const boost::regex re_124 = boost::regex("[NESW][NESWLR](\\d)BEG(_[NS])?\\d");
const boost::regex re_L = boost::regex("L(H|V|VB)(_L)?\\d+"); const boost::regex re_L = boost::regex("L(H|V|VB)(_L)?\\d+");
boost::cmatch what; boost::cmatch what;
DelayInfo d;
ExtendedWireInfo ewi(ddb); ExtendedWireInfo ewi(ddb);
for (const auto &tw : wire_to_tilewire) for (const auto &tw : wire_to_tilewire)
{ {
ewi.set(tw); ewi.set(tw);
DelayInfo d;
if (boost::regex_match(ewi.mWireName, what, re_124)) { if (boost::regex_match(ewi.mWireName, what, re_124)) {
std::string l(what[1]); std::string l(what[1]);
switch (l[0]) { switch (l[0]) {
@ -171,7 +171,7 @@ std::vector<DelayInfo> TorcInfo::construct_wire_to_delay(const std::vector<Tilew
else if (l == "V") d.delay = 350; else if (l == "V") d.delay = 350;
else throw; else throw;
} }
wire_to_delay.emplace_back(d); wire_to_delay.emplace_back(std::move(d));
} }
return wire_to_delay; return wire_to_delay;