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

Refactor position/delay estimation API

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-14 12:43:00 +02:00
parent b1cbae1293
commit 7787ce5fd9
6 changed files with 37 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/route.cc
View File

@ -45,7 +45,7 @@ struct QueuedWire
void route_design(Design *design, bool verbose) void route_design(Design *design, bool verbose)
{ {
auto &chip = design->chip; auto &chip = design->chip;
int itercnt = 0, netcnt = 0; int visitCnt = 0, revisitCnt = 0, netCnt = 0;
float maxDelay = 0.0; float maxDelay = 0.0;
int failedPathCnt = 0; int failedPathCnt = 0;
@ -62,7 +62,7 @@ void route_design(Design *design, bool verbose)
if (verbose) if (verbose)
log("Routing net %s.\n", net_name.c_str()); log("Routing net %s.\n", net_name.c_str());
netcnt++; netCnt++;
if (verbose) if (verbose)
log(" Source: %s.%s.\n", net_info->driver.cell->name.c_str(), log(" Source: %s.%s.\n", net_info->driver.cell->name.c_str(),
@ -78,8 +78,6 @@ void route_design(Design *design, bool verbose)
if (verbose) if (verbose)
log(" Source bel: %s\n", chip.getBelName(src_bel).c_str()); log(" Source bel: %s\n", chip.getBelName(src_bel).c_str());
auto src_pos = chip.getBelPosition(src_bel);
IdString driver_port = net_info->driver.port; IdString driver_port = net_info->driver.port;
auto driver_port_it = net_info->driver.cell->pins.find(driver_port); auto driver_port_it = net_info->driver.cell->pins.find(driver_port);
@ -109,19 +107,15 @@ void route_design(Design *design, bool verbose)
user_it.port.c_str()); user_it.port.c_str());
auto dst_bel = user_it.cell->bel; auto dst_bel = user_it.cell->bel;
auto dst_pos = chip.getBelPosition(dst_bel);
if (dst_bel == BelId()) if (dst_bel == BelId())
log_error("Destination cell %s (%s) is not mapped to a bel.\n", log_error("Destination cell %s (%s) is not mapped to a bel.\n",
user_it.cell->name.c_str(), user_it.cell->name.c_str(),
user_it.cell->type.c_str()); user_it.cell->type.c_str());
if (verbose) { if (verbose)
log(" Destination bel: %s\n", log(" Destination bel: %s\n",
chip.getBelName(dst_bel).c_str()); chip.getBelName(dst_bel).c_str());
log(" Path delay estimate: %.2f\n",
chip.estimateDelay(src_pos, dst_pos));
}
IdString user_port = user_it.port; IdString user_port = user_it.port;
@ -140,9 +134,12 @@ void route_design(Design *design, bool verbose)
user_it.cell->name.c_str(), user_it.cell->name.c_str(),
chip.getBelName(dst_bel).c_str()); chip.getBelName(dst_bel).c_str());
if (verbose) if (verbose) {
log(" Destination wire: %s\n", log(" Destination wire: %s\n",
chip.getWireName(dst_wire).c_str()); chip.getWireName(dst_wire).c_str());
log(" Path delay estimate: %.2f\n",
chip.estimateDelay(src_wire, dst_wire));
}
std::unordered_map<WireId, QueuedWire> visited; std::unordered_map<WireId, QueuedWire> visited;
std::priority_queue<QueuedWire, std::vector<QueuedWire>, std::priority_queue<QueuedWire, std::vector<QueuedWire>,
@ -154,15 +151,14 @@ void route_design(Design *design, bool verbose)
qw.wire = it.first; qw.wire = it.first;
qw.pip = PipId(); qw.pip = PipId();
qw.delay = it.second.avgDelay(); qw.delay = it.second.avgDelay();
qw.togo = chip.estimateDelay(chip.getWirePosition(qw.wire), qw.togo = chip.estimateDelay(qw.wire, dst_wire);
dst_pos);
queue.push(qw); queue.push(qw);
visited[qw.wire] = qw; visited[qw.wire] = qw;
} }
while (!queue.empty()) { while (!queue.empty()) {
itercnt++; visitCnt++;
QueuedWire qw = queue.top(); QueuedWire qw = queue.top();
queue.pop(); queue.pop();
@ -182,6 +178,7 @@ void route_design(Design *design, bool verbose)
"estimate: %.2f %.2f\n", "estimate: %.2f %.2f\n",
chip.getWireName(next_wire).c_str(), chip.getWireName(next_wire).c_str(),
visited.at(next_wire).delay, next_delay); visited.at(next_wire).delay, next_delay);
revisitCnt++;
} }
if (!chip.checkWireAvail(next_wire)) if (!chip.checkWireAvail(next_wire))
@ -191,8 +188,7 @@ void route_design(Design *design, bool verbose)
next_qw.wire = next_wire; next_qw.wire = next_wire;
next_qw.pip = pip; next_qw.pip = pip;
next_qw.delay = next_delay; next_qw.delay = next_delay;
next_qw.togo = chip.estimateDelay( next_qw.togo = chip.estimateDelay(next_wire, dst_wire);
chip.getWirePosition(next_wire), dst_pos);
visited[next_qw.wire] = next_qw; visited[next_qw.wire] = next_qw;
queue.push(next_qw); queue.push(next_qw);
@ -242,7 +238,8 @@ void route_design(Design *design, bool verbose)
} }
} }
log_info("routed %d nets, visited %d wires.\n", netcnt, itercnt); log_info("routed %d nets, visited %d wires (%.2f%% revisits).\n", netCnt,
visitCnt, (100.0 * revisitCnt) / visitCnt);
log_info("longest path delay: %.2f\n", maxDelay); log_info("longest path delay: %.2f\n", maxDelay);
if (failedPathCnt > 0) if (failedPathCnt > 0)

