github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-23 13:27:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Blaise Tine 2020-03-29 05:24:40 -04:00
parent ede41dff1b
commit ce0cc44d11
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
driver/sw/rtlsim/Makefile
View file

@ -1,7 +1,7 @@
#CFLAGS += -std=c++11 -O3 -Wall -Wextra -pedantic -Wfatal-errors
CFLAGS += -std=c++11 -g -O0 -Wall -Wextra -pedantic -Wfatal-errors
CFLAGS += -std=c++11 -O3 -Wall -Wextra -pedantic -Wfatal-errors
#CFLAGS += -std=c++11 -g -O0 -Wall -Wextra -pedantic -Wfatal-errors
#USE_MULTICORE=1
USE_MULTICORE=1
CFLAGS += -I../../include -I../../../../rtl/simulate -I../../../../runtime
@ -15,6 +15,7 @@ ifdef USE_MULTICORE
CFLAGS += -DUSE_MULTICORE
RTL_TOP = Vortex_SOC
else
VL_FLAGS += -DSINGLE_CORE_BENCH
RTL_TOP = Vortex
endif

2
driver/tests/demo/Makefile
View file

@ -50,7 +50,7 @@ run-ase: $(PROJECT)
run-rtlsim: $(PROJECT)
LD_LIBRARY_PATH=../../sw/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) -f kernel.bin
run-simx: $(PROJECT)
LD_LIBRARY_PATH=../../sw/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) -f kernel.bin

BIN
driver/tests/demo/demo
View file

Binary file not shown.

4
driver/tests/demo/demo.cpp
View file

@ -115,7 +115,8 @@ int main(int argc, char *argv[]) {
// allocate shared memory
std::cout << "allocate shared memory" << std::endl;
ret = vx_alloc_shared_mem(device, buf_size, &buffer);
uint32_t alloc_size = std::max<uint32_t>(buf_size, sizeof(kernel_arg_t));
ret = vx_alloc_shared_mem(device, alloc_size, &buffer);
if (ret != 0) {
cleanup();
return -1;
@ -205,6 +206,7 @@ int main(int argc, char *argv[]) {
if (0 == errors) {
printf("PASSED!\n");
} else {
printf("Found %d errors!\n", errors);
printf("FAILED!\n");
}

1
rtl/VX_warp_scheduler.v
View file

@ -133,6 +133,7 @@ module VX_warp_scheduler (
thread_masks[0] <= 1; // Activating first thread in first warp
warp_stalled <= 0;
didnt_split <= 0;
warp_lock <= 0;
// total_barrier_stall = 0;
for (curr_w_help = 1; curr_w_help < `NW; curr_w_help=curr_w_help+1) begin
warp_pcs[curr_w_help] <= 0;