ssa works in mesh-3d

Author: amonemi

mpsoc/rtl/src_noc/fattree_route.sv

@@ -710,7 +710,7 @@ module  fattree_addr_decoder #(
 endmodule
 
 /**************
- * regular_topo_ssa_check_destport_conflict
+ * fattree_ssa_check_destport_conflict
  * check if the incomming flit goes to SS port
  * ************/
 module fattree_ssa_check_destport #(

mpsoc/rtl/src_noc/mesh_torus.sv

@@ -212,7 +212,7 @@ module regular_topo_dspt_clear_gen #(
 endmodule
 
 
-module   regular_topo_mask_non_assignable_destport #(
+module  regular_topo_mask_non_assignable_destport #(
     parameter TOPOLOGY="MESH",
     parameter ROUTE_NAME="DOR",
     parameter SW_LOC=0,
@@ -741,36 +741,26 @@ module ring_torus_distance_gen (
 endmodule
 
 
-module regular_topo_ssa_check_destport #(
-    parameter ROUTE_TYPE="DETERMINISTIC",
+module two_dim_ssa_check_destport #(
     parameter SW_LOC = 0,
-    parameter P=5,
-    parameter DEBUG_EN = 0,
-    parameter DSTPw = P-1,
     parameter SS_PORT=0
 )(
     destport_encoded, //exsited packet dest port
     destport_in_encoded, // incomming packet dest port
     ss_port_hdr_flit,
-    ss_port_nonhdr_flit     
+    ss_port_nonhdr_flit
     `ifdef SIMULATION 
     ,clk,
     ivc_num_getting_sw_grant,
     hdr_flg
     `endif
 );
-
+    import pronoc_pkg::*;
     input [DSTPw-1 : 0] destport_encoded, destport_in_encoded; 
     output ss_port_hdr_flit, ss_port_nonhdr_flit;
     `ifdef SIMULATION 
     input clk, ivc_num_getting_sw_grant,hdr_flg;
     `endif
-    //MESH, TORUS Topology p=5           
-    localparam   
-        LOCAL = 0,  
-        EAST = 1,
-        WEST = 3;
-
 /*************************
 *        destination port is coded        
 *        destination-port_in
@@ -815,22 +805,19 @@ endgenerate
 endmodule
 
 
-module line_ring_ssa_check_destport #(
-    parameter ROUTE_TYPE="DETERMINISTIC",
+module one_dim_ssa_check_destport #(
     parameter SW_LOC = 0,
-    parameter P=3,
-    parameter DEBUG_EN = 0,
-    parameter DSTPw = P-1,
     parameter SS_PORT=0
 )(
     destport_encoded, //exsited packet dest port
     destport_in_encoded, // incomming packet dest port
     ss_port_hdr_flit,
     ss_port_nonhdr_flit 
 );
+    import pronoc_pkg::*;
     input [DSTPw-1 : 0] destport_encoded, destport_in_encoded; 
     output ss_port_hdr_flit, ss_port_nonhdr_flit;
-    wire [P-1 : 0] dest_port_num,assigned_dest_port_num;
+    wire [MAX_P-1 : 0] dest_port_num,assigned_dest_port_num;
 
     line_ring_decode_dstport cnv1(
         .dstport_one_hot(dest_port_num),

mpsoc/rtl/src_noc/ss_allocator.sv

@@ -282,7 +282,6 @@ module ssa_per_vc #(
 
     ssa_check_destport #(
         .SW_LOC(SW_LOC),
-        .P(P),
         .SS_PORT(SS_PORT)
     ) check_destport (
         .destport_encoded(destport_encoded),
@@ -335,7 +334,6 @@ endmodule
 
 module ssa_check_destport #(
     parameter SW_LOC = 0,
-    parameter P=5,
     parameter SS_PORT=0
 ) (
     destport_encoded, //non header flit dest port
@@ -370,13 +368,9 @@ module ssa_check_destport #(
             .ss_port_hdr_flit(ss_port_hdr_flit),
             .ss_port_nonhdr_flit(ss_port_nonhdr_flit)
         );
-    end else if (IS_MESH | IS_TORUS ) begin : mesh
-        regular_topo_ssa_check_destport #(
-            .ROUTE_TYPE(ROUTE_TYPE),
+    end else if (IS_MESH | IS_TORUS ) begin : D2_
+        two_dim_ssa_check_destport #(
             .SW_LOC(SW_LOC),
-            .P(P),
-            .DEBUG_EN(DEBUG_EN),
-            .DSTPw(DSTPw),
             .SS_PORT(SS_PORT)
         ) destport_check (
             .destport_encoded(destport_encoded),
@@ -392,21 +386,13 @@ module ssa_check_destport #(
     end else if (IS_FMESH) begin :fmesh
         localparam 
             ELw = log2(T3),
-            Pw  = log2(P);
+            Pw  = log2(MAX_P);
 
         wire [Pw-1 : 0] endp_p_in;
         wire [MAX_P-1 : 0] destport_one_hot_in;
-        
-        fmesh_endp_addr_decode  endp_addr_decode (
-            .e_addr(dest_e_addr_in),
-            .ex(),
-            .ey(),
-            .ep(endp_p_in),
-            .valid()
-        );
-        
+        assign endp_p_in = dest_e_addr_in[DAw-1 : DAw-ELw];
         destp_generator #(
-            .P(P),
+            .P(MAX_P),
             .SW_LOC(SW_LOC)
         ) decoder (
             .destport_one_hot (destport_one_hot_in),
@@ -419,20 +405,27 @@ module ssa_check_destport #(
         );
         assign ss_port_nonhdr_flit = destport_one_hot [SS_PORT];
         assign ss_port_hdr_flit    = destport_one_hot_in [SS_PORT]; 
-    end else begin : line
-        line_ring_ssa_check_destport #(
-            .ROUTE_TYPE(ROUTE_TYPE),
+    end else if(IS_LINE | IS_RING) begin : D1_
+        one_dim_ssa_check_destport #(
             .SW_LOC(SW_LOC),
-            .P(P),
-            .DEBUG_EN(DEBUG_EN),
-            .DSTPw(DSTPw),
             .SS_PORT(SS_PORT)
         ) destport_check (
             .destport_encoded(destport_encoded),
             .destport_in_encoded(destport_in_encoded),
             .ss_port_hdr_flit(ss_port_hdr_flit),
             .ss_port_nonhdr_flit(ss_port_nonhdr_flit)
         );
+    end else begin : other
+        logic [MAX_P-1 : 0] destport_one_hot_in;
+        always @(*) begin 
+            destport_one_hot_in = '0;
+            //for deterministic routing destination port is decimal encoded
+            if(IS_DETERMINISTIC) destport_one_hot_in[destport_in_encoded] = 1'b1;
+            //for non-deterministic routing destination port is one-hot encoded
+            else destport_one_hot_in [DSTPw-1 : 0] = destport_in_encoded;
+        end
+        assign ss_port_nonhdr_flit = destport_one_hot [SS_PORT];
+        assign ss_port_hdr_flit    = destport_one_hot_in [SS_PORT]; 
     end
     endgenerate
 endmodule