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

simx directory name fix

Browse Source
This commit is contained in:
Blaise Tine
2021-11-30 07:17:58 -05:00
parent 41d7e6c63a
commit 2a7a4df342
48 changed files with 20 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
driver/simx/Makefile
View File

@@ -1,4 +1,4 @@
SIMX_DIR = ../../sim/simX SIMX_DIR = ../../sim/simx
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -g -O0 -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -g -O0 -Wall -Wextra -Wfatal-errors
@@ -9,7 +9,7 @@ CXXFLAGS += $(CONFIGS)
CXXFLAGS += -DDUMP_PERF_STATS CXXFLAGS += -DDUMP_PERF_STATS
LDFLAGS += -shared -pthread LDFLAGS += -shared -pthread
LDFLAGS += $(SIMX_DIR)/libsimX.a LDFLAGS += $(SIMX_DIR)/libsimx.a
SRCS = vortex.cpp ../common/vx_utils.cpp SRCS = vortex.cpp ../common/vx_utils.cpp

2
miscs/rvvector/basic/Makefile
View File

@@ -36,6 +36,6 @@ ELF:
$(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf
run: run:
../../simX/obj_dir/Vcache_simX -E -a rv32i --core vx_vector_main.hex -s -b 1> emulator.debug ../../simx/obj_dir/Vcache_simX -E -a rv32i --core vx_vector_main.hex -s -b 1> emulator.debug

4
sim/Makefile
View File

@@ -1,9 +1,9 @@
all: all:
$(MAKE) -C simX $(MAKE) -C simx
$(MAKE) -C rtlsim $(MAKE) -C rtlsim
$(MAKE) -C vlsim $(MAKE) -C vlsim
clean: clean:
$(MAKE) -C simX clean $(MAKE) -C simx clean
$(MAKE) -C rtlsim clean $(MAKE) -C rtlsim clean
$(MAKE) -C vlsim clean $(MAKE) -C vlsim clean

2
sim/simX/Makefile → sim/simx/Makefile
View File

@@ -28,7 +28,7 @@ else
CXXFLAGS += -O2 -DNDEBUG CXXFLAGS += -O2 -DNDEBUG
endif endif
PROJECT = simX PROJECT = simx
all: $(PROJECT) all: $(PROJECT)

0
sim/simX/archdef.h → sim/simx/archdef.h
View File

0
sim/simX/args.cpp → sim/simx/args.cpp
View File

0
sim/simX/args.h → sim/simx/args.h
View File

0
sim/simX/cache.cpp → sim/simx/cache.cpp
View File

0
sim/simX/cache.h → sim/simx/cache.h
View File

0
sim/simX/constants.h → sim/simx/constants.h
View File

0
sim/simX/core.cpp → sim/simx/core.cpp
View File

0
sim/simX/core.h → sim/simx/core.h
View File

0
sim/simX/debug.h → sim/simx/debug.h
View File

0
sim/simX/decode.cpp → sim/simx/decode.cpp
View File

0
sim/simX/decode.h → sim/simx/decode.h
View File

0
sim/simX/execute.cpp → sim/simx/execute.cpp
View File

0
sim/simX/exeunit.cpp → sim/simx/exeunit.cpp
View File

0
sim/simX/exeunit.h → sim/simx/exeunit.h
View File

0
sim/simX/ibuffer.h → sim/simx/ibuffer.h
View File

0
sim/simX/instr.h → sim/simx/instr.h
View File

0
sim/simX/main.cpp → sim/simx/main.cpp
View File

0
sim/simX/memsim.cpp → sim/simx/memsim.cpp
View File

0
sim/simX/memsim.h → sim/simx/memsim.h
View File

0
sim/simX/pipeline.h → sim/simx/pipeline.h
View File

0
sim/simX/processor.cpp → sim/simx/processor.cpp
View File

0
sim/simX/processor.h → sim/simx/processor.h
View File

0
sim/simX/scoreboard.h → sim/simx/scoreboard.h
View File

0
sim/simX/sharedmem.h → sim/simx/sharedmem.h
View File

0
sim/simX/tex_unit.cpp → sim/simx/tex_unit.cpp
View File

0
sim/simX/tex_unit.h → sim/simx/tex_unit.h
View File

0
sim/simX/types.h → sim/simx/types.h
View File

0
sim/simX/warp.cpp → sim/simx/warp.cpp
View File

0
sim/simX/warp.h → sim/simx/warp.h
View File

49
sim/vlsim/vortex_afu.h
View File

@@ -1,49 +0,0 @@
// auto-generated by gen_config.py. DO NOT EDIT
// Generated at 2021-11-25 13:43:13.259966
// Translated from VX_config.vh:
#ifndef __VORTEX_AFU__
#define __VORTEX_AFU__
#define PLATFORM_PROVIDES_LOCAL_MEMORY
#ifndef PLATFORM_PARAM_LOCAL_MEMORY_BANKS
#define PLATFORM_PARAM_LOCAL_MEMORY_BANKS 2
#endif
#ifndef PLATFORM_PARAM_LOCAL_MEMORY_ADDR_WIDTH
#define PLATFORM_PARAM_LOCAL_MEMORY_ADDR_WIDTH 26
#endif
#ifndef PLATFORM_PARAM_LOCAL_MEMORY_DATA_WIDTH
#define PLATFORM_PARAM_LOCAL_MEMORY_DATA_WIDTH 512
#endif
#ifndef PLATFORM_PARAM_LOCAL_MEMORY_BURST_CNT_WIDTH
#define PLATFORM_PARAM_LOCAL_MEMORY_BURST_CNT_WIDTH 4
#endif
#define AFU_ACCEL_NAME "vortex_afu"
#define AFU_ACCEL_UUID 0x35f9452b_25c2_434c_93d5_6f8c60db361c
#define AFU_IMAGE_CMD_MEM_READ 1
#define AFU_IMAGE_CMD_MEM_WRITE 2
#define AFU_IMAGE_CMD_RUN 3
#define AFU_IMAGE_MMIO_CMD_TYPE 10
#define AFU_IMAGE_MMIO_DATA_SIZE 16
#define AFU_IMAGE_MMIO_IO_ADDR 12
#define AFU_IMAGE_MMIO_MEM_ADDR 14
#define AFU_IMAGE_MMIO_SCOPE_READ 20
#define AFU_IMAGE_MMIO_SCOPE_WRITE 22
#define AFU_IMAGE_MMIO_DEV_CAPS 24
#define AFU_IMAGE_MMIO_STATUS 18
#define AFU_IMAGE_POWER 0
#define AFU_TOP_IFC "ccip_std_afu_avalon_mm"
#endif

2
tests/opencl/BlackScholes/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/DotProduct/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/VectorHypot/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/cutcp/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/lbm/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/mri-q/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/reduce0/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/sad/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/spmv/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/opencl/stencil/Makefile
View File

@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
POCL_INC_PATH ?= $(wildcard ../include) POCL_INC_PATH ?= $(wildcard ../include)
POCL_LIB_PATH ?= $(wildcard ../lib) POCL_LIB_PATH ?= $(wildcard ../lib)
VORTEX_RT_PATH ?= $(wildcard ../../../runtime) VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++

2
tests/riscv/isa/Makefile
View File

@@ -10,7 +10,7 @@ TESTS := $(filter-out $(EXCLUDED_TESTS), $(ALL_TESTS))
all: all:
run-simx: run-simx:
$(foreach test, $(TESTS), ../../../sim/simX/simX -r -a rv32i -c 1 -i $(test) || exit;) $(foreach test, $(TESTS), ../../../sim/simx/simx -r -a rv32i -c 1 -i $(test) || exit;)
run-rtlsim: run-rtlsim:
$(foreach test, $(TESTS), ../../../sim/rtlsim/rtlsim -r $(test) || exit;) $(foreach test, $(TESTS), ../../../sim/rtlsim/rtlsim -r $(test) || exit;)

2
tests/runtime/fibonacci/Makefile
View File

@@ -30,7 +30,7 @@ run-rtlsim: $(PROJECT).bin
../../../sim/rtlsim/rtlsim $(PROJECT).bin ../../../sim/rtlsim/rtlsim $(PROJECT).bin
run-simx: $(PROJECT).bin run-simx: $(PROJECT).bin
../../../sim/simX/simX -a rv32i -c 1 -i $(PROJECT).bin ../../../sim/simx/simx -a rv32i -c 1 -i $(PROJECT).bin
.depend: $(SRCS) .depend: $(SRCS)
$(CC) $(CFLAGS) -MM $^ > .depend; $(CC) $(CFLAGS) -MM $^ > .depend;

2
tests/runtime/hello/Makefile
View File

@@ -30,7 +30,7 @@ run-rtlsim: $(PROJECT).bin
../../../sim/rtlsim/rtlsim $(PROJECT).bin ../../../sim/rtlsim/rtlsim $(PROJECT).bin
run-simx: $(PROJECT).bin run-simx: $(PROJECT).bin
../../../sim/simX/simX -a rv32i -c 1 -i $(PROJECT).bin ../../../sim/simx/simx -a rv32i -c 1 -i $(PROJECT).bin
.depend: $(SRCS) .depend: $(SRCS)
$(CC) $(CFLAGS) -MM $^ > .depend; $(CC) $(CFLAGS) -MM $^ > .depend;

2
tests/runtime/simple/Makefile
View File

@@ -30,7 +30,7 @@ run-rtlsim: $(PROJECT).bin
../../../sim/rtlsim/rtlsim $(PROJECT).bin ../../../sim/rtlsim/rtlsim $(PROJECT).bin
run-simx: $(PROJECT).bin run-simx: $(PROJECT).bin
../../../sim/simX/simX -a rv32i -c 1 -i $(PROJECT).bin ../../../sim/simx/simx -a rv32i -c 1 -i $(PROJECT).bin
.depend: $(SRCS) .depend: $(SRCS)
$(CC) $(CFLAGS) -MM $^ > .depend; $(CC) $(CFLAGS) -MM $^ > .depend;