simx directory name fix

2021-11-30 07:17:58 -05:00
parent 41d7e6c63a
commit 2a7a4df342
48 changed files with 20 additions and 69 deletions
--- a/driver/simx/Makefile
+++ b/driver/simx/Makefile
@@ -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 -g -O0 -Wall -Wextra -Wfatal-errors
@@ -9,7 +9,7 @@ CXXFLAGS += $(CONFIGS)
 CXXFLAGS += -DDUMP_PERF_STATS

 LDFLAGS += -shared -pthread
-LDFLAGS += $(SIMX_DIR)/libsimX.a
+LDFLAGS += $(SIMX_DIR)/libsimx.a

 SRCS = vortex.cpp ../common/vx_utils.cpp 

--- a/miscs/rvvector/basic/Makefile
+++ b/miscs/rvvector/basic/Makefile
@@ -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

 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


--- a/sim/Makefile
+++ b/sim/Makefile
@@ -1,9 +1,9 @@
 all:
-	$(MAKE) -C simX
+	$(MAKE) -C simx
 	$(MAKE) -C rtlsim
 	$(MAKE) -C vlsim
 	
 clean:
-	$(MAKE) -C simX clean
+	$(MAKE) -C simx clean
 	$(MAKE) -C rtlsim clean
 	$(MAKE) -C vlsim clean
--- a/sim/simx/Makefile
+++ b/sim/simx/Makefile
@@ -28,7 +28,7 @@ else
 	CXXFLAGS += -O2 -DNDEBUG
 endif

-PROJECT = simX
+PROJECT = simx

 all: $(PROJECT)

--- a/sim/simx/archdef.h
+++ b/sim/simx/archdef.h
--- a/sim/simx/args.cpp
+++ b/sim/simx/args.cpp
--- a/sim/simx/args.h
+++ b/sim/simx/args.h
--- a/sim/simx/cache.cpp
+++ b/sim/simx/cache.cpp
--- a/sim/simx/cache.h
+++ b/sim/simx/cache.h
--- a/sim/simx/constants.h
+++ b/sim/simx/constants.h
--- a/sim/simx/core.cpp
+++ b/sim/simx/core.cpp
--- a/sim/simx/core.h
+++ b/sim/simx/core.h
--- a/sim/simx/debug.h
+++ b/sim/simx/debug.h
--- a/sim/simx/decode.cpp
+++ b/sim/simx/decode.cpp
--- a/sim/simx/decode.h
+++ b/sim/simx/decode.h
--- a/sim/simx/execute.cpp
+++ b/sim/simx/execute.cpp
--- a/sim/simx/exeunit.cpp
+++ b/sim/simx/exeunit.cpp
--- a/sim/simx/exeunit.h
+++ b/sim/simx/exeunit.h
--- a/sim/simx/ibuffer.h
+++ b/sim/simx/ibuffer.h
--- a/sim/simx/instr.h
+++ b/sim/simx/instr.h
--- a/sim/simx/main.cpp
+++ b/sim/simx/main.cpp
--- a/sim/simx/memsim.cpp
+++ b/sim/simx/memsim.cpp
--- a/sim/simx/memsim.h
+++ b/sim/simx/memsim.h
--- a/sim/simx/pipeline.h
+++ b/sim/simx/pipeline.h
--- a/sim/simx/processor.cpp
+++ b/sim/simx/processor.cpp
--- a/sim/simx/processor.h
+++ b/sim/simx/processor.h
--- a/sim/simx/scoreboard.h
+++ b/sim/simx/scoreboard.h
--- a/sim/simx/sharedmem.h
+++ b/sim/simx/sharedmem.h
--- a/sim/simx/tex_unit.cpp
+++ b/sim/simx/tex_unit.cpp
--- a/sim/simx/tex_unit.h
+++ b/sim/simx/tex_unit.h
--- a/sim/simx/types.h
+++ b/sim/simx/types.h
--- a/sim/simx/warp.cpp
+++ b/sim/simx/warp.cpp
--- a/sim/simx/warp.h
+++ b/sim/simx/warp.h
--- a/sim/vlsim/vortex_afu.h
+++ b/sim/vlsim/vortex_afu.h
@@ -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
--- a/tests/opencl/BlackScholes/Makefile
+++ b/tests/opencl/BlackScholes/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/DotProduct/Makefile
+++ b/tests/opencl/DotProduct/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/VectorHypot/Makefile
+++ b/tests/opencl/VectorHypot/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/cutcp/Makefile
+++ b/tests/opencl/cutcp/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/lbm/Makefile
+++ b/tests/opencl/lbm/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/mri-q/Makefile
+++ b/tests/opencl/mri-q/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/reduce0/Makefile
+++ b/tests/opencl/reduce0/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/sad/Makefile
+++ b/tests/opencl/sad/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/spmv/Makefile
+++ b/tests/opencl/spmv/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/opencl/stencil/Makefile
+++ b/tests/opencl/stencil/Makefile
@@ -3,7 +3,7 @@ POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
 POCL_INC_PATH ?= $(wildcard ../include)
 POCL_LIB_PATH ?= $(wildcard ../lib)
 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
 CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
--- a/tests/riscv/isa/Makefile
+++ b/tests/riscv/isa/Makefile
@@ -10,7 +10,7 @@ TESTS := $(filter-out $(EXCLUDED_TESTS), $(ALL_TESTS))
 all:

 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:
 	$(foreach test, $(TESTS), ../../../sim/rtlsim/rtlsim -r $(test) || exit;)
--- a/tests/runtime/fibonacci/Makefile
+++ b/tests/runtime/fibonacci/Makefile
@@ -30,7 +30,7 @@ run-rtlsim: $(PROJECT).bin
 	../../../sim/rtlsim/rtlsim $(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)
 	$(CC) $(CFLAGS) -MM $^ > .depend;
--- a/tests/runtime/hello/Makefile
+++ b/tests/runtime/hello/Makefile
@@ -30,7 +30,7 @@ run-rtlsim: $(PROJECT).bin
 	../../../sim/rtlsim/rtlsim $(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)
 	$(CC) $(CFLAGS) -MM $^ > .depend;
--- a/tests/runtime/simple/Makefile
+++ b/tests/runtime/simple/Makefile
@@ -30,7 +30,7 @@ run-rtlsim: $(PROJECT).bin
 	../../../sim/rtlsim/rtlsim $(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)
 	$(CC) $(CFLAGS) -MM $^ > .depend;