more updates -- 3.0.1 release?

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 11015]

2 files changed, 29 insertions, 21 deletions

diff --git a/README b/README
index 79f0d77..40a4898 100644
--- a/README
+++ b/README
@@ -56,21 +56,28 @@ version 11.1 and Ubuntu 10.04.3 LTS (32 bits).
 Step 1: Dependencies
 ====================
 
-Download and install the CUDA Toolkit.  To use ptxplus (native hardware
-instructions) you must currently use the CUDA Toolkit version 2.3. Otherwise
-use CUDA 3.1.
+Download and install version 3.1 of the CUDA Toolkit.  To use ptxplus (native
+hardware instructions) you must currently use the CUDA Toolkit version 2.3.
+Otherwise use CUDA 3.1.  GPGPU-Sim does not yet support CUDA 4.x.  Note that it
+is possible to have multiple versions of the CUDA toolkit installed on a single
+system -- just install them in different directories and update the
+setup_environment script to point to the version you want to use.
 
-If you want to run OpenCL on the simulator, download and install NVIDIA's
-OpenCL driver from <http://developer.nvidia.com/object/opencl-download.html>.
-Update your PATH and LD_LIBRARY_PATH as indicated by the NVIDIA install
-scripts. Note that you will need to use the lib64 directory if you are using a
-64bit machine.
+[Optional] If you want to run OpenCL on the simulator, download and install
+NVIDIA's OpenCL driver from <http://developer.nvidia.com/opencl>.  Update your
+PATH and LD_LIBRARY_PATH as indicated by the NVIDIA install scripts. Note that
+you will need to use the lib64 directory if you are using a 64bit machine.  We
+have tested OpenCL on GPGPU-Sim using NVIDIA driver version 256.40
+<http://developer.download.nvidia.com/compute/cuda/3_1/drivers/devdriver_3.1_linux_64_256.40.run>
+Note the most recent version of the NVIDIA driver produces PTX that is
+incompatible with this version of GPGPU-Sim.
 
 Ensure you have gcc, g++, make, makedepend, zlib, bison and flex installed on
-your system.  For CUDA 3.1 we used gcc/g++ version 4.5.1, for CUDA 2.3 we used
-gcc/g++ version 4.3.2, for CUDA 1.1 we used gcc/g++ version 4.1.3.  This
-version of GPGPU-Sim does not yet work with CUDA 4.x; We used bison version
-2.3, and flex version 2.5.33.  
+your system.  For CUDA 3.1 we used gcc/g++ version 4.3.2 (if using the CUDA 3.1
+SDK) or 4.5.1 (if not using the CUDA SDK), for CUDA 2.3 we used gcc/g++ version
+4.3.2, for CUDA 1.1 we used gcc/g++ version 4.1.3.  This version of GPGPU-Sim
+does not yet work with CUDA 4.x; We used bison version 2.3, and flex version
+2.5.33.  
 
 If you are using Ubuntu, the following commands will install all required
 dependencies besides the CUDA Toolkit.
@@ -89,8 +96,8 @@ Step 2: Build
 =============
 
 Read the file setup_environment and modify CUDA_INSTALL_PATH to match the
-location of the CUDA toolkit compute SDK on your system. Then, from a bash
-shell, type the following in this directory:
+location of the CUDA toolkit on your system. Then, from a bash shell, type the
+following in this directory:
 
 	source setup_environment
 
@@ -102,7 +109,7 @@ to debug it, then run
 
 then "make" again.
 
-[optional]: Type "make docs" in this directory to build the doxygen
+[Optional]: Type "make docs" in this directory to build the doxygen
 documentation. You need to have doxygen and graphviz installed for this to
 work.  "make cleandocs" will remove the generated documentation. The
 documentation resides at doc/doxygen/html.
@@ -142,3 +149,7 @@ saved as _0.ptx, _1.ptx, etc...).
 If you need to run the set of applications in the NVIDIA CUDA SDK code
 samples then you will need to download, install and build the SDK.
 
+3. Documentation
+
+For this release the only documentation is that generated by Doxygen. A more
+complete set of documentation is forthcoming.
diff --git a/setup_environment b/setup_environment
index 2a0b89a..7e7fdcf 100644
--- a/setup_environment
+++ b/setup_environment
@@ -1,12 +1,9 @@
 # see README before running this
 
 # change the following to point to your installation of CUDA Toolkit
-# and your installation of the NVIDIA compute SDK
-export CUDA_INSTALL_PATH=/home/taamodt/nvcuda/3.1/cuda
-export NVIDIA_COMPUTE_SDK_LOCATION=$HOME/NVIDIA_GPU_Computing_SDK/
-
-# used in commmon/common.mk:
-export NVIDIA_CUDA_SDK_LOCATION=$NVIDIA_COMPUTE_SDK_LOCATION/
+if [ ! -n "$CUDA_INSTALL_PATH" ]; then
+	export CUDA_INSTALL_PATH=/home/taamodt/nvcuda/3.1/cuda
+fi
 
 # to run the debug build of GPGPU-Sim run:
 # source setup_environment debug