Replace all vanadisLLVMRISCV with vanadis_llvm_rv64

Author: hughes-c

src/sst/elements/balar/Makefile.am

@@ -47,18 +47,18 @@ EXTRA_DIST = \
 	tests/vanadisHandshake/cuda_runtime_api.c \
 	tests/vanadisHandshake/cuda_runtime_api.h \
 	tests/vanadisHandshake/Makefile \
-	tests/vanadisLLVMRISCV/cudaSamplesCommon/exception.h \
-	tests/vanadisLLVMRISCV/cudaSamplesCommon/helper_cuda.h \
-	tests/vanadisLLVMRISCV/cudaSamplesCommon/helper_functions.h \
-	tests/vanadisLLVMRISCV/cudaSamplesCommon/helper_image.h \
-	tests/vanadisLLVMRISCV/cudaSamplesCommon/helper_string.h \
-	tests/vanadisLLVMRISCV/cudaSamplesCommon/helper_timer.h \
-	tests/vanadisLLVMRISCV/balar_vanadis.h \
-	tests/vanadisLLVMRISCV/cuda_runtime_api_vanadis.cc \
-	tests/vanadisLLVMRISCV/helloworld.c \
-	tests/vanadisLLVMRISCV/Makefile \
-	tests/vanadisLLVMRISCV/simpleStreams.cu \
-	tests/vanadisLLVMRISCV/vecadd.cu \
+	tests/vanadis_llvm_rv64/cudaSamplesCommon/exception.h \
+	tests/vanadis_llvm_rv64/cudaSamplesCommon/helper_cuda.h \
+	tests/vanadis_llvm_rv64/cudaSamplesCommon/helper_functions.h \
+	tests/vanadis_llvm_rv64/cudaSamplesCommon/helper_image.h \
+	tests/vanadis_llvm_rv64/cudaSamplesCommon/helper_string.h \
+	tests/vanadis_llvm_rv64/cudaSamplesCommon/helper_timer.h \
+	tests/vanadis_llvm_rv64/balar_vanadis.h \
+	tests/vanadis_llvm_rv64/cuda_runtime_api_vanadis.cc \
+	tests/vanadis_llvm_rv64/helloworld.c \
+	tests/vanadis_llvm_rv64/Makefile \
+	tests/vanadis_llvm_rv64/simpleStreams.cu \
+	tests/vanadis_llvm_rv64/vecadd.cu \
 	tests/vectorAdd/cuda_calls.trace \
 	tests/vectorAdd/cuMemcpyD2H-0-524288.data \
 	tests/vectorAdd/cuMemcpyH2D-0-524288.data \

src/sst/elements/balar/README.md

@@ -123,9 +123,9 @@ export GPU_ARCH=sm_70
 
 #### Compiling CUDA for Balar + Vanadis
 
-In order to run CUDA on Balar + Vanadis (direct-execution), aside from the compilers, the custom CUDA library `libcudart_vanadis` (inside `vanadisLLVMRISCV`) is also needed to intercept CUDA API calls and send them to Balar's MMIO address. This custom CUDA lib can be made via `make -C vanadisLLVMRISCV vanadis_cuda`, which would generate the `libcudart_vanadis.a/so`.
+In order to run CUDA on Balar + Vanadis (direct-execution), aside from the compilers, the custom CUDA library `libcudart_vanadis` (inside `vanadis_llvm_rv64`) is also needed to intercept CUDA API calls and send them to Balar's MMIO address. This custom CUDA lib can be made via `make -C vanadis_llvm_rv64 vanadis_cuda`, which would generate the `libcudart_vanadis.a/so`.
 
-For compiler and linker flags, you can refer to the `vecadd` target in `vanadisLLVMRISCV/Makefile`.
+For compiler and linker flags, you can refer to the `vecadd` target in `vanadis_llvm_rv64/Makefile`.
 
 #### GPU Application Collection
 
@@ -141,7 +141,7 @@ git checkout sst_support
 # If you plan to compile the apps directly, you will
 # also need to set SST_CUSTOM_CUDA_LIB_PATH to
 # the directory of the custom CUDA library,
