Merge pull request #85 from deval281shah/dev

changes for older cuda version support

4 files changed, 20 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 5f9e964..b38f468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ matrix:
     - services: docker
       env:
         - CONFIG=GTX480
-        - CUDA_INSTALL_PATH=/usr/local/cuda-9.1/
-        - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1/
+        - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
+        - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
     - services: docker
       env:
         - CONFIG=TITANV
diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc
index 4b50e34..95a3c24 100644
--- a/libcuda/cuda_runtime_api.cc
+++ b/libcuda/cuda_runtime_api.cc
@@ -378,7 +378,7 @@ struct _cuda_device_id *GPGPUSim_Init()
 		prop->textureAlignment = 0;
 //        * TODO: Update the .config and xml files of all GPU config files with new value of sharedMemPerBlock and regsPerBlock 
 	        prop->sharedMemPerBlock = the_gpu->shared_mem_per_block();
-#if (CUDART_VERSION > 5000)
+#if (CUDART_VERSION > 5050)
 		prop->regsPerMultiprocessor = the_gpu->num_registers_per_core();
   	        prop->sharedMemPerMultiprocessor = the_gpu->shared_mem_size();
 #endif	
@@ -1135,12 +1135,14 @@ __host__ cudaError_t CUDARTAPI cudaDeviceGetAttribute(int *value, enum cudaDevic
                 case 80:
                         *value= 0;
                         break;
+		#if (CUDART_VERSION > 5050)
 		case 81:
                         *value= prop->sharedMemPerMultiprocessor;
                         break;
                 case 82:
                         *value= prop->regsPerMultiprocessor;
                         break;
+		#endif
                 case 83:
                 case 84:
                 case 85:
@@ -1761,14 +1763,6 @@ int CUDARTAPI __cudaSynchronizeThreads(void**, void*)
  *                                                                              *
  *******************************************************************************/
 
-#if (CUDART_VERSION >= 3010 && CUDART_VERSION < 8000)
-
-typedef struct CUuuid_st {                                /**< CUDA definition of UUID */
-    char bytes[16];
-} CUuuid;
-
-#endif
-
 #if (CUDART_VERSION >= 3010)
 int dummy0() {
 	if(g_debug_execution >= 3){
@@ -3403,7 +3397,7 @@ CUresult CUDAAPI cuDeviceTotalMem(size_t *bytes, CUdevice dev)
 	return CUDA_SUCCESS;
 }
 #endif /* CUDART_VERSION >= 3020 */
-
+#if (CUDART_VERSION > 5000)
 CUresult CUDAAPI cuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevice dev)
 {
 	if(g_debug_execution >= 3){
@@ -3414,7 +3408,7 @@ CUresult CUDAAPI cuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevi
 
 	return CUDA_SUCCESS;
 }
-
+#endif
 CUresult CUDAAPI cuDeviceGetProperties(CUdevprop *prop, CUdevice dev)
 {
 	if(g_debug_execution >= 3){
@@ -3746,7 +3740,7 @@ CUresult CUDAAPI cuModuleGetSurfRef(CUsurfref *pSurfRef, CUmodule hmod, const ch
 	return CUDA_SUCCESS;
 }
 
-#if CUDART_VERSION >= 5050
+#if CUDART_VERSION >= 6050
 
 CUresult CUDAAPI
 cuLinkCreate(unsigned int numOptions, CUjit_option *options, void **optionValues, CUlinkState *stateOut)
@@ -3802,6 +3796,9 @@ cuLinkAddFile(CUlinkState state, CUjitInputType type, const char *path,
     addedFile = true;
 	return CUDA_SUCCESS;
 }
+#endif
+
+#if CUDART_VERSION >= 5050
 
 CUresult CUDAAPI
 cuLinkComplete(CUlinkState state, void **cubinOut, size_t *sizeOut)
@@ -3999,7 +3996,7 @@ CUresult CUDAAPI cuIpcCloseMemHandle(CUdeviceptr dptr)
 
 #endif /* CUDART_VERSION >= 4010 */
 
-#if CUDART_VERSION >= 4000
+#if CUDART_VERSION >= 6050
 CUresult CUDAAPI cuMemHostRegister(void *p, size_t bytesize, unsigned int Flags)
 {
 	if(g_debug_execution >= 3){
@@ -4008,6 +4005,8 @@ CUresult CUDAAPI cuMemHostRegister(void *p, size_t bytesize, unsigned int Flags)
 	printf("WARNING: this function has not been implemented yet.");
 	return CUDA_SUCCESS;
 }
+#endif
+#if CUDART_VERSION >= 4000
 
 CUresult CUDAAPI cuMemHostUnregister(void *p)
 {
diff --git a/new b/new
index 69d875a..064543f 100644
--- a/new
+++ b/new
@@ -1,5 +1,4 @@
-sudo docker run --dns 206.87.227.99 --privileged -v `pwd`:/home/runner/gpgpu-sim_distribution:rw tgrogers/gpgpu-sim_regress:volta_update /bin/bash -c "./start_torque.sh; chown -R runner /home/runner/gpgpu-sim_distribution; su - runner -c 'export CUDA_INSTALL_PATH=/usr/local/cuda-9.1/ && export PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1/ && make clean -C /home/runner/gpgpu-sim_distribution && source /home/runner/gpgpu-sim_distribution/setup_environment && make -j -C /home/runner/gpgpu-sim_distribution && cd /home/runner/gpgpu-sim_simulations/ && git pull && /home/runner/gpgpu-sim_simulations/util/job_launching/run_simulations.py -C GTX480 -B rodinia_2.0-ft -N regress && /home/runner/gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'"
-sudo docker run --dns 206.87.227.99 --privileged -v `pwd`:/home/runner/gpgpu-sim_distribution:rw tgrogers/gpgpu-sim_regress:volta_update /bin/bash -c "./start_torque.sh; chown -R runner /home/runner/gpgpu-sim_distribution; su - runner -c 'export CUDA_INSTALL_PATH=/usr/local/cuda-9.1/ && export PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1/ && make clean -C /home/runner/gpgpu-sim_distribution && source /home/runner/gpgpu-sim_distribution/setup_environment && make -j -C /home/runner/gpgpu-sim_distribution && cd /home/runner/gpgpu-sim_simulations/ && git pull && /home/runner/gpgpu-sim_simulations/util/job_launching/run_simulations.py -C TITANV -B rodinia_2.0-ft -N regress && /home/runner/gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'"
+sudo docker run --dns 206.87.227.99 --privileged -v `pwd`:/home/runner/gpgpu-sim_distribution:rw tgrogers/gpgpu-sim_regress:volta_update /bin/bash -c "./start_torque.sh; chown -R runner /home/runner/gpgpu-sim_distribution; su - runner -c 'export CUDA_INSTALL_PATH=/usr/local/cuda-4.2/ && export PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/ && make clean -C /home/runner/gpgpu-sim_distribution && source /home/runner/gpgpu-sim_distribution/setup_environment && make -j -C /home/runner/gpgpu-sim_distribution && cd /home/runner/gpgpu-sim_simulations/ && git pull && /home/runner/gpgpu-sim_simulations/util/job_launching/run_simulations.py -C GTX480 -B rodinia_2.0-ft -N regress && /home/runner/gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'"
 #    - services: docker
 #      env:
 #        - CONFIG=GTX480
diff --git a/setup_environment b/setup_environment
index 0fee641..b420584 100644
--- a/setup_environment
+++ b/setup_environment
@@ -4,9 +4,6 @@ ps -p $$ | awk '/bash/ || / sh/ || /zsh/ {exit 1;}' && echo "WARNING ** source s
 
 export GPGPUSIM_SETUP_ENVIRONMENT_WAS_RUN=
 export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
-export PTX_SIM_USE_PTX_FILE=1.ptx
-export PTX_SIM_KERNELFILE=_1.ptx
-export CUOBJDUMP_SIM_FILE=jj
 
 GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'`
 #Detect Git branch and commit #
@@ -59,6 +56,11 @@ if [ $CUDA_VERSION_NUMBER -gt 9100 -o $CUDA_VERSION_NUMBER -lt 2030  ]; then
 	return
 fi
 
+if [ $CUDA_VERSION_NUMBER -ge 6000 ]; then
+	export PTX_SIM_USE_PTX_FILE=1.ptx
+	export PTX_SIM_KERNELFILE=_1.ptx
+	export CUOBJDUMP_SIM_FILE=jj
+fi
 
 
 if [ $# = '1' ] ;