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

rtlsim driver works with Vortex!

Browse Source
This commit is contained in:
Blaise Tine
2020-03-27 21:54:55 -04:00
parent 5d320a9313
commit 550d96a73c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
driver/sw/rtlsim/Makefile
View File

@@ -1,7 +1,7 @@
#CFLAGS += -std=c++11 -O3 -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 CFLAGS += -std=c++11 -g -O0 -Wall -Wextra -pedantic -Wfatal-errors
USE_MULTICORE=1 #USE_MULTICORE=1
CFLAGS += -I../../include -I../../../../rtl/simulate CFLAGS += -I../../include -I../../../../rtl/simulate
@@ -30,8 +30,8 @@ VL_FLAGS += -Wno-UNOPTFLAT -Wno-WIDTH
VL_FLAGS += -Wno-UNDRIVEN --Wno-PINMISSING -Wno-STMTDLY -Wno-WIDTH -Wno-UNSIGNED -Wno-UNOPTFLAT -Wno-LITENDIAN VL_FLAGS += -Wno-UNDRIVEN --Wno-PINMISSING -Wno-STMTDLY -Wno-WIDTH -Wno-UNSIGNED -Wno-UNOPTFLAT -Wno-LITENDIAN
# Debugigng # Debugigng
VL_FLAGS += --trace -DVL_DEBUG=1 #VL_FLAGS += --trace -DVL_DEBUG=1
CFLAGS += -DVCD_OUTPUT #CFLAGS += -DVCD_OUTPUT
PROJECT = libvortex.so PROJECT = libvortex.so

1
driver/sw/rtlsim/vortex.cpp
View File

@@ -78,6 +78,7 @@ public:
: is_done_(false) : is_done_(false)
, mem_allocation_(VX_ALLOC_BASE_ADDR) , mem_allocation_(VX_ALLOC_BASE_ADDR)
, vortex_(&ram_) { , vortex_(&ram_) {
vortex_.reset();
thread_ = new std::thread(__thread_proc__, this); thread_ = new std::thread(__thread_proc__, this);
} }

2
rtl/VX_warp_scheduler.v
View File

@@ -298,7 +298,7 @@ module VX_warp_scheduler (
assign global_stall = (stall || wstall_this_cycle || hazard || !real_schedule || is_join); assign global_stall = (stall || wstall_this_cycle || hazard || !real_schedule || is_join);
assign scheduled_warp = !(wstall_this_cycle || hazard || !real_schedule || is_join); assign scheduled_warp = !(wstall_this_cycle || hazard || !real_schedule || is_join) && !reset;
wire real_use_wspawn = use_wsapwn[warp_to_schedule]; wire real_use_wspawn = use_wsapwn[warp_to_schedule];