From 054a652d4bcdc89b8f55ab7648fee6f8109dc55a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 7 Jul 2025 08:24:05 +0200 Subject: [PATCH] clangformat --- himbaechel/uarch/gatemate/bitstream.cc | 24 ++++++++++++------------ himbaechel/uarch/gatemate/pack_mult.cc | 11 ++++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/himbaechel/uarch/gatemate/bitstream.cc b/himbaechel/uarch/gatemate/bitstream.cc index f51d7aeb..a6c70a5b 100644 --- a/himbaechel/uarch/gatemate/bitstream.cc +++ b/himbaechel/uarch/gatemate/bitstream.cc @@ -306,19 +306,19 @@ struct BitstreamBackend update_cpe_mux(cell.second.get(), id_IN2, id_INIT_L11, 1, params); update_cpe_mux(cell.second.get(), id_IN3, id_INIT_L11, 2, params); update_cpe_mux(cell.second.get(), id_IN4, id_INIT_L11, 3, params); - update_cpe_lt(cell.second.get(), id_IN5, id_INIT_L02, params,true); - update_cpe_lt(cell.second.get(), c_i3 ? id_PINY1 : id_IN6, id_INIT_L02, params,false); - update_cpe_lt(cell.second.get(), id_IN7, id_INIT_L03, params,true); - update_cpe_lt(cell.second.get(), c_i4 ? id_PINX : id_IN8, id_INIT_L03, params,false); + update_cpe_lt(cell.second.get(), id_IN5, id_INIT_L02, params, true); + update_cpe_lt(cell.second.get(), c_i3 ? id_PINY1 : id_IN6, id_INIT_L02, params, false); + update_cpe_lt(cell.second.get(), id_IN7, id_INIT_L03, params, true); + update_cpe_lt(cell.second.get(), c_i4 ? id_PINX : id_IN8, id_INIT_L03, params, false); } else { - update_cpe_lt(cell.second.get(), id_IN1, id_INIT_L00, params,true); - update_cpe_lt(cell.second.get(), c_i1 ? id_PINY1 : id_IN2, id_INIT_L00, params,false); - update_cpe_lt(cell.second.get(), id_IN3, id_INIT_L01, params,true); - update_cpe_lt(cell.second.get(), c_i2 ? id_CINX : id_IN4, id_INIT_L01, params,false); - update_cpe_lt(cell.second.get(), id_IN5, id_INIT_L02, params,true); - update_cpe_lt(cell.second.get(), c_i3 ? id_PINY1 : id_IN6, id_INIT_L02, params,false); - update_cpe_lt(cell.second.get(), id_IN7, id_INIT_L03, params,true); - update_cpe_lt(cell.second.get(), c_i4 ? id_PINX : id_IN8, id_INIT_L03, params,false); + update_cpe_lt(cell.second.get(), id_IN1, id_INIT_L00, params, true); + update_cpe_lt(cell.second.get(), c_i1 ? id_PINY1 : id_IN2, id_INIT_L00, params, false); + update_cpe_lt(cell.second.get(), id_IN3, id_INIT_L01, params, true); + update_cpe_lt(cell.second.get(), c_i2 ? id_CINX : id_IN4, id_INIT_L01, params, false); + update_cpe_lt(cell.second.get(), id_IN5, id_INIT_L02, params, true); + update_cpe_lt(cell.second.get(), c_i3 ? id_PINY1 : id_IN6, id_INIT_L02, params, false); + update_cpe_lt(cell.second.get(), id_IN7, id_INIT_L03, params, true); + update_cpe_lt(cell.second.get(), c_i4 ? id_PINX : id_IN8, id_INIT_L03, params, false); } } } diff --git a/himbaechel/uarch/gatemate/pack_mult.cc b/himbaechel/uarch/gatemate/pack_mult.cc index cd0dcae1..0195bafa 100644 --- a/himbaechel/uarch/gatemate/pack_mult.cc +++ b/himbaechel/uarch/gatemate/pack_mult.cc @@ -249,7 +249,8 @@ CarryGenCell::CarryGenCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel upper->params[id_INIT_L00] = Property(LUT_ZERO, 4); // (unused) upper->params[id_INIT_L01] = Property(enable_cinx ? LUT_D1 : LUT_ZERO, 4); // CINX upper->params[id_INIT_L10] = Property(LUT_D1, 4); - if (enable_cinx) upper->params[id_C_I2] = Property(1, 1); // CINX for L01 + if (enable_cinx) + upper->params[id_C_I2] = Property(1, 1); // CINX for L01 comp->params[id_INIT_L30] = Property(LUT_INV_D0, 4); // OUT1 -> COMP_OUT @@ -282,8 +283,9 @@ MultfabCell::MultfabCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellI upper->params[id_INIT_L10] = Property(LUT_XOR, 4); // XOR upper->params[id_C_I1] = Property(1, 1); // PINY1 for L00 - if (enable_cinx) upper->params[id_C_I2] = Property(1, 1); // CINX for L01 - lower->params[id_C_I3] = Property(1, 1); // PINY1 for L02 + if (enable_cinx) + 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); cplines->params[id_C_SELX] = Property(1, 1); // inverted CINY2 -> CX_VAL @@ -332,8 +334,7 @@ FRoutingCell::FRoutingCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, Cel // upper->params[id_C_O2] = Property(0b11, 2); // COMB2OUT -> OUT2 } -MultCell::MultCell(CellInfo *lower, CellInfo *upper, IdString name, bool is_msb) - : lower{lower}, upper{upper} +MultCell::MultCell(CellInfo *lower, CellInfo *upper, IdString name, bool is_msb) : lower{lower}, upper{upper} { lower->params[id_INIT_L02] = Property(LUT_AND, 4); lower->params[id_INIT_L03] = Property(LUT_D1, 4); // PINX