wu-arch/kernels
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-24 01:17:38 -04:00
parent 4cb98a25a7
commit cad21a4b92
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/opae/vlsim/opae_sim.cpp
View File

@@ -313,7 +313,6 @@ void opae_sim::avs_bus() {
if (!dram_stalled) { if (!dram_stalled) {
assert(!vortex_afu_->avs_read || !vortex_afu_->avs_write); assert(!vortex_afu_->avs_read || !vortex_afu_->avs_write);
if (vortex_afu_->avs_write) { if (vortex_afu_->avs_write) {
assert(0 == vortex_afu_->mem_bank_select);
uint64_t byteen = vortex_afu_->avs_byteenable; uint64_t byteen = vortex_afu_->avs_byteenable;
unsigned base_addr = vortex_afu_->avs_address * DRAM_BLOCK_SIZE; unsigned base_addr = vortex_afu_->avs_address * DRAM_BLOCK_SIZE;
uint8_t* data = (uint8_t*)(vortex_afu_->avs_writedata); uint8_t* data = (uint8_t*)(vortex_afu_->avs_writedata);
@@ -329,7 +328,6 @@ void opae_sim::avs_bus() {
printf("\n");*/ printf("\n");*/
} }
if (vortex_afu_->avs_read) { if (vortex_afu_->avs_read) {
assert(0 == vortex_afu_->mem_bank_select);
dram_rd_req_t dram_req; dram_rd_req_t dram_req;
dram_req.addr = vortex_afu_->avs_address; dram_req.addr = vortex_afu_->avs_address;
ram_.read(vortex_afu_->avs_address * DRAM_BLOCK_SIZE, DRAM_BLOCK_SIZE, dram_req.data.data()); ram_.read(vortex_afu_->avs_address * DRAM_BLOCK_SIZE, DRAM_BLOCK_SIZE, dram_req.data.data());

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

@@ -9,9 +9,7 @@ import ccip_if_pkg::*;
import local_mem_cfg_pkg::*; import local_mem_cfg_pkg::*;
/* verilator lint_on IMPORTSTAR */ /* verilator lint_on IMPORTSTAR */
module vortex_afu_shim #( module vortex_afu_shim (
parameter NUM_LOCAL_MEM_BANKS = 2
) (
// global signals // global signals
input clk, input clk,
input reset, input reset,
@@ -83,14 +81,14 @@ module vortex_afu_shim #(
output t_local_mem_burst_cnt avs_burstcount, output t_local_mem_burst_cnt avs_burstcount,
input avs_readdatavalid, input avs_readdatavalid,
output logic [$clog2(NUM_LOCAL_MEM_BANKS)-1:0] mem_bank_select output logic [$clog2(`PLATFORM_PARAM_LOCAL_MEMORY_BANKS)-1:0] mem_bank_select
); );
t_if_ccip_Rx cp2af_sRxPort; t_if_ccip_Rx cp2af_sRxPort;
t_if_ccip_Tx af2cp_sTxPort; t_if_ccip_Tx af2cp_sTxPort;
vortex_afu #( vortex_afu #(
.NUM_LOCAL_MEM_BANKS(NUM_LOCAL_MEM_BANKS) .NUM_LOCAL_MEM_BANKS(`PLATFORM_PARAM_LOCAL_MEMORY_BANKS)
) afu ( ) afu (
.clk(clk), .clk(clk),
.reset(reset), .reset(reset),

2
hw/rtl/VX_config.vh
View File

@@ -1,8 +1,6 @@
`ifndef VX_CONFIG `ifndef VX_CONFIG
`define VX_CONFIG `define VX_CONFIG
`include "VX_user_config.vh"
`ifndef NUM_CLUSTERS `ifndef NUM_CLUSTERS
`define NUM_CLUSTERS 1 `define NUM_CLUSTERS 1
`endif `endif

4
hw/rtl/afu/vortex_afu.vh
View File

@@ -5,6 +5,10 @@
`define PLATFORM_PROVIDES_LOCAL_MEMORY `define PLATFORM_PROVIDES_LOCAL_MEMORY
`ifndef PLATFORM_PARAM_LOCAL_MEMORY_BANKS
`define PLATFORM_PARAM_LOCAL_MEMORY_BANKS 2
`endif
`ifndef PLATFORM_PARAM_LOCAL_MEMORY_DATA_SIZE_BITS `ifndef PLATFORM_PARAM_LOCAL_MEMORY_DATA_SIZE_BITS
`define PLATFORM_PARAM_LOCAL_MEMORY_DATA_SIZE_BITS 6 `define PLATFORM_PARAM_LOCAL_MEMORY_DATA_SIZE_BITS 6
`endif `endif