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

Add threaded -O3 build mode

Browse source
This commit is contained in:
wgulian3 2020-03-20 18:15:49 -04:00
parent f565d47844
commit 10ebfd7e24
4 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rtl/Makefile
View file

@ -21,13 +21,19 @@ LIB=
CF=-CFLAGS '-std=c++11 -fms-extensions' CF=-CFLAGS '-std=c++11 -fms-extensions'
CFRel=-CFLAGS '-std=c++11 -fms-extensions -O3 -DVL_THREADED'
DEB=--trace --prof-cfuncs -DVL_DEBUG=1 DEB=--trace --prof-cfuncs -DVL_DEBUG=1
MAKECPP=(cd obj_dir && make -j -f VVortex.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_DEBUG=1) MAKECPP=(cd obj_dir && make -j -f VVortex.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_DEBUG=1)
MAKECPPRel=(cd obj_dir && make -j -f VVortex.mk)
MAKEMULTICPP=(cd obj_dir && make -j -f VVortex_SOC.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_DEBUG=1) MAKEMULTICPP=(cd obj_dir && make -j -f VVortex_SOC.mk OPT='-DVL_DEBUG' VL_DEBUG=1 DVL_DEBUG=1)
THREADS ?= $(shell python3 -c 'import multiprocessing as mp; print(max(1, mp.cpu_count() // 2))' )
# -LDFLAGS '-lsystemc' # -LDFLAGS '-lsystemc'
VERILATOR: VERILATOR:
echo "#define VCD_OFF" > simulate/tb_debug.h echo "#define VCD_OFF" > simulate/tb_debug.h
@ -37,6 +43,11 @@ VERILATORnoWarnings:
echo "#define VCD_OFF" > simulate/tb_debug.h echo "#define VCD_OFF" > simulate/tb_debug.h
verilator $(COMP) -cc $(SINGLE_CORE) $(INCLUDE) $(EXE) $(LIB) $(CF) $(WNO) $(DEB) verilator $(COMP) -cc $(SINGLE_CORE) $(INCLUDE) $(EXE) $(LIB) $(CF) $(WNO) $(DEB)
VERILATORnoWarningsRel:
echo "#define VCD_OFF" > simulate/tb_debug.h
verilator $(COMP) -cc $(SINGLE_CORE) $(INCLUDE) $(EXE) $(LIB) $(CFRel) $(WNO) --threads $(THREADS)
VERILATORMULTInoWarnings: VERILATORMULTInoWarnings:
echo "#define VCD_OFF" > simulate/tb_debug.h echo "#define VCD_OFF" > simulate/tb_debug.h
verilator $(COMP) -cc $(MULTI_CORE) $(INCLUDE) $(MULTI_EXE) $(LIB) $(CF) $(WNO) $(DEB) verilator $(COMP) -cc $(MULTI_CORE) $(INCLUDE) $(MULTI_EXE) $(LIB) $(CF) $(WNO) $(DEB)
@ -58,6 +69,9 @@ debug: compdebug
w: VERILATORnoWarnings w: VERILATORnoWarnings
$(MAKECPP) $(MAKECPP)
wRel: VERILATORnoWarningsRel
$(MAKECPPRel)
multicore: VERILATORMULTInoWarnings multicore: VERILATORMULTInoWarnings
$(MAKEMULTICPP) $(MAKEMULTICPP)
@ -67,5 +81,8 @@ dmulticore: compdebugmulti
run: w run: w
(cd obj_dir && ./VVortex) (cd obj_dir && ./VVortex)
runRel: wRel
(cd obj_dir && ./VVortex)
clean: clean:
rm obj_dir/* rm obj_dir/*

3
rtl/VX_writeback.v
View file

@ -75,7 +75,8 @@ module VX_writeback (
.out ({use_wb_data , VX_writeback_inter.wb_valid, VX_writeback_inter.rd, VX_writeback_inter.wb, VX_writeback_inter.wb_warp_num, VX_writeback_inter.wb_pc}) .out ({use_wb_data , VX_writeback_inter.wb_valid, VX_writeback_inter.rd, VX_writeback_inter.wb, VX_writeback_inter.wb_warp_num, VX_writeback_inter.wb_pc})
); );
reg[31:0] last_data_wb;
reg[31:0] last_data_wb /* verilator public */ ;
always @(posedge clk) begin always @(posedge clk) begin
if ((|VX_writeback_inter.wb_valid) && (VX_writeback_inter.wb != 0) && (VX_writeback_inter.rd == 28)) begin if ((|VX_writeback_inter.wb_valid) && (VX_writeback_inter.wb != 0) && (VX_writeback_inter.rd == 28)) begin
last_data_wb <= use_wb_data[0]; last_data_wb <= use_wb_data[0];

3
rtl/simulate/test_bench.cpp
View file

@ -15,7 +15,8 @@ int main(int argc, char **argv)
#define ALL_TESTS #define ALL_TESTS
#ifdef ALL_TESTS #ifdef ALL_TESTS
bool passed = true; bool passed = true;
std::string tests[NUM_TESTS] = {
std::string tests[NUM_TESTS] = {
"../../emulator/riscv_tests/rv32ui-p-add.hex", "../../emulator/riscv_tests/rv32ui-p-add.hex",
"../../emulator/riscv_tests/rv32ui-p-addi.hex", "../../emulator/riscv_tests/rv32ui-p-addi.hex",
"../../emulator/riscv_tests/rv32ui-p-and.hex", "../../emulator/riscv_tests/rv32ui-p-and.hex",

3
rtl/simulate/test_bench.h
View file

@ -13,6 +13,7 @@
#include "VX_define.h" #include "VX_define.h"
#include "ram.h" #include "ram.h"
#include "VVortex.h" #include "VVortex.h"
#include "VVortex__Syms.h"
#include "verilated.h" #include "verilated.h"
#include "tb_debug.h" #include "tb_debug.h"
@ -462,7 +463,7 @@ bool Vortex::simulate(std::string file_to_simulate)
std::cerr << "New Total Cycles: " << (this->stats_total_cycles) << "\n"; std::cerr << "New Total Cycles: " << (this->stats_total_cycles) << "\n";
int status = (unsigned int) vortex->Vortex__DOT__vx_back_end__DOT__VX_wb__DOT__last_data_wb & 0xf; int status = (unsigned int) vortex->Vortex->vx_back_end->VX_wb->last_data_wb & 0xf;
// std::cout << "Last wb: " << std::hex << ((unsigned int) vortex->Vortex__DOT__vx_back_end__DOT__VX_wb__DOT__last_data_wb) << "\n"; // std::cout << "Last wb: " << std::hex << ((unsigned int) vortex->Vortex__DOT__vx_back_end__DOT__VX_wb__DOT__last_data_wb) << "\n";