luke
/
nextpnr
mirror of https://github.com/YosysHQ/nextpnr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix formatting

This commit is contained in:
Miodrag Milanovic 2026-01-22 12:26:10 +01:00
parent 27a49487b6
commit 275ba0ad81
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
himbaechel/uarch/gatemate/gatemate.cc
View File

@ -370,14 +370,16 @@ bool GateMateImpl::checkPipAvail(PipId pip) const
}
if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.block != 0)) {
if (pip_mask[pip.tile] & extra_data.block) {
//printf("blocking %s - > %s at %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
// printf("blocking %s - > %s at
// %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
return false;
}
}
if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.resource != 0)) {
if (pip_mask[pip.tile] & extra_data.resource) {
if ((pip_data[pip.tile] & extra_data.resource) != (extra_data.value ? extra_data.resource : 0)) {
//printf("blocking %s - > %s at %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
// printf("blocking %s - > %s at
// %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
return false;
}
}
@ -515,18 +517,21 @@ void GateMateImpl::reassign_cplines(NetInfo *ni, const dict<WireId, PipMap> &net
ctx->bindBel(bel, cell, PlaceStrength::STRENGTH_FIXED);
}
auto resource_map = dict<uint32_t, IdString>{
{ PipMask::C_SELX, id_C_SELX },
{ PipMask::C_SELY1, id_C_SELY1 },
{ PipMask::C_SELY2, id_C_SELY2 },
{ PipMask::C_SEL_C, id_C_SEL_C },
{ PipMask::C_SEL_P, id_C_SEL_P },
{ PipMask::C_Y12, id_C_Y12 },
{ PipMask::C_CX_I, id_C_CX_I },
{ PipMask::C_CY1_I, id_C_CY1_I },
{ PipMask::C_CY2_I, id_C_CY2_I },
{ PipMask::C_PX_I, id_C_PX_I },
{ PipMask::C_PY1_I, id_C_PY1_I },
{ PipMask::C_PY2_I, id_C_PY2_I, },
{PipMask::C_SELX, id_C_SELX},
{PipMask::C_SELY1, id_C_SELY1},
{PipMask::C_SELY2, id_C_SELY2},
{PipMask::C_SEL_C, id_C_SEL_C},
{PipMask::C_SEL_P, id_C_SEL_P},
{PipMask::C_Y12, id_C_Y12},
{PipMask::C_CX_I, id_C_CX_I},
{PipMask::C_CY1_I, id_C_CY1_I},
{PipMask::C_CY2_I, id_C_CY2_I},
{PipMask::C_PX_I, id_C_PX_I},
{PipMask::C_PY1_I, id_C_PY1_I},
{
PipMask::C_PY2_I,
id_C_PY2_I,
},
};
NPNR_ASSERT(resource_map.count(extra_data.resource));

2
himbaechel/uarch/gatemate/gfx.cc
View File

@ -47,7 +47,7 @@ void GateMateImpl::drawBel(std::vector<GraphicElement> &g, GraphicElement::style
el.y1 = loc.y + 0.25;
el.y2 = el.y1 + 0.50;
g.push_back(el);
break;
break;
case id_CPE_LT_L.index:
el.x1 = loc.x + 0.20;
el.x2 = el.x1 + 0.20;