From 76c4909ae9fdb717aa857661c43ed8374600865c Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Sat, 12 Jun 2021 02:22:01 -0400 Subject: [PATCH] minor update --- driver/common/vx_utils.cpp | 2 +- hw/rtl/VX_config.vh | 28 +++++++++------------------- runtime/src/vx_perf.c | 2 +- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/driver/common/vx_utils.cpp b/driver/common/vx_utils.cpp index 6bb7b2d6..885da189 100644 --- a/driver/common/vx_utils.cpp +++ b/driver/common/vx_utils.cpp @@ -140,7 +140,7 @@ extern int vx_dump_perf(vx_device_h device, FILE* stream) { auto staging_ptr = (uint32_t*)vx_host_ptr(staging_buf); for (unsigned core_id = 0; core_id < num_cores; ++core_id) { - ret = vx_copy_from_dev(staging_buf, IO_ADDR_CSR + 64 * sizeof(uint32_t) * core_id, 64 * sizeof(uint32_t), 0); + ret = vx_copy_from_dev(staging_buf, IO_CSR_ADDR + 64 * sizeof(uint32_t) * core_id, 64 * sizeof(uint32_t), 0); if (ret != 0) { vx_buf_release(staging_buf); return ret; diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh index 8ccf1c01..5b85a983 100644 --- a/hw/rtl/VX_config.vh +++ b/hw/rtl/VX_config.vh @@ -50,35 +50,25 @@ `endif `ifndef IO_ADDR_SIZE -`define IO_ADDR_SIZE (32'hFFFFFFFF - 32'hFF000000 + 1) +`define IO_ADDR_SIZE (32'hFFFFFFFF - `IO_BASE_ADDR + 1) `endif -`ifndef IO_ADDR_COUT -`define IO_ADDR_COUT 32'hFFFFFFFC +`ifndef IO_COUT_ADDR +`define IO_COUT_ADDR 32'hFFFFFFC0 `endif -`ifndef IO_ADDR_CSR -`define IO_ADDR_CSR `IO_BASE_ADDR +`ifndef IO_COUT_SIZE +`define IO_COUT_SIZE 64 +`endif + +`ifndef IO_CSR_ADDR +`define IO_CSR_ADDR `IO_BASE_ADDR `endif `ifndef SMEM_BASE_ADDR `define SMEM_BASE_ADDR `IO_BASE_ADDR `endif -`ifndef FRAME_BUFFER_BASE_ADDR -`define FRAME_BUFFER_BASE_ADDR 32'hFF000000 -`endif - -`ifndef FRAME_BUFFER_WIDTH -`define FRAME_BUFFER_WIDTH 16'd1920 -`endif - -`ifndef FRAME_BUFFER_HEIGHT -`define FRAME_BUFFER_HEIGHT 16'd1080 -`endif - -`define FRAME_BUFFER_SIZE (FRAME_BUFFER_WIDTH * FRAME_BUFFER_HEIGHT) - `ifndef EXT_M_DISABLE `define EXT_M_ENABLE `endif diff --git a/runtime/src/vx_perf.c b/runtime/src/vx_perf.c index 175ffb3d..edfecdeb 100644 --- a/runtime/src/vx_perf.c +++ b/runtime/src/vx_perf.c @@ -21,7 +21,7 @@ void vx_perf_dump() { int core_id = vx_core_id(); - uint32_t* const csr_mem = (uint32_t*)(IO_ADDR_CSR + 64 * sizeof(uint32_t) * core_id); + uint32_t* const csr_mem = (uint32_t*)(IO_CSR_ADDR + 64 * sizeof(uint32_t) * core_id); DUMP_CSR_32(0, CSR_MPM_BASE) DUMP_CSR_32(32, CSR_MPM_BASE_H) } \ No newline at end of file