-# which normally will be `SST-ELEMENT-SOURCE/src/sst/elements/balar/tests/vanadisLLVMRISCV`
+# which normally will be `SST-ELEMENT-SOURCE/src/sst/elements/balar/tests/vanadis_llvm_rv64`
 source ./src/setup_environment sst
 ```
 
@@ -186,13 +186,13 @@ The CUDA executable should be passed in `VANADIS_EXE` and `BALAR_CUDA_EXE_PATH`.
 cd SST_ELEMENTS_SRC/src/sst/elements/balar/tests/
 
 # Compile test programs
-make -C vanadisLLVMRISCV
+make -C vanadis_llvm_rv64
 
 # Run CPU only program
-VANADIS_EXE=./vanadisLLVMRISCV/helloworld VANADIS_ISA=RISCV64 sst testBalar-vanadis.py --model-options='-c gpu-v100-mem.cfg'
+VANADIS_EXE=./vanadis_llvm_rv64/helloworld VANADIS_ISA=RISCV64 sst testBalar-vanadis.py --model-options='-c gpu-v100-mem.cfg'
 
 # Run sample vecadd
-VANADIS_EXE=./vanadisLLVMRISCV/vecadd VANADIS_ISA=RISCV64 BALAR_CUDA_EXE_PATH=./vanadisLLVMRISCV/vecadd sst testBalar-vanadis.py --model-options='-c gpu-v100-mem.cfg'
+VANADIS_EXE=./vanadis_llvm_rv64/vecadd VANADIS_ISA=RISCV64 BALAR_CUDA_EXE_PATH=./vanadis_llvm_rv64/vecadd sst testBalar-vanadis.py --model-options='-c gpu-v100-mem.cfg'
 ```
 
 ### Running GPU Benchmark
@@ -201,7 +201,7 @@ Here is an example on running Rodinia 2.0 BFS with SampleGraph.txt input using C
 
 ```bash
 # Let GPU app knows about the custom CUDA lib
-export SST_CUSTOM_CUDA_LIB_PATH=SST_ELEMENTS_SRC/src/sst/elements/balar/tests/vanadisLLVMRISCV
+export SST_CUSTOM_CUDA_LIB_PATH=SST_ELEMENTS_SRC/src/sst/elements/balar/tests/vanadis_llvm_rv64
 
 # Make Rodinia 2.0
 cd gpu-app-collection
@@ -224,4 +224,4 @@ Balar's unittest suites will automatically compile the GPU app collection with t
 
 ```bash
 sst-test-elements -w "*balar*"
-```
+```

src/sst/elements/balar/tests/testBalar_testsuite_util.py

@@ -408,7 +408,7 @@ def _setupbalarTestFiles(self):
         for f in os.listdir(self.balarElementVanadisHandshakeTestDir):
             os_symlink_file(self.balarElementVanadisHandshakeTestDir, self.testbalarVanadisHandshakeDir, f)
 
-        # Create a simlink of each file in the balar/tests/vanadisLLVMRISCV directory
+        # Create a simlink of each file in the balar/tests/vanadis_llvm_rv64 directory
         for f in os.listdir(self.balarElementLLVMVanadisTestDir):
             os_symlink_file(self.balarElementLLVMVanadisTestDir, self.testbalarLLVMVanadisDir, f)
 
@@ -430,7 +430,7 @@ def _setupbalarTestFiles(self):
 #        log_debug("Balar vanadisHandshake Make result = {0}; output =\n{1}".format(rtn.result(), rtn.output()))
 #        self.assertTrue(rtn.result() == 0, "vanadisHandshake.c failed to compile")
 
-        # Build vanadisLLVMRISCV, contains helloworld, vecadd, and the custom CUDA lib
+        # Build vanadis_llvm_rv64, contains helloworld, vecadd, and the custom CUDA lib
         cmd = "make"
         rtn = OSCommand(cmd, set_cwd=self.testbalarLLVMVanadisDir).run()
         log_debug("Balar vanadisLLVM Make result = {0}; output =\n{1}".format(rtn.result(), rtn.output()))