summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2012-07-24 16:28:39 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:47:34 -0700
commit18fda652a1c33b8b788d1f631645d516bb68a207 (patch)
tree93dad305783b1e101d6b946fa7b21af8c2fc752f
parent00406ce229d75dea2034ad285b4941d071552d4d (diff)
More beginner instructions
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13510]
-rw-r--r--CHANGES10
-rw-r--r--setup_environment10
2 files changed, 16 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index d6ccb25..af88645 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,15 +1,17 @@
CHANGE LOG:
Version 3.1.0+edits (development branch) versus 3.1.0
+- Add checks to top level makefile to ensure setup_environment is run and checks to
+ setup_environment to ensure a compatible version of CUDA is installed.
+- Change Fermi configuration folder name to GTX480.
+- Added TeslaC2050 configuration.
+- Added a two level warp scheduler (as presented at ISCA 2012 tutorial).
+- Cleaner makedepend that doesn't interfere with Makefiles
- Removed a dependency on an inhouse implementation of a string list in
cuobjdump_to_ptxplus.
- Cleaned up the information printed out to stdout/stderr during the operation
of cuobjdump_to_ptxplus.
- Change cuobjdump_to_ptxplus to use std::string instead of char*.
-- Change Fermi configuration folder name to GTX480.
-- Added TeslaC2050 configuration.
-- Added a two level warp scheduler (as presented at ISCA 2012 tutorial).
-- Cleaner makedepend that doesn't interfere with Makefiles
- Print out instructions at branch divergence/reconvergence points
- Bug Fixes:
- SIMT stack correctly handles recursive functions by allocating a new stack entry on every
diff --git a/setup_environment b/setup_environment
index 0e2fe1c..b7de5aa 100644
--- a/setup_environment
+++ b/setup_environment
@@ -1,5 +1,7 @@
# see README before running this
+export GPGPUSIM_SETUP_ENVIRONMENT_WAS_RUN=
+
if [ ! -n "$CUDA_INSTALL_PATH" ]; then
echo "ERROR ** Install CUDA Toolkit and set CUDA_INSTALL_PATH.";
return;
@@ -64,6 +66,14 @@ if [ $? = 1 ]; then
return;
fi
+CUDA_VERSION_STRING=`$CUDA_INSTALL_PATH/bin/nvcc --version | awk '/release/ {print $5;}' | sed 's/,//'`;
+CUDA_VERSION_NUMBER=`echo $CUDA_VERSION_STRING | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($1), 10*$2);}'`
+if [ $CUDA_VERSION -gt 4000 -o $CUDA_VERSION -lt 2030 ]; then
+ GPGPUSIM_VERSION_STRING=`cat version | awk '/Version/ {print $8}'`
+ echo "ERROR ** GPGPU-Sim version $GPGPUSIM_VERSION_STRING not tested with CUDA version $CUDA_VERSION_STRING (please see README)";
+ return;
+fi
+
# The following sets OPENCL_REMOTE_GPU_HOST which is used by GPGPU-Sim to
# SSH to remote node to generate PTX for OpenCL kernels when running on
# a node that does not have an NVIDIA driver installed.