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

Various router1 fixes, Add BelId/WireId/PipId::operator<()

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-11-13 05:03:46 +01:00
parent e0fe523606
commit 06e0e1ffee
4 changed files with 72 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
common/router1.cc
View File

@ -34,6 +34,7 @@ struct arc_key
int user_idx;
bool operator==(const arc_key &other) const { return (net_info == other.net_info) && (user_idx == other.user_idx); }
bool operator<(const arc_key &other) const { return net_info == other.net_info ? user_idx < other.user_idx : net_info->name < other.net_info->name; }
struct Hash
{
@ -50,10 +51,16 @@ struct arc_entry
{
arc_key arc;
delay_t pri;
int randtag = 0;
struct Greater
struct Less
{
bool operator()(const arc_entry &lhs, const arc_entry &rhs) const noexcept { return lhs.pri > rhs.pri; }
bool operator()(const arc_entry &lhs, const arc_entry &rhs) const noexcept
{
if (lhs.pri != rhs.pri)
return lhs.pri < rhs.pri;
return lhs.randtag < rhs.randtag;
}
};
};
@ -85,7 +92,7 @@ struct Router1
Context *ctx;
const Router1Cfg &cfg;
std::priority_queue<arc_entry, std::vector<arc_entry>, arc_entry::Greater> arc_queue;
std::priority_queue<arc_entry, std::vector<arc_entry>, arc_entry::Less> arc_queue;
std::unordered_map<WireId, std::unordered_set<arc_key, arc_key::Hash>> wire_to_arcs;
std::unordered_map<arc_key, std::unordered_set<WireId>, arc_key::Hash> arc_to_wires;
std::unordered_set<arc_key, arc_key::Hash> queued_arcs;
@ -112,6 +119,14 @@ struct Router1
arc_entry entry;
entry.arc = arc;
entry.pri = pri;
entry.randtag = ctx->rng();
#if 0
if (ctx->debug)
log("[arc_queue_insert] %s (%d) %s %s [%d %d]\n", ctx->nameOf(entry.arc.net_info), entry.arc.user_idx,
ctx->getWireName(src_wire).c_str(ctx), ctx->getWireName(dst_wire).c_str(ctx), (int)entry.pri,
entry.randtag);
#endif
arc_queue.push(entry);
queued_arcs.insert(arc);
@ -134,6 +149,13 @@ struct Router1
arc_key arc_queue_pop()
{
arc_entry entry = arc_queue.top();
#if 0
if (ctx->debug)
log("[arc_queue_pop] %s (%d) [%d %d]\n", ctx->nameOf(entry.arc.net_info), entry.arc.user_idx,
(int)entry.pri, entry.randtag);
#endif
arc_queue.pop();
queued_arcs.erase(entry.arc);
return entry.arc;
@ -146,16 +168,25 @@ struct Router1
netScores[net]++;
auto net_wires_copy = net->wires;
for (auto &it : net_wires_copy) {
WireId w = it.first;
std::vector<WireId> wires;
for (auto &it : net->wires)
wires.push_back(it.first);
ctx->sorted_shuffle(wires);
for (WireId w : wires) {
std::vector<arc_key> arcs;
for (auto &it : wire_to_arcs[w]) {
arc_to_wires[it].erase(w);
arc_queue_insert(it);
arcs.push_back(it);
}
wire_to_arcs[w].clear();
ctx->sorted_shuffle(arcs);
for (auto &it : arcs)
arc_queue_insert(it);
if (ctx->debug)
log(" unbind wire %s\n", ctx->getWireName(w).c_str(ctx));
@ -178,12 +209,18 @@ struct Router1
if (n != nullptr)
ripup_net(n);
} else {
std::vector<arc_key> arcs;
for (auto &it : wire_to_arcs[w]) {
arc_to_wires[it].erase(w);
arc_queue_insert(it);
arcs.push_back(it);
}
wire_to_arcs[w].clear();
ctx->sorted_shuffle(arcs);
for (auto &it : arcs)
arc_queue_insert(it);
if (ctx->debug)
log(" unbind wire %s\n", ctx->getWireName(w).c_str(ctx));
@ -206,12 +243,18 @@ struct Router1
if (n != nullptr)
ripup_net(n);
} else {
std::vector<arc_key> arcs;
for (auto &it : wire_to_arcs[w]) {
arc_to_wires[it].erase(w);
arc_queue_insert(it);
arcs.push_back(it);
}
wire_to_arcs[w].clear();
ctx->sorted_shuffle(arcs);
for (auto &it : arcs)
arc_queue_insert(it);
if (ctx->debug)
log(" unbind wire %s\n", ctx->getWireName(w).c_str(ctx));
@ -302,8 +345,14 @@ struct Router1
std::unordered_map<WireId, NetInfo *> src_to_net;
std::unordered_map<WireId, arc_key> dst_to_arc;
for (auto &net_it : ctx->nets) {
NetInfo *net_info = net_it.second.get();
std::vector<IdString> net_names;
for (auto &net_it : ctx->nets)
net_names.push_back(net_it.first);
ctx->sorted_shuffle(net_names);
for (IdString net_name : net_names) {
NetInfo *net_info = ctx->nets.at(net_name).get();
if (skip_net(net_info))
continue;
@ -591,8 +640,7 @@ struct Router1
queue.push(next_qw);
if (next_wire == dst_wire) {
if (maxVisitCnt == INT_MAX)
maxVisitCnt = 2 * visitCnt;
maxVisitCnt = std::min(maxVisitCnt, 2 * visitCnt + (next_qw.penalty > 0 ? 100 : 0));
best_score = next_score - next_bonus;
}
}
@ -611,6 +659,7 @@ struct Router1
log(" final route delay: %8.2f\n", ctx->getDelayNS(visited[dst_wire].delay));
log(" final route penalty: %8.2f\n", ctx->getDelayNS(visited[dst_wire].penalty));
log(" final route bonus: %8.2f\n", ctx->getDelayNS(visited[dst_wire].bonus));
log(" arc budget: %12.2f\n", ctx->getDelayNS(net_info->users[user_idx].budget));
}
// bind resulting route (and maybe unroute other nets)

6
docs/archapi.md
View File

@ -30,15 +30,15 @@ delay_t maxDelay() const { return delay; }
### BelId
A type representing a bel name. `BelId()` must construct a unique null-value. Must provide `==` and `!=` operators and a specialization for `std::hash<BelId>`.
A type representing a bel name. `BelId()` must construct a unique null-value. Must provide `==`, `!=`, and `<` operators and a specialization for `std::hash<BelId>`.
### WireId
A type representing a wire name. `WireId()` must construct a unique null-value. Must provide `==` and `!=` operators and a specialization for `std::hash<WireId>`.
A type representing a wire name. `WireId()` must construct a unique null-value. Must provide `==`, `!=`, and `<` operators and a specialization for `std::hash<WireId>`.
### PipId
A type representing a pip name. `PipId()` must construct a unique null-value. Must provide `==` and `!=` operators and a specialization for `std::hash<PipId>`.
A type representing a pip name. `PipId()` must construct a unique null-value. Must provide `==`, `!=`, and `<` operators and a specialization for `std::hash<PipId>`.
### GroupId

4
ecp5/archdefs.h
View File

@ -75,6 +75,7 @@ struct Location
bool operator==(const Location &other) const { return x == other.x && y == other.y; }
bool operator!=(const Location &other) const { return x != other.x || y != other.y; }
bool operator<(const Location &other) const { return y == other.y ? x < other.x : y < other.y; }
};
inline Location operator+(const Location &a, const Location &b) { return Location(a.x + b.x, a.y + b.y); }
@ -86,6 +87,7 @@ struct BelId
bool operator==(const BelId &other) const { return index == other.index && location == other.location; }
bool operator!=(const BelId &other) const { return index != other.index || location != other.location; }
bool operator<(const BelId &other) const { return location == other.location ? index < other.index : location < other.location; }
};
struct WireId
@ -95,6 +97,7 @@ struct WireId
bool operator==(const WireId &other) const { return index == other.index && location == other.location; }
bool operator!=(const WireId &other) const { return index != other.index || location != other.location; }
bool operator<(const WireId &other) const { return location == other.location ? index < other.index : location < other.location; }
};
struct PipId
@ -104,6 +107,7 @@ struct PipId
bool operator==(const PipId &other) const { return index == other.index && location == other.location; }
bool operator!=(const PipId &other) const { return index != other.index || location != other.location; }
bool operator<(const PipId &other) const { return location == other.location ? index < other.index : location < other.location; }
};
struct GroupId

3
ice40/archdefs.h
View File

@ -66,6 +66,7 @@ struct BelId
bool operator==(const BelId &other) const { return index == other.index; }
bool operator!=(const BelId &other) const { return index != other.index; }
bool operator<(const BelId &other) const { return index < other.index; }
};
struct WireId
@ -74,6 +75,7 @@ struct WireId
bool operator==(const WireId &other) const { return index == other.index; }
bool operator!=(const WireId &other) const { return index != other.index; }
bool operator<(const WireId &other) const { return index < other.index; }
};
struct PipId
@ -82,6 +84,7 @@ struct PipId
bool operator==(const PipId &other) const { return index == other.index; }
bool operator!=(const PipId &other) const { return index != other.index; }
bool operator<(const PipId &other) const { return index < other.index; }
};
struct GroupId