From 6ff932c4deee7bbfd7a7ec8905e3e0da658c113b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 3 Jul 2025 14:56:40 +0200 Subject: [PATCH] clangformat --- himbaechel/uarch/gatemate/cells.cc | 2 +- himbaechel/uarch/gatemate/gatemate.cc | 2 -- himbaechel/uarch/gatemate/pack_cpe.cc | 6 ++-- himbaechel/uarch/gatemate/pack_mult.cc | 38 +++++++++++++------------- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/himbaechel/uarch/gatemate/cells.cc b/himbaechel/uarch/gatemate/cells.cc index 0dda3d2c..67288382 100644 --- a/himbaechel/uarch/gatemate/cells.cc +++ b/himbaechel/uarch/gatemate/cells.cc @@ -44,7 +44,7 @@ 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 + // For EN_CIN input add_port(id_CINY1, PORT_IN); if (type.in(id_CPE_LT_L)) { add_port(id_CINY2, PORT_IN); diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc index 8dc9e2a8..751d6468 100644 --- a/himbaechel/uarch/gatemate/gatemate.cc +++ b/himbaechel/uarch/gatemate/gatemate.cc @@ -236,7 +236,6 @@ void GateMateImpl::postPlace() cell.second->type = id_CPE_MX4; break; case C_EN_CIN: - //cell.second->type = id_CPE_EN_CIN; log_error("EN_CIN should be using L2T4.\n"); break; case C_CONCAT: @@ -244,7 +243,6 @@ void GateMateImpl::postPlace() break; case C_ADDCIN: log_error("ADDCIN should be using L2T4.\n"); - //cell.second->type = id_CPE_ADDCIN; break; default: break; diff --git a/himbaechel/uarch/gatemate/pack_cpe.cc b/himbaechel/uarch/gatemate/pack_cpe.cc index 02e9a932..62fcc87b 100644 --- a/himbaechel/uarch/gatemate/pack_cpe.cc +++ b/himbaechel/uarch/gatemate/pack_cpe.cc @@ -149,9 +149,9 @@ void GateMatePacker::pack_cpe() ci.renamePort(id_I3, id_IN4); ci.renamePort(id_O, id_OUT); - uarch->rename_param(&ci, id_INIT_L02, id_INIT_L00,4); - uarch->rename_param(&ci, id_INIT_L03, id_INIT_L01,4); - uarch->rename_param(&ci, id_INIT_L11, id_INIT_L10,4); + uarch->rename_param(&ci, id_INIT_L02, id_INIT_L00, 4); + uarch->rename_param(&ci, id_INIT_L03, id_INIT_L01, 4); + uarch->rename_param(&ci, id_INIT_L11, id_INIT_L10, 4); ci.cluster = ci.name; ci.constr_abs_z = true; ci.constr_z = CPE_LT_L_Z; diff --git a/himbaechel/uarch/gatemate/pack_mult.cc b/himbaechel/uarch/gatemate/pack_mult.cc index d0e106bb..ce48ad0c 100644 --- a/himbaechel/uarch/gatemate/pack_mult.cc +++ b/himbaechel/uarch/gatemate/pack_mult.cc @@ -244,7 +244,7 @@ CarryGenCell::CarryGenCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel lower->params[id_INIT_L10] = Property(is_odd_x ? LUT_OR : LUT_ZERO, 4); lower->params[id_INIT_L20] = Property(is_odd_x ? LUT_OR : LUT_ZERO, 4); lower->params[id_C_FUNCTION] = Property(C_EN_CIN, 3); - lower->params[id_C_I3] = Property(1, 1); // PINY1 for L02 + lower->params[id_C_I3] = Property(1, 1); // PINY1 for L02 lower->params[id_C_HORIZ] = Property(0, 1); // CINY1 for CIN_ for L03 upper->params[id_INIT_L00] = Property(LUT_ZERO, 4); // (unused) @@ -260,7 +260,7 @@ CarryGenCell::CarryGenCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel cplines->params[id_C_SEL_C] = Property(1, 1); // COMP_OUT -> CY2_VAL cplines->params[id_C_SELY2] = Property(0, 1); // COMP_OUT -> CY2_VAL - //upper->params[id_C_O1] = Property(0b11, 2); // COMB1OUT -> OUT1 + // upper->params[id_C_O1] = Property(0b11, 2); // COMB1OUT -> OUT1 } MultfabCell::MultfabCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellInfo *cplines, IdString name, @@ -269,8 +269,8 @@ MultfabCell::MultfabCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellI { // TODO: perhaps C_I[1234] could be pips? - lower->params[id_INIT_L00] = Property(LUT_D1, 4); // PINY1 - //lower->params[id_INIT_L01] = Property(LUT_ZERO, 4); // (unused) + lower->params[id_INIT_L00] = Property(LUT_D1, 4); // PINY1 + // lower->params[id_INIT_L01] = Property(LUT_ZERO, 4); // (unused) lower->params[id_INIT_L10] = Property(LUT_D0, 4); // L02 lower->params[id_INIT_L20] = Property(is_even_x ? LUT_AND_INV_D0 : LUT_OR, 4); // L10 AND L11 -> OUT1 lower->params[id_C_FUNCTION] = Property(C_ADDCIN, 3); @@ -284,7 +284,7 @@ MultfabCell::MultfabCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellI upper->params[id_C_I1] = Property(1, 1); // PINY1 for L00 upper->params[id_C_I2] = Property(1, 1); // CINX for L01 lower->params[id_C_I3] = Property(1, 1); // PINY1 for L02 - //upper->params[id_C_FUNCTION] = Property(C_ADDCIN, 3); + // upper->params[id_C_FUNCTION] = Property(C_ADDCIN, 3); cplines->params[id_C_SELX] = Property(1, 1); // inverted CINY2 -> CX_VAL cplines->params[id_C_SEL_C] = Property(1, 1); // inverted CINY2 -> CX_VAL; COMP_OUT -> CY1_VAL @@ -295,7 +295,7 @@ MultfabCell::MultfabCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellI cplines->params[id_C_SEL_P] = Property(0, 1); // OUT1 -> PY1_VAL cplines->params[id_C_SELY1] = Property(0, 1); // COMP_OUT -> CY1_VAL; OUT1 -> PY1_VAL - //upper->params[id_C_O1] = Property(0b11, 2); // COMB1OUT -> OUT1 + // upper->params[id_C_O1] = Property(0b11, 2); // COMB1OUT -> OUT1 } FRoutingCell::FRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellInfo *cplines, IdString name, @@ -312,11 +312,11 @@ FRoutingCell::FRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel comp->params[id_INIT_L30] = Property(is_even_x ? LUT_ONE : LUT_INV_D1, 4); // L10 -> COMP_OUT - upper->params[id_INIT_L00] = Property(LUT_D1, 4); // PINY1 - //upper->params[id_INIT_L01] = Property(LUT_ONE, 4); // (unused) + upper->params[id_INIT_L00] = Property(LUT_D1, 4); // PINY1 + // upper->params[id_INIT_L01] = Property(LUT_ONE, 4); // (unused) upper->params[id_INIT_L10] = Property(LUT_D0, 4); upper->params[id_C_I1] = Property(1, 1); // PINY1 for L00 - //upper->params[id_C_FUNCTION] = Property(C_ADDCIN, 3); + // upper->params[id_C_FUNCTION] = Property(C_ADDCIN, 3); cplines->params[id_C_SELX] = Property(1, 1); cplines->params[id_C_SEL_C] = Property(1, 1); @@ -327,8 +327,8 @@ FRoutingCell::FRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel cplines->params[id_C_PY1_I] = Property(1, 1); cplines->params[id_C_PY2_I] = Property(1, 1); - //upper->params[id_C_O1] = Property(0b11, 2); // COMB1OUT -> OUT1 - //upper->params[id_C_O2] = Property(0b11, 2); // COMB2OUT -> OUT2 + // upper->params[id_C_O1] = Property(0b11, 2); // COMB1OUT -> OUT1 + // upper->params[id_C_O2] = Property(0b11, 2); // COMB2OUT -> OUT2 } MultCell::MultCell(CellInfo *lower, CellInfo *upper, CellInfo *cplines, IdString name, bool is_msb) @@ -337,7 +337,7 @@ MultCell::MultCell(CellInfo *lower, CellInfo *upper, CellInfo *cplines, IdString lower->params[id_INIT_L02] = Property(LUT_AND, 4); lower->params[id_INIT_L03] = Property(LUT_D1, 4); // PINX lower->params[id_INIT_L11] = Property(LUT_XOR, 4); - //lower->params[id_INIT_L20] = Property(LUT_D1, 4); // L11 + // lower->params[id_INIT_L20] = Property(LUT_D1, 4); // L11 lower->params[id_C_FUNCTION] = Property(C_MULT, 3); upper->params[id_INIT_L00] = Property(LUT_AND, 4); @@ -358,17 +358,17 @@ MultCell::MultCell(CellInfo *lower, CellInfo *upper, CellInfo *cplines, IdString lower->params[id_C_C_P] = Property(0, 1); } - //upper->params[id_C_O1] = Property(0b10, 2); // CP_OUT1 -> OUT1 - //upper->params[id_C_O2] = Property(0b10, 2); // CP_OUT2 -> OUT2 + // upper->params[id_C_O1] = Property(0b10, 2); // CP_OUT1 -> OUT1 + // upper->params[id_C_O2] = Property(0b10, 2); // CP_OUT2 -> OUT2 } MsbRoutingCell::MsbRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellInfo *cplines, IdString name) : lower{lower}, upper{upper}, comp{comp}, cplines{cplines} { - //lower->params[id_INIT_L02] = Property(LUT_ZERO, 4); // (unused) - //lower->params[id_INIT_L03] = Property(LUT_ZERO, 4); // (unused) - //lower->params[id_INIT_L11] = Property(LUT_ZERO, 4); // (unused) - //lower->params[id_INIT_L20] = Property(LUT_ZERO, 4); // (unused) + // lower->params[id_INIT_L02] = Property(LUT_ZERO, 4); // (unused) + // lower->params[id_INIT_L03] = Property(LUT_ZERO, 4); // (unused) + // lower->params[id_INIT_L11] = Property(LUT_ZERO, 4); // (unused) + // lower->params[id_INIT_L20] = Property(LUT_ZERO, 4); // (unused) comp->params[id_INIT_L30] = Property(LUT_ONE, 4); // zero -> COMP_OUT (L30 is inverted) @@ -386,7 +386,7 @@ MsbRoutingCell::MsbRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, cplines->params[id_C_PY1_I] = Property(1, 1); // PY1_VAL -> POUTY1 cplines->params[id_C_PY2_I] = Property(1, 1); // PY2_VAL -> POUTY2 - //upper->params[id_C_O2] = Property(0b11, 2); // COMB2 -> OUT2 + // upper->params[id_C_O2] = Property(0b11, 2); // COMB2 -> OUT2 } void GateMatePacker::pack_mult()