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

minor update

Browse Source
This commit is contained in:
Blaise Tine
2021-04-26 20:34:28 -07:00
parent 0910f95616
commit 64848788a1
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
driver/opae/vlsim/vortex_afu_shim.sv
View File

@@ -2,13 +2,16 @@
`IGNORE_WARNINGS_BEGIN `IGNORE_WARNINGS_BEGIN
`include "vortex_afu.vh" `include "vortex_afu.vh"
`IGNORE_WARNINGS_END `IGNORE_WARNINGS_END
`include "VX_define.vh"
/* verilator lint_off IMPORTSTAR */ /* verilator lint_off IMPORTSTAR */
import ccip_if_pkg::*; import ccip_if_pkg::*;
import local_mem_cfg_pkg::*; import local_mem_cfg_pkg::*;
/* verilator lint_on IMPORTSTAR */ /* verilator lint_on IMPORTSTAR */
`define MEM_BLOCK_SIZE LOCAL_MEM_DATA_N_BYTES
`include "VX_define.vh"
module vortex_afu_shim ( module vortex_afu_shim (
// global signals // global signals
input clk, input clk,

6
hw/rtl/VX_config.vh
View File

@@ -34,11 +34,7 @@
`endif `endif
`ifndef MEM_BLOCK_SIZE `ifndef MEM_BLOCK_SIZE
`ifdef LOCAL_MEM_DATA_N_BYTES `define MEM_BLOCK_SIZE 64
`define MEM_BLOCK_SIZE `LOCAL_MEM_DATA_N_BYTES
`else
`define MEM_BLOCK_SIZE 64
`endif
`endif `endif
`ifndef L1_BLOCK_SIZE `ifndef L1_BLOCK_SIZE

35
hw/rtl/afu/vortex_afu.sv
View File

