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

handing of C_EN_IN

This commit is contained in:
Miodrag Milanovic 2025-07-03 11:06:18 +02:00
parent 9d9f035c23
commit 55a3faee72
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
himbaechel/uarch/gatemate/cells.cc
View File

@ -43,8 +43,9 @@ CellInfo *GateMatePacker::create_cell_ptr(IdString type, IdString name)
add_port(id_CINX, PORT_IN);
add_port(id_PINX, PORT_IN);
add_port(id_PINY1, PORT_IN);
// For EN_CIN input
add_port(id_CINY1, PORT_IN);
if (type.in(id_CPE_LT_L, id_CPE_L2T5_L)) {
add_port(id_CINY1, PORT_IN);
add_port(id_CINY2, PORT_IN);
add_port(id_PINY2, PORT_IN);

4
himbaechel/uarch/gatemate/pack_cpe.cc
View File

@ -530,13 +530,13 @@ void GateMatePacker::pack_addf()
co_upper->constr_abs_z = false;
co_upper->constr_z = -1;
co_upper->constr_y = +i + 1;
CellInfo *co_lower = create_cell_ptr(id_CPE_LT_L, ctx->idf("%s$co", cy->name.c_str(ctx)));
CellInfo *co_lower = create_cell_ptr(id_CPE_L2T4, ctx->idf("%s$co", cy->name.c_str(ctx)));
co_lower->cluster = root->name;
root->constr_children.push_back(co_lower);
co_lower->constr_abs_z = false;
co_lower->constr_y = +i + 1;
co_lower->params[id_C_FUNCTION] = Property(C_EN_CIN, 3);
co_lower->params[id_INIT_L11] = Property(0b1100, 4);
co_lower->params[id_INIT_L10] = Property(0b1100, 4);
co_lower->params[id_INIT_L20] = Property(0b1100, 4);
NetInfo *co_conn = ctx->createNet(ctx->idf("%s$co_net", cy->name.c_str(ctx)));

8
himbaechel/uarch/gatemate/pack_mult.cc
View File

@ -303,10 +303,10 @@ FRoutingCell::FRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel
{
// TODO: simplify AND with zero/OR with zero into something more sensical.
//lower->params[id_INIT_L02] = Property(LUT_ZERO, 4); // (unused)
//lower->params[id_INIT_L03] = Property(LUT_ONE, 4); // (unused)
//lower->params[id_INIT_L11] = Property(LUT_AND, 4);
//lower->params[id_INIT_L20] = Property(LUT_D1, 4);
lower->params[id_INIT_L02] = Property(LUT_ZERO, 4); // (unused)
lower->params[id_INIT_L03] = Property(LUT_ONE, 4); // (unused)
lower->params[id_INIT_L11] = Property(LUT_AND, 4);
lower->params[id_INIT_L20] = Property(LUT_D1, 4);
lower->params[id_C_FUNCTION] = Property(C_ADDCIN, 3);
comp->params[id_INIT_L30] = Property(is_even_x ? LUT_ONE : LUT_INV_D1, 4); // L10 -> COMP_OUT