Skip to content

Yr/adaptive routing #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Aquaticfuller wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Yr/adaptive routing #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06a7490
hw(chimney): Cut AW out paths
fischeti Dec 10, 2024
0d8068f
hw(chimney): Fix location of AW cuts
fischeti Dec 10, 2024
66d471c
Merge Terapool-NoC adaptive routing supports (#112)
Aquaticfuller Mar 19, 2025
3b2f7bf
Update yx-routing and oe-routing to fit new router_select design. (#115)
liyinrong Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hw/floo_axi_chimney.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ module floo_axi_chimney #(
assign axi_ar_queue_valid_out = axi_in_req_i.ar_valid;
assign axi_rsp_out.ar_ready = axi_ar_queue_ready_in;
end

end else begin : gen_err_slv_port
axi_err_slv #(
.AxiIdWidth ( AxiCfg.InIdWidth ),
Expand Down
1 change: 0 additions & 1 deletion hw/floo_nw_chimney.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ module floo_nw_chimney #(
assign axi_wide_ar_queue_valid_out = axi_wide_in_req_i.ar_valid;
assign axi_wide_rsp_out.ar_ready = axi_wide_ar_queue_ready_in;
end

end else begin : gen_wide_err_slv_port
axi_err_slv #(
.AxiIdWidth ( AxiCfgW.InIdWidth ),
Expand Down
7 changes: 5 additions & 2 deletions hw/floo_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package floo_pkg;

/// Currently Supported Routing Algorithms
typedef enum logic[1:0] {
typedef enum logic[2:0] {
/// `IdTable` routing uses a table of routing rules to determine to
/// which output port a packet should be routed, based on the
/// destination ID encoded in the header of the flit. Every router
Expand All @@ -35,7 +35,10 @@ package floo_pkg;
/// XY coordinates, which can be done with addressoffsets `XYAddrOffsetX`
/// and `XYAddrOffsetY`, or by indexing the system address map `Sam`. This
/// is controlled with the `UseIdTable` parameter.
XYRouting
XYRouting,
YXRouting,
OddEvenRouting,
O1Routing
} route_algo_e;

/// The directions in a 2D mesh network, mainly useful for indexing
Expand Down
79 changes: 79 additions & 0 deletions hw/floo_route_select.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,85 @@ if (RouteAlgo == IdTable) begin : gen_id_table

assign channel_o = channel_i;

end else if (RouteAlgo == YXRouting) begin : gen_yx_routing

id_t id_in;
assign id_in = id_t'(channel_i.hdr.dst_id);

always_comb begin : proc_route_sel
route_sel_id = East;
if (id_in.x == xy_id_i.x && id_in.y == xy_id_i.y) begin
route_sel_id = Eject + channel_i.hdr.dst_id.port_id;
end else if (id_in.y == xy_id_i.y) begin
if (id_in.x < xy_id_i.x) begin
route_sel_id = West;
end else begin
route_sel_id = East;
end
end else begin
if (id_in.y < xy_id_i.y) begin
route_sel_id = South;
end else begin
route_sel_id = North;
end
end
route_sel = '0;
route_sel[route_sel_id] = 1'b1;
end

assign channel_o = channel_i;

end else if (RouteAlgo == OddEvenRouting) begin : gen_oddeven_routing
id_t id_src, id_dst;
assign id_src = id_t'(channel_i.hdr.src_id);
assign id_dst = id_t'(channel_i.hdr.dst_id);

always_comb begin : proc_route_sel
route_sel_id = East;
if (id_dst.x == xy_id_i.x && id_dst.y == xy_id_i.y) begin
route_sel_id = Eject + channel_i.hdr.dst_id.port_id;
end else if (xy_id_i.x == id_dst.x) begin //currently in the same column as destination
if (xy_id_i.y < id_dst.y) begin
route_sel_id = North;
end else begin
route_sel_id = South;
end
end else if (xy_id_i.x < id_dst.x) begin //eastbound traffic
if (xy_id_i.y == id_dst.y) begin
route_sel_id = East;
end else if (((xy_id_i.x % 2) == 1) || (xy_id_i.x == id_src.x)) begin
if ((((id_dst.x) % 2 == 1) || ((id_dst.x - xy_id_i.x) != 1)) && (^channel_i)) begin
route_sel_id = East;
end else begin
if (xy_id_i.y < id_dst.y) begin
route_sel_id = North;
end else begin
route_sel_id = South;
end
end
end else begin
assert ((id_dst.x % 2 == 1) || (id_dst.x - xy_id_i.x != 1));
route_sel_id = East;
end
end else begin //westbound traffic
if (xy_id_i.y == id_dst.y) begin
route_sel_id = West;
end else if (((xy_id_i.x % 2) == 0) && (^channel_i)) begin
if (xy_id_i.y < id_dst.y) begin
route_sel_id = North;
end else begin
route_sel_id = South;
end
end else begin
route_sel_id = West;
end
end
route_sel = '0;
route_sel[route_sel_id] = 1'b1;
end

assign channel_o = channel_i;

end else begin : gen_err
// Unknown or unimplemented routing otherwise
initial begin
Expand Down
96 changes: 74 additions & 22 deletions hw/floo_router.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,80 @@ module floo_router
.ready_i ( in_ready[in_route][v_chan] )
);

floo_route_select #(
.NumRoutes ( NumOutput ),
.flit_t ( flit_t ),
.RouteAlgo ( RouteAlgo ),
.IdWidth ( IdWidth ),
.id_t ( id_t ),
.NumAddrRules ( NumAddrRules ),
.addr_rule_t ( addr_rule_t )
) i_route_select (
.clk_i,
.rst_ni,
.test_enable_i,

.xy_id_i ( xy_id_i ),
.id_route_map_i ( id_route_map_i ),
.channel_i ( in_data [in_route][v_chan] ),
.valid_i ( in_valid [in_route][v_chan] ),
.ready_i ( in_ready [in_route][v_chan] ),
.channel_o ( in_routed_data[in_route][v_chan] ),
.route_sel_o ( route_mask [in_route][v_chan] ),
.route_sel_id_o ( )
);
if (RouteAlgo == O1Routing) begin: gen_o1routing

if (v_chan % 2 == 0) begin: gen_o1routing_xy
floo_route_select #(
.NumRoutes ( NumOutput ),
.flit_t ( flit_t ),
.RouteAlgo ( XYRouting ),
.IdWidth ( IdWidth ),
.id_t ( id_t ),
.NumAddrRules ( NumAddrRules ),
.addr_rule_t ( addr_rule_t )
) i_route_select (
.clk_i,
.rst_ni,
.test_enable_i,

.xy_id_i ( xy_id_i ),
.id_route_map_i ( id_route_map_i ),
.channel_i ( in_data [in_route][v_chan] ),
.valid_i ( in_valid [in_route][v_chan] ),
.ready_i ( in_ready [in_route][v_chan] ),
.channel_o ( in_routed_data[in_route][v_chan] ),
.route_sel_o ( route_mask [in_route][v_chan] )
);
end else begin: gen_o1routing_yx
floo_route_select #(
.NumRoutes ( NumOutput ),
.flit_t ( flit_t ),
.RouteAlgo ( YXRouting ),
.IdWidth ( IdWidth ),
.id_t ( id_t ),
.NumAddrRules ( NumAddrRules ),
.addr_rule_t ( addr_rule_t )
) i_route_select (
.clk_i,
.rst_ni,
.test_enable_i,

.xy_id_i ( xy_id_i ),
.id_route_map_i ( id_route_map_i ),
.channel_i ( in_data [in_route][v_chan] ),
.valid_i ( in_valid [in_route][v_chan] ),
.ready_i ( in_ready [in_route][v_chan] ),
.channel_o ( in_routed_data[in_route][v_chan] ),
.route_sel_o ( route_mask [in_route][v_chan] )
);
end

end else begin: gen_xyrouting

floo_route_select #(
.NumRoutes ( NumOutput ),
.flit_t ( flit_t ),
.RouteAlgo ( RouteAlgo ),
.IdWidth ( IdWidth ),
.id_t ( id_t ),
.NumAddrRules ( NumAddrRules ),
.addr_rule_t ( addr_rule_t )
) i_route_select (
.clk_i,
.rst_ni,
.test_enable_i,

.xy_id_i ( xy_id_i ),
.id_route_map_i ( id_route_map_i ),
.channel_i ( in_data [in_route][v_chan] ),
.valid_i ( in_valid [in_route][v_chan] ),
.ready_i ( in_ready [in_route][v_chan] ),
.channel_o ( in_routed_data[in_route][v_chan] ),
.route_sel_o ( route_mask [in_route][v_chan] ),
.route_sel_id_o ( )
);

end

end
end
Expand Down