33
dummy/chip.cc
View File

@ -141,37 +141,14 @@ const std::vector<PipId> &Chip::getWireAliases(WireId wire) const
// --------------------------------------------------------------- // ---------------------------------------------------------------
PosInfo Chip::getBelPosition(BelId bel) const bool Chip::estimatePosition(BelId bel, float &x, float &y) const
{ {
PosInfo pos; x = 0.0;
assert(bel != BelId()); y = 0.0;
// pos.x = ...; return false;
// pos.y = ...;
return pos;
} }
PosInfo Chip::getWirePosition(WireId wire) const float Chip::estimateDelay(WireId src, WireId dst) const { return 0.0; }
{
PosInfo pos;
assert(wire != WireId());
// pos.x = ...;
// pos.y = ...;
return pos;
}
PosInfo Chip::getPipPosition(PipId pip) const
{
PosInfo pos;
assert(pip != PipId());
// pos.x = ...;
// pos.y = ...;
return pos;
}
float Chip::estimateDelay(PosInfo src, PosInfo dst) const
{
return fabsf(src.x - dst.x) + fabsf(src.x - dst.x);
}
// --------------------------------------------------------------- // ---------------------------------------------------------------

11
dummy/chip.h
View File

@ -42,11 +42,6 @@ struct DelayInfo
} }
}; };
struct PosInfo
{
float x = 0, y = 0;
};
typedef IdString BelType; typedef IdString BelType;
typedef IdString PortPin; typedef IdString PortPin;
@ -113,10 +108,8 @@ struct Chip
const std::vector<PipId> &getPipsUphill(WireId wire) const; const std::vector<PipId> &getPipsUphill(WireId wire) const;
const std::vector<PipId> &getWireAliases(WireId wire) const; const std::vector<PipId> &getWireAliases(WireId wire) const;
PosInfo getBelPosition(BelId bel) const; bool estimatePosition(BelId bel, float &x, float &y) const;
PosInfo getWirePosition(WireId wire) const; float estimateDelay(WireId src, WireId dst) const;
PosInfo getPipPosition(PipId pip) const;
float estimateDelay(PosInfo src, PosInfo dst) const;
std::vector<GraphicElement> getFrameGraphics() const; std::vector<GraphicElement> getFrameGraphics() const;
std::vector<GraphicElement> getBelGraphics(BelId bel) const; std::vector<GraphicElement> getBelGraphics(BelId bel) const;

36
ice40/chip.cc
View File

@ -275,36 +275,26 @@ BelId Chip::getPackagePinBel(const std::string &pin) const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
PosInfo Chip::getBelPosition(BelId bel) const bool Chip::estimatePosition(BelId bel, float &x, float &y) const
{ {
PosInfo pos;
assert(bel != BelId()); assert(bel != BelId());
pos.x = chip_info.bel_data[bel.index].x; x = chip_info.bel_data[bel.index].x;
pos.y = chip_info.bel_data[bel.index].y; y = chip_info.bel_data[bel.index].y;
return pos;
return chip_info.bel_data[bel.index].type != TYPE_SB_GB;
} }
PosInfo Chip::getWirePosition(WireId wire) const float Chip::estimateDelay(WireId src, WireId dst) const
{ {
PosInfo pos; assert(src != WireId());
assert(wire != WireId()); float x1 = chip_info.wire_data[src.index].x;
pos.x = chip_info.wire_data[wire.index].x; float y1 = chip_info.wire_data[src.index].y;
pos.y = chip_info.wire_data[wire.index].y;
return pos;
}
PosInfo Chip::getPipPosition(PipId pip) const assert(dst != WireId());
{ float x2 = chip_info.wire_data[dst.index].x;
PosInfo pos; float y2 = chip_info.wire_data[dst.index].y;
assert(pip != PipId());
pos.x = chip_info.pip_data[pip.index].x;
pos.y = chip_info.pip_data[pip.index].y;
return pos;
}
float Chip::estimateDelay(PosInfo src, PosInfo dst) const return fabsf(x1 - x2) + fabsf(y1 - y2);
{
return fabsf(src.x - dst.x) + fabsf(src.y - dst.y);
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

11
ice40/chip.h
View File

@ -42,11 +42,6 @@ struct DelayInfo
} }
}; };
struct PosInfo
{
float x = 0, y = 0;
};
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
enum BelType enum BelType
@ -693,10 +688,8 @@ struct Chip
// ------------------------------------------------- // -------------------------------------------------
PosInfo getBelPosition(BelId bel) const; bool estimatePosition(BelId bel, float &x, float &y) const;
PosInfo getWirePosition(WireId wire) const; float estimateDelay(WireId src, WireId dst) const;
PosInfo getPipPosition(PipId pip) const;
float estimateDelay(PosInfo src, PosInfo dst) const;
// ------------------------------------------------- // -------------------------------------------------

4
ice40/pybindings.cc
View File

@ -73,8 +73,8 @@ void arch_wrap_python()
.def("getPipsDownhill", &Chip::getPipsDownhill) .def("getPipsDownhill", &Chip::getPipsDownhill)
.def("getPipsUphill", &Chip::getPipsUphill) .def("getPipsUphill", &Chip::getPipsUphill)
.def("getWireAliases", &Chip::getWireAliases) .def("getWireAliases", &Chip::getWireAliases)
.def("getBelPosition", &Chip::getBelPosition) .def("estimatePosition", &Chip::estimatePosition)
.def("getWirePosition", &Chip::getWirePosition); .def("estimateDelay", &Chip::estimateDelay);
WRAP_RANGE(Bel); WRAP_RANGE(Bel);
WRAP_RANGE(BelPin); WRAP_RANGE(BelPin);