From e54425404edb39741d4bb779db57279439f127a7 Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Thu, 27 Aug 2020 06:41:40 -0400 Subject: [PATCH] fixed driver unrsolved dependencies --- README.md | 2 +- driver/common/vx_utils.cpp | 2 +- driver/include/vortex.h | 2 +- driver/rtlsim/vortex.cpp | 8 ++++++++ driver/simx/vortex.cpp | 8 ++++++++ driver/stub/vortex.cpp | 8 ++++++++ 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c4d347aa..69bad00f 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Install Verilator Install Vortex - $ git clone --recursive https://github.gatech.edu/casl/Vortex.git + $ git clone --recursive https://github.com/vortexgpgpu/vortex.git $ cd Vortex $ make diff --git a/driver/common/vx_utils.cpp b/driver/common/vx_utils.cpp index eb3e93b1..4a4eb62d 100644 --- a/driver/common/vx_utils.cpp +++ b/driver/common/vx_utils.cpp @@ -91,7 +91,7 @@ extern int vx_upload_kernel_file(vx_device_h device, const char* filename) { return err; } -extern int vx_get_perf(vx_device_h device, uint64_t* cycles, uint64_t* instrs) { +extern int vx_get_perf(vx_device_h device, size_t* cycles, size_t* instrs) { int ret = 0; unsigned value; diff --git a/driver/include/vortex.h b/driver/include/vortex.h index 7c331800..ecdd0542 100644 --- a/driver/include/vortex.h +++ b/driver/include/vortex.h @@ -72,7 +72,7 @@ int vx_upload_kernel_bytes(vx_device_h device, const void* content, size_t size) int vx_upload_kernel_file(vx_device_h device, const char* filename); // get performance counters -int vx_get_perf(vx_device_h device, uint64_t* cycles, uint64_t* instrs); +int vx_get_perf(vx_device_h device, size_t* cycles, size_t* instrs); #ifdef __cplusplus } diff --git a/driver/rtlsim/vortex.cpp b/driver/rtlsim/vortex.cpp index b01eea34..80167966 100644 --- a/driver/rtlsim/vortex.cpp +++ b/driver/rtlsim/vortex.cpp @@ -323,3 +323,11 @@ extern int vx_ready_wait(vx_device_h hdevice, long long timeout) { return device->wait(timeout); } + +extern int vx_csr_set(vx_device_h /*hdevice*/, int /*core*/, int /*address*/, unsigned /*value*/) { + return -1; +} + +extern int vx_csr_get(vx_device_h /*hdevice*/, int /*core*/, int /*address*/, unsigned* /*value*/) { + return -1; +} \ No newline at end of file diff --git a/driver/simx/vortex.cpp b/driver/simx/vortex.cpp index 981ca5c1..292c410f 100644 --- a/driver/simx/vortex.cpp +++ b/driver/simx/vortex.cpp @@ -357,3 +357,11 @@ extern int vx_ready_wait(vx_device_h hdevice, long long timeout) { return device->wait(timeout); } + +extern int vx_csr_set(vx_device_h /*hdevice*/, int /*core*/, int /*address*/, unsigned /*value*/) { + return -1; +} + +extern int vx_csr_get(vx_device_h /*hdevice*/, int /*core*/, int /*address*/, unsigned* /*value*/) { + return -1; +} \ No newline at end of file diff --git a/driver/stub/vortex.cpp b/driver/stub/vortex.cpp index 532e64d7..007bce0e 100644 --- a/driver/stub/vortex.cpp +++ b/driver/stub/vortex.cpp @@ -47,3 +47,11 @@ extern int vx_start(vx_device_h /*hdevice*/) { extern int vx_ready_wait(vx_device_h /*hdevice*/, long long /*timeout*/) { return -1; } + +extern int vx_csr_set(vx_device_h /*hdevice*/, int /*core*/, int /*address*/, unsigned /*value*/) { + return -1; +} + +extern int vx_csr_get(vx_device_h /*hdevice*/, int /*core*/, int /*address*/, unsigned* /*value*/) { + return -1; +} \ No newline at end of file