version 3.2.1

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

3 files changed, 8 insertions, 7 deletions

diff --git a/CHANGES b/CHANGES
index 0cd317f..e5faaf1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 LOG:
-Version 3.2.0+edits (development branch) versus 3.2.0
+Version 3.2.1 versus 3.2.0
 - Added kernel name and launch uids to performance statistics log.
 - Added l2_cache_config class to extend baseline cache_config. Allows for
   custom, L2 cache specific functions (such as tag/set index
@@ -71,9 +71,9 @@ Version 3.2.0+edits (development branch) versus 3.2.0
       treat zero as false and non-zero as true). 
     - Fix for bug 47 - Issue with generating PTXPLUS with global __device__ 
       variables: Expecting ".nv.global", provided ".nv.global.init". 
-	- Fixing GPUWattch McPAT Makefile to use -m32 for 32 bit and -m64
+    - Fixing GPUWattch McPAT Makefile to use -m32 for 32 bit and -m64
       for 64 bit Linux. 
-	- Fix for [Bug 43] Incorrect power results - new gpuwattch_gtx480.xml file
+    - Fix for [Bug 43] Incorrect power results - new gpuwattch_gtx480.xml file
         
 Version 3.2.0 versus 3.1.2
 - Added GPUWattch GPGPU power model based on McPAT 0.8beta. 
diff --git a/README b/README
index c862f9d..7a8b7fd 100644
--- a/README
+++ b/README
@@ -19,9 +19,10 @@ April 19-21, 2009.
 
 In addition, if you use the GPUWattch energy model in your research, please cite:
 
-Jingwen Leng, Syed Gilani, Ahmed ElTantawy, Tayler Hetherington, Nam Sung Kim,
-Tor M. Aamodt, Vijay Janapa Reddi, GPUWattch Energy Model Manual, 2013.
-http://gpgpu-sim.org/gpuwattch/
+Jingwen Leng, Syed Gilani, Tayler Hetherington, Ahmed ElTantawy, Nam Sung Kim,
+Tor M. Aamodt, Vijay Janapa Reddi, GPUWattch: Enabling Energy Optimizations in
+GPGPUs, In proceedings of the ACM/IEEE International Symposium on Computer
+Architecture (ISCA 2013), Tel-Aviv, Israel, June 23-27, 2013.
 
 If you use figures plotted using AerialVision in your publications, please cite:
 
diff --git a/version b/version
index 7b22bfc..6f770c8 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
-const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.2.0+edits (development branch) ";
+const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.2.1 ";
 const char *g_gpgpusim_build_string   =  "$Change$";