Merge pull request #43 from taichi-ishitani/introducing_tbcm

introduced tbcm submodule (close #42)
taichi-ishitani · Oct 25, 2018 · 9ef11a4 · 9ef11a4
2 parents 06aa223 + 72b8992
commit 9ef11a4
Show file tree

Hide file tree

Showing 33 changed files with 132 additions and 426 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "env/axi_vip"]
 	path = env/axi_vip
 	url = [email protected]:taichi-ishitani/tvip-axi.git
+[submodule "rtl/bcm"]
+	path = rtl/bcm
+	url = [email protected]:taichi-ishitani/tbcm.git
diff --git a/env/router/tnoc_router_internal_if_adapter.sv b/env/router/tnoc_router_internal_if_adapter.sv
@@ -21,7 +21,7 @@ module tnoc_rounter_internal_if_adapter
 
     assign  request = flit_in_if.valid & flit_in_if.vc_available;
     assign  free    = flit_in_if.ready;
-    tnoc_round_robin_arbiter #(CHANNELS, 1) u_arbiter (
+    tbcm_round_robin_arbiter #(CHANNELS, 1) u_arbiter (
       .clk        (clk      ),
       .rst_n      (rst_n    ),
       .i_request  (request  ),
@@ -50,7 +50,7 @@ module tnoc_rounter_internal_if_adapter
 
     assign  request = flit_internal_in_if.valid & flit_internal_in_if.vc_available;
     assign  free    = flit_internal_in_if.ready;
-    tnoc_round_robin_arbiter #(CHANNELS, 1) u_arbiter (
+    tbcm_round_robin_arbiter #(CHANNELS, 1) u_arbiter (
       .clk        (clk      ),
       .rst_n      (rst_n    ),
       .i_request  (request  ),

diff --git a/rtl/bcm b/rtl/bcm
diff --git a/rtl/common/compile.f b/rtl/common/compile.f
@@ -1,9 +1,5 @@
 +incdir+${TNOC_HOME}/rtl/common
 ${TNOC_HOME}/rtl/common/tnoc_enums_pkg.sv
-${TNOC_HOME}/rtl/common/tnoc_fifo.sv
-${TNOC_HOME}/rtl/common/tnoc_mux.sv
-${TNOC_HOME}/rtl/common/tnoc_demux.sv
-${TNOC_HOME}/rtl/common/tnoc_round_robin_arbiter.sv
 ${TNOC_HOME}/rtl/common/tnoc_flit_if.sv
 ${TNOC_HOME}/rtl/common/tnoc_flit_if_mux.sv
 ${TNOC_HOME}/rtl/common/tnoc_flit_if_demux.sv

diff --git a/rtl/common/tnoc_demux.sv b/rtl/common/tnoc_demux.sv
diff --git a/rtl/common/tnoc_fifo.sv b/rtl/common/tnoc_fifo.sv
diff --git a/rtl/common/tnoc_flit_if_arbiter.sv b/rtl/common/tnoc_flit_if_arbiter.sv
@@ -65,7 +65,7 @@ module tnoc_flit_if_arbiter
       ) ? '1 : '0;
     end
 
-    tnoc_round_robin_arbiter #(
+    tbcm_round_robin_arbiter #(
       .REQUESTS     (ENTRIES  ),
       .KEEP_RESULT  (1        )
     ) u_arbiter (

diff --git a/rtl/common/tnoc_flit_if_demux.sv b/rtl/common/tnoc_flit_if_demux.sv
@@ -23,30 +23,33 @@ module tnoc_flit_if_demux
     assign  vc_available[i]       = flit_out_if[i].vc_available;
   end
 
-  tnoc_demux #(
+  tbcm_demux #(
     .WIDTH    (CHANNELS ),
-    .ENTRIES  (ENTRIES  )
+    .ENTRIES  (ENTRIES  ),
+    .ONE_HOT  (1        )
   ) u_valid_demux (
     .i_select (i_select         ),
-    .i_value  (flit_in_if.valid ),
-    .o_value  (valid            )
+    .i_data   (flit_in_if.valid ),
+    .o_data   (valid            )
   );
 
