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

Implement Arch::getPipName() and remove debug/verbose before routing

Browse Source
This commit is contained in:
Eddie Hung 2018-11-10 16:11:38 -08:00
parent 540765a14e
commit f6bdd92640
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xc7/arch.cc
View File

@ -600,20 +600,26 @@ IdString Arch::getPipName(PipId pip) const
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
#if 1 ExtendedWireInfo ewi_src(*torc_info->ddb, torc_info->pip_to_arc[pip.index].getSourceTilewire());
int x = chip_info->pip_data[pip.index].x; ExtendedWireInfo ewi_dst(*torc_info->ddb, torc_info->pip_to_arc[pip.index].getSinkTilewire());
int y = chip_info->pip_data[pip.index].y; std::stringstream pip_name;
pip_name << ewi_src.mTileName << "." << ewi_src.mWireName << ".->." << ewi_dst.mWireName;
return id(pip_name.str());
std::string src_name = chip_info->wire_data[chip_info->pip_data[pip.index].src].name.get(); //#if 1
std::replace(src_name.begin(), src_name.end(), '/', '.'); // int x = chip_info->pip_data[pip.index].x;
// int y = chip_info->pip_data[pip.index].y;
std::string dst_name = chip_info->wire_data[chip_info->pip_data[pip.index].dst].name.get(); //
std::replace(dst_name.begin(), dst_name.end(), '/', '.'); // std::string src_name = chip_info->wire_data[chip_info->pip_data[pip.index].src].name.get();
// std::replace(src_name.begin(), src_name.end(), '/', '.');
return id("X" + std::to_string(x) + "/Y" + std::to_string(y) + "/" + src_name + ".->." + dst_name); //
#else // std::string dst_name = chip_info->wire_data[chip_info->pip_data[pip.index].dst].name.get();
return id(chip_info->pip_data[pip.index].name.get()); // std::replace(dst_name.begin(), dst_name.end(), '/', '.');
#endif //
// return id("X" + std::to_string(x) + "/Y" + std::to_string(y) + "/" + src_name + ".->." + dst_name);
//#else
// return id(chip_info->pip_data[pip.index].name.get());
//#endif
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -774,8 +780,6 @@ bool Arch::place() { return placer1(getCtx(), Placer1Cfg(getCtx())); }
bool Arch::route() bool Arch::route()
{ {
getCtx()->debug = true;
getCtx()->verbose = true;
return router1(getCtx(), Router1Cfg(getCtx())); return router1(getCtx(), Router1Cfg(getCtx()));
} }