@@ -6,13 +6,16 @@
`else `else
`include "afu_json_info.vh" `include "afu_json_info.vh"
`endif `endif
`include "VX_define.vh"
/* verilator lint_off IMPORTSTAR */ /* verilator lint_off IMPORTSTAR */
import ccip_if_pkg::*; import ccip_if_pkg::*;
import local_mem_cfg_pkg::*; import local_mem_cfg_pkg::*;
/* verilator lint_on IMPORTSTAR */ /* verilator lint_on IMPORTSTAR */
`define MEM_BLOCK_SIZE LOCAL_MEM_DATA_N_BYTES
`include "VX_define.vh"
module vortex_afu #( module vortex_afu #(
parameter NUM_LOCAL_MEM_BANKS = 2 parameter NUM_LOCAL_MEM_BANKS = 2
) ( ) (
@@ -40,16 +43,16 @@ module vortex_afu #(
localparam RESET_DELAY = 3; localparam RESET_DELAY = 3;
localparam MEM_LINE_WIDTH = $bits(t_local_mem_data); localparam LMEM_LINE_WIDTH = $bits(t_local_mem_data);
localparam MEM_ADDR_WIDTH = $bits(t_local_mem_addr); localparam LMEM_ADDR_WIDTH = $bits(t_local_mem_addr);
localparam MEM_BURST_CTRW = $bits(t_local_mem_burst_cnt); localparam LMEM_BURST_CTRW = $bits(t_local_mem_burst_cnt);
localparam MEM_LINE_LW = $clog2(MEM_LINE_WIDTH); localparam LMEM_LINE_LW = $clog2(LMEM_LINE_WIDTH);
localparam CCI_LINE_WIDTH = $bits(t_ccip_clData); localparam CCI_LINE_WIDTH = $bits(t_ccip_clData);
localparam CCI_ADDR_WIDTH = 32 - $clog2(CCI_LINE_WIDTH / 8); localparam CCI_ADDR_WIDTH = 32 - $clog2(CCI_LINE_WIDTH / 8);
localparam VX_MEM_LINE_LW = $clog2(`VX_MEM_LINE_WIDTH); localparam VX_MEM_LINE_LW = $clog2(`VX_MEM_LINE_WIDTH);
localparam VX_MEM_LINE_IDX = (MEM_LINE_LW - VX_MEM_LINE_LW); localparam VX_MEM_LINE_IDX = (LMEM_LINE_LW - VX_MEM_LINE_LW);
localparam AVS_RD_QUEUE_SIZE = 16; localparam AVS_RD_QUEUE_SIZE = 16;
localparam AVS_REQ_TAGW = `VX_MEM_TAG_WIDTH + VX_MEM_LINE_IDX; localparam AVS_REQ_TAGW = `VX_MEM_TAG_WIDTH + VX_MEM_LINE_IDX;
@@ -502,8 +505,8 @@ wire cci_mem_rsp_ready;
VX_cci_to_mem #( VX_cci_to_mem #(
.CCI_DATAW (CCI_LINE_WIDTH), .CCI_DATAW (CCI_LINE_WIDTH),
.CCI_ADDRW (CCI_ADDR_WIDTH), .CCI_ADDRW (CCI_ADDR_WIDTH),
.AVS_DATAW (MEM_LINE_WIDTH), .AVS_DATAW (LMEM_LINE_WIDTH),
.AVS_ADDRW (MEM_ADDR_WIDTH), .AVS_ADDRW (LMEM_ADDR_WIDTH),
.TAG_WIDTH (AVS_REQ_TAGW) .TAG_WIDTH (AVS_REQ_TAGW)
) cci_to_mem( ) cci_to_mem(
.clk (clk), .clk (clk),
@@ -541,13 +544,13 @@ VX_cci_to_mem #(
assign vx_mem_req_valid_qual = vx_mem_req_valid && vx_mem_en; assign vx_mem_req_valid_qual = vx_mem_req_valid && vx_mem_en;
assign vx_mem_req_addr_qual = vx_mem_req_addr[`VX_MEM_ADDR_WIDTH-1:`VX_MEM_ADDR_WIDTH-MEM_ADDR_WIDTH]; assign vx_mem_req_addr_qual = vx_mem_req_addr[`VX_MEM_ADDR_WIDTH-1:`VX_MEM_ADDR_WIDTH-LMEM_ADDR_WIDTH];
if (`VX_MEM_LINE_WIDTH != MEM_LINE_WIDTH) begin if (`VX_MEM_LINE_WIDTH != LMEM_LINE_WIDTH) begin
wire [VX_MEM_LINE_IDX-1:0] vx_mem_req_idx = vx_mem_req_addr[VX_MEM_LINE_IDX-1:0]; wire [VX_MEM_LINE_IDX-1:0] vx_mem_req_idx = vx_mem_req_addr[VX_MEM_LINE_IDX-1:0];
wire [VX_MEM_LINE_IDX-1:0] vx_mem_rsp_idx = vx_mem_rsp_tag_unqual[VX_MEM_LINE_IDX-1:0]; wire [VX_MEM_LINE_IDX-1:0] vx_mem_rsp_idx = vx_mem_rsp_tag_unqual[VX_MEM_LINE_IDX-1:0];
assign vx_mem_req_byteen_qual = 64'(vx_mem_req_byteen) << (6'(vx_mem_req_addr[VX_MEM_LINE_IDX-1:0]) << (VX_MEM_LINE_LW-3)); assign vx_mem_req_byteen_qual = 64'(vx_mem_req_byteen) << (6'(vx_mem_req_addr[VX_MEM_LINE_IDX-1:0]) << (VX_MEM_LINE_LW-3));
assign vx_mem_req_data_qual = MEM_LINE_WIDTH'(vx_mem_req_data) << ((MEM_LINE_LW'(vx_mem_req_idx)) << VX_MEM_LINE_LW); assign vx_mem_req_data_qual = LMEM_LINE_WIDTH'(vx_mem_req_data) << ((LMEM_LINE_LW'(vx_mem_req_idx)) << VX_MEM_LINE_LW);
assign vx_mem_req_tag_qual = {vx_mem_req_tag, vx_mem_req_idx}; assign vx_mem_req_tag_qual = {vx_mem_req_tag, vx_mem_req_idx};
assign vx_mem_rsp_data = vx_mem_rsp_data_unqual[vx_mem_rsp_idx]; assign vx_mem_rsp_data = vx_mem_rsp_data_unqual[vx_mem_rsp_idx];
end else begin end else begin
@@ -563,8 +566,8 @@ assign vx_mem_rsp_tag = vx_mem_rsp_tag_unqual[`VX_MEM_TAG_WIDTH+VX_MEM_LINE_IDX-
VX_mem_arb #( VX_mem_arb #(
.NUM_REQS (2), .NUM_REQS (2),
.DATA_WIDTH (MEM_LINE_WIDTH), .DATA_WIDTH (LMEM_LINE_WIDTH),
.ADDR_WIDTH (MEM_ADDR_WIDTH), .ADDR_WIDTH (LMEM_ADDR_WIDTH),
.TAG_IN_WIDTH (AVS_REQ_TAGW), .TAG_IN_WIDTH (AVS_REQ_TAGW),
.TAG_OUT_WIDTH (AVS_REQ_TAGW+1) .TAG_OUT_WIDTH (AVS_REQ_TAGW+1)
) mem_arb ( ) mem_arb (
@@ -605,9 +608,9 @@ VX_mem_arb #(
//-- //--
VX_avs_wrapper #( VX_avs_wrapper #(
.AVS_DATAW (MEM_LINE_WIDTH), .AVS_DATAW (LMEM_LINE_WIDTH),
.AVS_ADDRW (MEM_ADDR_WIDTH), .AVS_ADDRW (LMEM_ADDR_WIDTH),
.AVS_BURSTW (MEM_BURST_CTRW), .AVS_BURSTW (LMEM_BURST_CTRW),
.AVS_BANKS (NUM_LOCAL_MEM_BANKS), .AVS_BANKS (NUM_LOCAL_MEM_BANKS),
.REQ_TAGW (AVS_REQ_TAGW+1), .REQ_TAGW (AVS_REQ_TAGW+1),
.RD_QUEUE_SIZE (AVS_RD_QUEUE_SIZE) .RD_QUEUE_SIZE (AVS_RD_QUEUE_SIZE)