diff --git a/himbaechel/uarch/gatemate/route_mult.cc b/himbaechel/uarch/gatemate/route_mult.cc index e4379bf7..7362a7ad 100644 --- a/himbaechel/uarch/gatemate/route_mult.cc +++ b/himbaechel/uarch/gatemate/route_mult.cc @@ -192,6 +192,7 @@ void route_mult_x1y1_upper_in8(Context *ctx, NetInfo *net, CellInfo *upper, Loc auto sb_big_d2_1 = ctx->getWireByName(IdStringList::concat(x4y2, ctx->idf("SB_BIG.P12.D2_1"))); auto sb_big_y1 = ctx->getWireByName(IdStringList::concat(x4y2, ctx->idf("SB_BIG.P12.Y1"))); auto sb_big_ydiag = ctx->getWireByName(IdStringList::concat(x4y2, ctx->idf("SB_BIG.P12.YDIAG"))); + auto sb_big_y3 = ctx->getWireByName(IdStringList::concat(x4y2, ctx->idf("SB_BIG.P12.Y3"))); find_and_bind_downhill_pip(ctx, out_mux_y, sb_sml_d0, net); find_and_bind_downhill_pip(ctx, sb_sml_d0, sb_sml_y1_int, net); @@ -199,7 +200,8 @@ void route_mult_x1y1_upper_in8(Context *ctx, NetInfo *net, CellInfo *upper, Loc find_and_bind_downhill_pip(ctx, sb_sml_y1, sb_big_d2_1, net); // inverting find_and_bind_downhill_pip(ctx, sb_big_d2_1, sb_big_y1, net); // inverting find_and_bind_downhill_pip(ctx, sb_big_y1, sb_big_ydiag, net); // inverting - find_and_bind_downhill_pip(ctx, sb_big_ydiag, in_mux_p12, net); // inverting + find_and_bind_downhill_pip(ctx, sb_big_ydiag, sb_big_y3, net); // inverting + find_and_bind_downhill_pip(ctx, sb_big_y3, in_mux_p12, net); // inverting } else { auto sb_big_d0 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("SB_BIG.P12.D0"))); @@ -427,10 +429,12 @@ void route_mult_x1y2_upper_in8(Context *ctx, NetInfo *net, CellInfo *upper, Loc find_and_bind_downhill_pip(ctx, sb_sml_y2_int, sb_sml_y2, net); find_and_bind_downhill_pip(ctx, sb_sml_y2, in_mux_p10, net); } else { - // x2y1/OM.P10.Y is x2y1/SB_BIG.P10.D0 - // x2y2/IM.P10.D1 is x2y1/SB_BIG.P10.Y2 + auto sb_big_d0 = ctx->getWireByName(IdStringList::concat(x2y1, ctx->idf("SB_BIG.P10.D0"))); + auto sb_big_y2 = ctx->getWireByName(IdStringList::concat(x2y1, ctx->idf("SB_BIG.P10.Y2"))); - find_and_bind_downhill_pip(ctx, out_mux_y, in_mux_p10, net); // inverting + find_and_bind_downhill_pip(ctx, out_mux_y, sb_big_d0, net); + find_and_bind_downhill_pip(ctx, sb_big_d0, sb_big_y2, net); + find_and_bind_downhill_pip(ctx, sb_big_y2, in_mux_p10, net); } auto in_mux_p10_y = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P10.Y"))); @@ -547,39 +551,54 @@ void route_mult_x2y1_upper_in1(Context *ctx, NetInfo *net, CellInfo *upper, Loc auto sb_big_p03_d0 = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P03.D0"))); auto sb_big_p03_y1 = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P03.Y1"))); auto sb_big_p03_ydiag = - ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P03.YDIAG"))); // AKA SB_BIG.P02.X23 + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P03.YDIAG"))); + auto sb_big_p02_x23 = + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P02.X23"))); auto sb_big_p02_ydiag = - ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P02.YDIAG"))); // AKA SB_BIG.P01.X23 + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P02.YDIAG"))); + auto sb_big_p01_x23 = + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P01.X23"))); auto sb_big_p01_ydiag = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P01.YDIAG"))); - // x2y1/IM.P01.D0 is x0y1/SB_BIG.P01.Y1 + auto sb_big_p01_y1 = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_BIG.P01.Y1"))); find_and_bind_downhill_pip(ctx, cpe_out2, sb_big_p03_d0, net); find_and_bind_downhill_pip(ctx, sb_big_p03_d0, sb_big_p03_y1, net); find_and_bind_downhill_pip(ctx, sb_big_p03_y1, sb_big_p03_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p03_ydiag, sb_big_p02_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p02_ydiag, sb_big_p01_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p01_ydiag, in_mux, net); + find_and_bind_downhill_pip(ctx, sb_big_p03_ydiag, sb_big_p02_x23, net); + find_and_bind_downhill_pip(ctx, sb_big_p02_x23, sb_big_p02_ydiag, net); + find_and_bind_downhill_pip(ctx, sb_big_p02_ydiag, sb_big_p01_x23, net); + find_and_bind_downhill_pip(ctx, sb_big_p01_x23, sb_big_p01_ydiag, net); + find_and_bind_downhill_pip(ctx, sb_big_p01_ydiag, sb_big_p01_y1, net); + find_and_bind_downhill_pip(ctx, sb_big_p01_y1, in_mux, net); } else { auto sb_sml_p03_d0 = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P03.D0"))); auto sb_sml_p03_y1_int = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P03.Y1_int"))); auto sb_sml_p03_ydiag_int = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P03.YDIAG_int"))); auto sb_sml_p03_ydiag = - ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P03.YDIAG"))); // AKA SB_SML.P02.X23 + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P03.YDIAG"))); + auto sb_sml_p02_x23 = + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P02.X23"))); auto sb_sml_p02_ydiag_int = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P02.YDIAG_int"))); auto sb_sml_p02_ydiag = - ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P02.YDIAG"))); // AKA SB_SML.P01.X23 + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P02.YDIAG"))); + auto sb_sml_p01_x23 = + ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P01.X23"))); auto sb_sml_p01_ydiag_int = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P01.YDIAG_int"))); auto sb_sml_p01_y1_int = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P01.Y1_int"))); + auto sb_sml_p01_y1 = ctx->getWireByName(IdStringList::concat(x0y1, ctx->idf("SB_SML.P01.Y1"))); find_and_bind_downhill_pip(ctx, cpe_out2, sb_sml_p03_d0, net); find_and_bind_downhill_pip(ctx, sb_sml_p03_d0, sb_sml_p03_y1_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p03_y1_int, sb_sml_p03_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p03_ydiag_int, sb_sml_p03_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_sml_p03_ydiag, sb_sml_p02_ydiag_int, net); + find_and_bind_downhill_pip(ctx, sb_sml_p03_ydiag, sb_sml_p02_x23, net); + find_and_bind_downhill_pip(ctx, sb_sml_p02_x23, sb_sml_p02_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p02_ydiag_int, sb_sml_p02_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_sml_p02_ydiag, sb_sml_p01_ydiag_int, net); + find_and_bind_downhill_pip(ctx, sb_sml_p02_ydiag, sb_sml_p01_x23, net); + find_and_bind_downhill_pip(ctx, sb_sml_p01_x23, sb_sml_p01_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p01_ydiag_int, sb_sml_p01_y1_int, net); - find_and_bind_downhill_pip(ctx, sb_sml_p01_y1_int, in_mux, net); + find_and_bind_downhill_pip(ctx, sb_sml_p01_y1_int, sb_sml_p01_y1, net); + find_and_bind_downhill_pip(ctx, sb_sml_p01_y1, in_mux, net); } route_mult_diag(ctx, net, Loc{loc.x + 1, loc.y, 0}, in_mux, 1); @@ -612,24 +631,33 @@ void route_mult_x2y1_upper_in8(Context *ctx, NetInfo *net, CellInfo *upper, Loc find_and_bind_downhill_pip(ctx, out_mux_d2, out_mux_y, net); // inverting if (is_fourgroup_a) { - auto sb_sml = ctx->getWireByName(IdStringList::concat(x1y2, ctx->idf("SB_SML.P09.Y1_int"))); + auto sb_sml_y1_int = ctx->getWireByName(IdStringList::concat(x1y2, ctx->idf("SB_SML.P09.Y1_int"))); + auto sb_sml_y1 = ctx->getWireByName(IdStringList::concat(x1y2, ctx->idf("SB_SML.P09.Y1"))); - find_and_bind_downhill_pip(ctx, out_mux_y, sb_sml, net); - find_and_bind_downhill_pip(ctx, sb_sml, in_mux_p09, net); // inverting + find_and_bind_downhill_pip(ctx, out_mux_y, sb_sml_y1_int, net); + find_and_bind_downhill_pip(ctx, sb_sml_y1_int, sb_sml_y1, net); + find_and_bind_downhill_pip(ctx, sb_sml_y1, in_mux_p09, net); // inverting } else { - // x1y2/OM.P09.Y is x1y2/SB_BIG.P09.D0 - // x2y2/IM.P09.D0 is x2y1/SB_BIG.P09.Y1 + auto sb_big_d0 = ctx->getWireByName(IdStringList::concat(x1y2, ctx->idf("SB_BIG.P09.D0"))); + auto sb_big_y1 = ctx->getWireByName(IdStringList::concat(x1y2, ctx->idf("SB_BIG.P09.Y1"))); - find_and_bind_downhill_pip(ctx, out_mux_y, in_mux_p09, net); // inverting + find_and_bind_downhill_pip(ctx, out_mux_y, sb_big_d0, net); + find_and_bind_downhill_pip(ctx, sb_big_d0, sb_big_y1, net); + find_and_bind_downhill_pip(ctx, sb_big_y1, in_mux_p09, net); } - auto in_mux_p12 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P12.D7"))); // aka IM.P09.Y - auto in_mux_p04 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P04.D7"))); // aka IM.P12.Y - auto in_mux_p08 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P08.D6"))); // aka IM.P04.Y + auto in_mux_p09_y = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P09.Y"))); + auto in_mux_p12 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P12.D7"))); + auto in_mux_p12_y = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P12.Y"))); + auto in_mux_p04 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P04.D7"))); + auto in_mux_p04_y = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P04.Y"))); + auto in_mux_p08 = ctx->getWireByName(IdStringList::concat(x2y2, ctx->idf("IM.P08.D6"))); - find_and_bind_downhill_pip(ctx, in_mux_p09, in_mux_p12, net); // inverting - find_and_bind_downhill_pip(ctx, in_mux_p12, in_mux_p04, net); // inverting - find_and_bind_downhill_pip(ctx, in_mux_p04, in_mux_p08, net); // inverting + find_and_bind_downhill_pip(ctx, in_mux_p09_y, in_mux_p12, net); + find_and_bind_downhill_pip(ctx, in_mux_p12, in_mux_p12_y, net); + find_and_bind_downhill_pip(ctx, in_mux_p12_y, in_mux_p04, net); + find_and_bind_downhill_pip(ctx, in_mux_p04, in_mux_p04_y, net); + find_and_bind_downhill_pip(ctx, in_mux_p04_y, in_mux_p08, net); route_mult_diag(ctx, net, Loc{loc.x + 1, loc.y + 1, 0}, in_mux_p08, 8); } @@ -744,46 +772,68 @@ void route_mult_x2y2_upper_in1(Context *ctx, NetInfo *net, CellInfo *upper, Loc auto sb_sml_p04_y1_int = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P04.Y1_int"))); auto sb_sml_p04_ydiag_int = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P04.YDIAG_int"))); auto sb_sml_p04_ydiag = - ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P04.YDIAG"))); // AKA SB_SML.P03.X23 + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P04.YDIAG"))); + auto sb_sml_p03_x23 = + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P03.X23"))); auto sb_sml_p03_ydiag_int = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P03.YDIAG_int"))); auto sb_sml_p03_ydiag = - ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P03.YDIAG"))); // AKA SB_SML.P02.X23 + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P03.YDIAG"))); + auto sb_sml_p02_x23 = + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P02.X23"))); auto sb_sml_p02_ydiag_int = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P02.YDIAG_int"))); auto sb_sml_p02_ydiag = - ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P02.YDIAG"))); // AKA SB_SML.P01.X23 + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P02.YDIAG"))); + auto sb_sml_p01_x23 = + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P01.X23"))); auto sb_sml_p01_ydiag_int = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P01.YDIAG_int"))); auto sb_sml_p01_y1_int = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P01.Y1_int"))); + auto sb_sml_p01_y1 = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_SML.P01.Y1"))); - find_and_bind_downhill_pip(ctx, cpe_out2_int, sb_sml_p04_d0, net); + find_and_bind_downhill_pip(ctx, cpe_out2, sb_sml_p04_d0, net); find_and_bind_downhill_pip(ctx, sb_sml_p04_d0, sb_sml_p04_y1_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p04_y1_int, sb_sml_p04_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p04_ydiag_int, sb_sml_p04_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_sml_p04_ydiag, sb_sml_p03_ydiag_int, net); + find_and_bind_downhill_pip(ctx, sb_sml_p04_ydiag, sb_sml_p03_x23, net); + log_info("%s -> %s\n", ctx->nameOfWire(sb_sml_p03_x23), ctx->nameOfWire(sb_sml_p03_ydiag)); + find_and_bind_downhill_pip(ctx, sb_sml_p03_x23, sb_sml_p03_ydiag, net); find_and_bind_downhill_pip(ctx, sb_sml_p03_ydiag_int, sb_sml_p03_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_sml_p03_ydiag, sb_sml_p02_ydiag_int, net); + find_and_bind_downhill_pip(ctx, sb_sml_p03_ydiag, sb_sml_p02_x23, net); + find_and_bind_downhill_pip(ctx, sb_sml_p02_x23, sb_sml_p02_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p02_ydiag_int, sb_sml_p02_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_sml_p02_ydiag, sb_sml_p01_ydiag_int, net); + find_and_bind_downhill_pip(ctx, sb_sml_p02_ydiag, sb_sml_p01_x23, net); + find_and_bind_downhill_pip(ctx, sb_sml_p01_x23, sb_sml_p01_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_p01_ydiag_int, sb_sml_p01_y1_int, net); - find_and_bind_downhill_pip(ctx, sb_sml_p01_y1_int, in_mux, net); + find_and_bind_downhill_pip(ctx, sb_sml_p01_y1_int, sb_sml_p01_y1, net); + find_and_bind_downhill_pip(ctx, sb_sml_p01_y1, in_mux, net); } else { auto sb_big_p04_d0 = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P04.D0"))); auto sb_big_p04_y1 = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P04.Y1"))); auto sb_big_p04_ydiag = - ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P04.YDIAG"))); // AKA SB_BIG.P07.X23 + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P04.YDIAG"))); + auto sb_big_p03_x23 = + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P03.X23"))); auto sb_big_p03_ydiag = - ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P03.YDIAG"))); // AKA SB_BIG.P05.X23 + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P03.YDIAG"))); + auto sb_big_p02_x23 = + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P02.X23"))); auto sb_big_p02_ydiag = - ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P02.YDIAG"))); // AKA SB_BIG.P05.X23 + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P02.YDIAG"))); + auto sb_big_p01_x23 = + ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P01.X23"))); auto sb_big_p01_ydiag = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P01.YDIAG"))); - // x2y1/IM.P05.D0 is x1y1/SB_BIG.P05.Y1 + auto sb_big_p01_y1 = ctx->getWireByName(IdStringList::concat(x1y1, ctx->idf("SB_BIG.P01.Y1"))); - find_and_bind_downhill_pip(ctx, cpe_out2_int, sb_big_p04_d0, net); + find_and_bind_downhill_pip(ctx, cpe_out2, sb_big_p04_d0, net); find_and_bind_downhill_pip(ctx, sb_big_p04_d0, sb_big_p04_y1, net); find_and_bind_downhill_pip(ctx, sb_big_p04_y1, sb_big_p04_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p04_ydiag, sb_big_p03_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p03_ydiag, sb_big_p02_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p02_ydiag, sb_big_p01_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_p01_ydiag, in_mux, net); + find_and_bind_downhill_pip(ctx, sb_big_p04_ydiag, sb_big_p03_x23, net); + find_and_bind_downhill_pip(ctx, sb_big_p03_x23, sb_big_p03_ydiag, net); + find_and_bind_downhill_pip(ctx, sb_big_p03_ydiag, sb_big_p02_x23, net); + find_and_bind_downhill_pip(ctx, sb_big_p02_x23, sb_big_p02_ydiag, net); + find_and_bind_downhill_pip(ctx, sb_big_p02_ydiag, sb_big_p01_x23, net); + find_and_bind_downhill_pip(ctx, sb_big_p01_x23, sb_big_p01_ydiag, net); + find_and_bind_downhill_pip(ctx, sb_big_p01_ydiag, sb_big_p01_y1, net); + find_and_bind_downhill_pip(ctx, sb_big_p01_y1, in_mux, net); } route_mult_diag(ctx, net, Loc{loc.x + 1, loc.y, 0}, in_mux, 1); @@ -824,25 +874,30 @@ void route_mult_x2y2_upper_in8(Context *ctx, NetInfo *net, CellInfo *upper, Loc auto sb_sml_y1_int = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_SML.P08.Y1_int"))); auto sb_sml_ydiag_int = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_SML.P08.YDIAG_int"))); auto sb_sml_y2_int = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_SML.P08.Y2_int"))); + auto sb_sml_y2 = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_SML.P08.Y2"))); find_and_bind_downhill_pip(ctx, sb_big_d0, sb_big_y1, net); find_and_bind_downhill_pip(ctx, sb_big_y1, sb_sml_y1_int, net); find_and_bind_downhill_pip(ctx, sb_sml_y1_int, sb_sml_ydiag_int, net); find_and_bind_downhill_pip(ctx, sb_sml_ydiag_int, sb_sml_y2_int, net); - find_and_bind_downhill_pip(ctx, sb_sml_y2_int, in_mux, net); + find_and_bind_downhill_pip(ctx, sb_sml_y2_int, sb_sml_y2, net); + find_and_bind_downhill_pip(ctx, sb_sml_y2, in_mux, net); } else { auto sb_sml_d0 = ctx->getWireByName(IdStringList::concat(x0y0, ctx->idf("SB_SML.P08.D0"))); auto sb_sml_y1_int = ctx->getWireByName(IdStringList::concat(x0y0, ctx->idf("SB_SML.P08.Y1_int"))); auto sb_sml_y1 = ctx->getWireByName(IdStringList::concat(x0y0, ctx->idf("SB_SML.P08.Y1"))); + auto sb_big_d2_1 = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_BIG.P08.D2_1"))); auto sb_big_y1 = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_BIG.P08.Y1"))); auto sb_big_ydiag = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_BIG.P08.YDIAG"))); - // x2y2/IM.P08.D0 is x2y0/SB_BIG.P08.Y2 + auto sb_big_y2 = ctx->getWireByName(IdStringList::concat(x2y0, ctx->idf("SB_BIG.P08.Y2"))); find_and_bind_downhill_pip(ctx, sb_sml_d0, sb_sml_y1_int, net); find_and_bind_downhill_pip(ctx, sb_sml_y1_int, sb_sml_y1, net); - find_and_bind_downhill_pip(ctx, sb_sml_y1, sb_big_y1, net); + find_and_bind_downhill_pip(ctx, sb_sml_y1, sb_big_d2_1, net); + find_and_bind_downhill_pip(ctx, sb_big_d2_1, sb_big_y1, net); find_and_bind_downhill_pip(ctx, sb_big_y1, sb_big_ydiag, net); - find_and_bind_downhill_pip(ctx, sb_big_ydiag, in_mux, net); + find_and_bind_downhill_pip(ctx, sb_big_ydiag, sb_big_y2, net); + find_and_bind_downhill_pip(ctx, sb_big_y2, in_mux, net); } route_mult_diag(ctx, net, Loc{loc.x + 1, loc.y + 1, 0}, in_mux, 8);