wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong multicore parametrization in wrapper

Browse Source
This commit is contained in:
Hansung Kim
2024-03-17 18:23:09 -07:00
parent 40e2888733
commit 7f8abe99ff
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
hw/rtl/VX_core_wrapper.sv
View File

@@ -4,7 +4,6 @@
module Vortex import VX_gpu_pkg::*; #( module Vortex import VX_gpu_pkg::*; #(
parameter CORE_ID = 0, parameter CORE_ID = 0,
parameter CORES_PER_CLUSTER = 1,
parameter BOOTROM_HANG100 = 32'h10100, parameter BOOTROM_HANG100 = 32'h10100,
parameter NUM_THREADS = 0 parameter NUM_THREADS = 0
) ( ) (
@@ -76,13 +75,13 @@ module Vortex import VX_gpu_pkg::*; #(
// gbar ------------------------------------------------ // gbar ------------------------------------------------
output [CORES_PER_CLUSTER - 1:0] gbar_req_valid, output gbar_req_valid,
output [(CORES_PER_CLUSTER * `NB_WIDTH) - 1:0] gbar_req_id, output [`NB_WIDTH - 1:0] gbar_req_id,
output [(CORES_PER_CLUSTER * `NC_WIDTH) - 1:0] gbar_req_size_m1, output [`NC_WIDTH - 1:0] gbar_req_size_m1,
output [(CORES_PER_CLUSTER * `NC_WIDTH) - 1:0] gbar_req_core_id, output [`NC_WIDTH - 1:0] gbar_req_core_id,
input [CORES_PER_CLUSTER - 1:0] gbar_req_ready, input gbar_req_ready,
input [CORES_PER_CLUSTER - 1:0] gbar_rsp_valid, input gbar_rsp_valid,
input [(CORES_PER_CLUSTER * `NB_WIDTH) - 1:0] gbar_rsp_id, input [`NB_WIDTH - 1:0] gbar_rsp_id,
// fpu (unused) ---------------------------------------- // fpu (unused) ----------------------------------------
// //
@@ -415,17 +414,14 @@ module Vortex import VX_gpu_pkg::*; #(
// gbar ------------------------------------------------------------------- // gbar -------------------------------------------------------------------
`ifdef GBAR_ENABLE `ifdef GBAR_ENABLE
VX_gbar_bus_if per_core_gbar_bus_if[CORES_PER_CLUSTER](); VX_gbar_bus_if gbar_bus_if();
assign gbar_req_valid = gbar_bus_if.req_valid;
for (genvar i = 0; i < CORES_PER_CLUSTER; i++) begin assign gbar_req_id = gbar_bus_if.req_id;
assign gbar_req_valid[i] = per_core_gbar_bus_if[i].req_valid; assign gbar_req_size_m1 = gbar_bus_if.req_size_m1;
assign gbar_req_id[i * `NB_WIDTH +: `NB_WIDTH] = per_core_gbar_bus_if[i].req_id; assign gbar_req_core_id = gbar_bus_if.req_core_id;
assign gbar_req_size_m1[i * `NC_WIDTH +: `NC_WIDTH] = per_core_gbar_bus_if[i].req_size_m1; assign gbar_bus_if.req_ready = gbar_req_ready;
assign gbar_req_core_id[i * `NC_WIDTH +: `NC_WIDTH] = per_core_gbar_bus_if[i].req_core_id; assign gbar_bus_if.rsp_valid = gbar_rsp_valid;
assign per_core_gbar_bus_if[i].req_ready = gbar_req_ready[i]; assign gbar_bus_if.rsp_id = gbar_rsp_id;
assign per_core_gbar_bus_if[i].rsp_valid = gbar_rsp_valid[i];
assign per_core_gbar_bus_if[i].rsp_id = gbar_rsp_id[i * `NB_WIDTH +: `NB_WIDTH];
end
`endif `endif
// fpu -------------------------------------------------------------------- // fpu --------------------------------------------------------------------
@@ -556,7 +552,7 @@ module Vortex import VX_gpu_pkg::*; #(
.icache_bus_if (icache_bus_if), .icache_bus_if (icache_bus_if),
`ifdef GBAR_ENABLE `ifdef GBAR_ENABLE
.gbar_bus_if (per_core_gbar_bus_if[CORE_ID]), .gbar_bus_if (gbar_bus_if),
`endif `endif
.sim_ebreak (sim_ebreak), .sim_ebreak (sim_ebreak),