-  tnoc_mux #(
+  tbcm_mux #(
     .WIDTH    (CHANNELS ),
-    .ENTRIES  (ENTRIES  )
+    .ENTRIES  (ENTRIES  ),
+    .ONE_HOT  (1        )
   ) u_raedy_mux (
     .i_select (i_select         ),
-    .i_value  (ready            ),
-    .o_value  (flit_in_if.ready )
+    .i_data   (ready            ),
+    .o_data   (flit_in_if.ready )
   );
 
-  tnoc_mux #(
+  tbcm_mux #(
     .WIDTH    (CHANNELS ),
-    .ENTRIES  (ENTRIES  )
+    .ENTRIES  (ENTRIES  ),
+    .ONE_HOT  (1        )
   ) u_vc_available_mux (
     .i_select (i_select                 ),
-    .i_value  (vc_available             ),
-    .o_value  (flit_in_if.vc_available  )
+    .i_data   (vc_available             ),
+    .o_data   (flit_in_if.vc_available  )
   );
 endmodule
diff --git a/rtl/common/tnoc_flit_if_fifo.sv b/rtl/common/tnoc_flit_if_fifo.sv
@@ -40,11 +40,12 @@ module tnoc_flit_if_fifo
       assign  flit_in_if.vc_available[i]  = ~almost_full[i];
       assign  flit_out_if.valid[i]        = ~empty[i];
 
-      tnoc_fifo #(
-        .WIDTH        (TNOC_FLIT_WIDTH  ),
-        .DEPTH        (DEPTH            ),
-        .THRESHOLD    (THRESHOLD        ),
-        .DATA_FF_OUT  (DATA_FF_OUT      )
+      tbcm_fifo #(
+        .DATA_TYPE    (tnoc_flit    ),
+        .DEPTH        (DEPTH        ),
+        .THRESHOLD    (THRESHOLD    ),
+        .DATA_FF_OUT  (DATA_FF_OUT  ),
+        .FLAG_FF_OUT  (1            )
       ) u_fifo (
         .clk            (clk                  ),
         .rst_n          (rst_n                ),
@@ -64,11 +65,12 @@ module tnoc_flit_if_fifo
     assign  flit_in_if.vc_available = ~almost_full;
     assign  flit_out_if.valid       = ~empty;
 
-    tnoc_fifo #(
-      .WIDTH        (TNOC_FLIT_WIDTH  ),
-      .DEPTH        (DEPTH            ),
-      .THRESHOLD    (THRESHOLD        ),
-      .DATA_FF_OUT  (DATA_FF_OUT      )
+    tbcm_fifo #(
+      .DATA_TYPE    (tnoc_flit    ),
+      .DEPTH        (DEPTH        ),
+      .THRESHOLD    (THRESHOLD    ),
+      .DATA_FF_OUT  (DATA_FF_OUT  ),
+      .FLAG_FF_OUT  (1            )
     ) u_fifo (
       .clk            (clk                  ),
       .rst_n          (rst_n                ),
@@ -98,11 +100,12 @@ module tnoc_flit_if_fifo
     assign  push_data.flit  = flit_in_if.flit[0];
     assign  pop             = |(flit_out_if.valid & flit_out_if.ready);
 
-    tnoc_fifo #(
-      .WIDTH        ($bits(s_fifo_data) ),
-      .DEPTH        (DEPTH              ),
-      .THRESHOLD    (THRESHOLD          ),
-      .DATA_FF_OUT  (DATA_FF_OUT        )
+    tbcm_fifo #(
+      .DATA_TYPE    (s_fifo_data  ),
+      .DEPTH        (DEPTH        ),
+      .THRESHOLD    (THRESHOLD    ),
+      .DATA_FF_OUT  (DATA_FF_OUT  ),
+      .FLAG_FF_OUT  (1            )
     ) u_fifo (
       .clk            (clk          ),
       .rst_n          (rst_n        ),