Merge branch 'dev' of https://github.com/purdue-aalp/gpgpu-sim_distribution into dev

35 files changed, 15 insertions, 44 deletions

diff --git a/.travis.yml b/.travis.yml
index 7a12a1c..b38f468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: required
 
 before_install:
-    - docker pull tgrogers/gpgpu-sim_regress:latest
+    - docker pull tgrogers/gpgpu-sim_regress:volta_update
 
 language: cpp
 
@@ -10,34 +10,13 @@ matrix:
   include:
     - services: docker
       env:
-        - CONFIG=configs.gtx480.yml
+        - CONFIG=GTX480
         - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
         - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-# This config is just taking far too long...
-#    - services: docker
-#      env:
-#       - CONFIG=configs.gtx750ti.yml
-#       - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-#        - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
     - services: docker
       env:
-        - CONFIG=configs.quadro5600.yml
-        - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-        - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-    - services: docker
-      env:
-        - CONFIG=configs.quadro5800.yml
-        - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-        - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-    - services: docker
-      env:
-        - CONFIG=configs.teslac2050.yml
-        - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-        - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
-    - services: docker
-      env:
-        - CONFIG=configs.gtx1080ti.yml
-        - CUDA_INSTALL_PATH=/usr/local/cuda-4.2/
+        - CONFIG=TITANV
+        - CUDA_INSTALL_PATH=/usr/local/cuda-9.1/
         - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1/
 
-script: docker run -v `pwd`:/home/runner/gpgpu-sim_distribution:rw tgrogers/gpgpu-sim_regress:latest /bin/bash -c "./start_torque.sh; chown -R runner /home/runner/gpgpu-sim_distribution; su - runner -c 'export CUDA_INSTALL_PATH=$CUDA_INSTALL_PATH && export PTXAS_CUDA_INSTALL_PATH=$PTXAS_CUDA_INSTALL_PATH && 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 /home/runner/gpgpu-sim_simulations/util/job_launching/regression_recipies/rodinia_2.0-ft/$CONFIG -N regress && /home/runner/gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'"
+script: docker run -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=$CUDA_INSTALL_PATH && export PTXAS_CUDA_INSTALL_PATH=$PTXAS_CUDA_INSTALL_PATH && 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 $CONFIG -B rodinia_2.0-ft -N regress && /home/runner/gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'"
diff --git a/CHANGES b/CHANGES
index d40d559..60be885 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,11 @@
 LOG:
-Version 3.3.0 (development branch) versus 3.2.3
+Version 4.0.0 (development branch) versus 3.2.3
 -Front-End:
 1- Support .nc cache modifier and __ldg function to access the read-only L1D cache
-2- Partially-support some SASS_60 in the PTXP_PLUs (not completede yet)
+2- Partially-support some SASS_60 in the PTXP_PLUS (not completed yet)
 -GPU Core:
 1- Fermi/Pascal coalescer: coalescing on 32-bytes sectors.
-2- Adding separate dp, int and tenssor unit  pipeline.
+2- Adding separate dp unit pipeline.
 3- diff dual issue: allow scheduler to issue diff insts at a time
 4- Fair memory issue from multiple schedulers.
 -Cache System:
@@ -22,6 +22,7 @@ Version 3.3.0 (development branch) versus 3.2.3
 -Statistics:
 1- Adding more detailed cache statistics to define and analyze cache bottlenecks.
 2- Adding more detailed memory statistics (BLP, RBL, etc) to define and analyze memory bottlenecks.
+3- Addig new system stats: gpu occupancy, L2BW, etc
 -Configs:
 Adding the Pascal and Volta config files that has been correlated against real hardware.
 See the correlation website here: 
diff --git a/README b/README
index cb59241..7eaae5d 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ AerialVision and a configurable and extensible energy model called GPUWattch.
 GPGPU-Sim and GPUWattch have been rigorously validated with performance and
 power measurements of real hardware GPUs. 
 
-This version of GPGPU-Sim has been tested with CUDA version 2.3, 3.1, 4.0, 
-5.0, 5.5, 6.0 and 7.5.
+This version of GPGPU-Sim has been tested with CUDA version 4.2,
+5.0, 5.5, 6.0 and 7.5, 8.0, 9.0, 9.1
 
 Please see the copyright notice in the file COPYRIGHT distributed with this
 release in the same directory as this file.
@@ -18,9 +18,10 @@ Analyzing CUDA Workloads Using a Detailed GPU Simulator, in IEEE International
 Symposium on Performance Analysis of Systems and Software (ISPASS), Boston, MA,
 April 19-21, 2009.
 
-If you use GPGPU-Sim 3.3 version in your research, please cite:
+If you use the memory system in GPGPU-Sim, or the Volta/Pascal models,
+please cite:
 Mahmoud Khairy, Jain Akshay, Tor Aamodt, Timothy G Rogers,
-" Exploring Modern GPU Memory System Design Challenges through Accurate Modeling", arXiv:1810.07269, 
+Exploring Modern GPU Memory System Design Challenges through Accurate Modeling, arXiv:1810.07269, 
 https://arxiv.org/abs/1810.07269
 
 If you use the GPUWattch energy model in your research, please cite:
@@ -43,16 +44,6 @@ Complex Dynamics in Many-Core Accelerator Architectures, In Proceedings of the
 IEEE International Symposium on Performance Analysis of Systems and Software
 (ISPASS), pp. 164-174, White Plains, NY, March 28-30, 2010.
 
-On-progress work (to be released soon):
-Currently, we extensivly update our gpgpu-sim infrastructure. This contains:
-1- Change the Functional model to be trace-driven-based and support the moden machine Pascal SASS 6.0 ISA.
-2- Adding Volta Core model  (including the Tensor Core support)
-3- Supporting Nvidia dev libraries (CuBLAS, CUDNN, etc)
-4- Supporting NUMA multi-chip GPU systems.
-5- Heterogeneous memory support (HBM, NVRAM and GDDR5X)
-6- Integrating with SST infrastructure.
-7- Updating and improving the accuracy the GPUWATTCH to model Pascal and Volta.
-
 This file contains instructions on installing, building and running GPGPU-Sim.
 Detailed documentation on what GPGPU-Sim models, how to configure it, and a
 guide to the source code can be found here: <http://gpgpu-sim.org/manual/>.
diff --git a/configs/3.x-cfgs/GTX480/config_fermi_islip.icnt b/configs/deprecated-cfgs/GTX480/config_fermi_islip.icnt
index 7820e4e..7820e4e 100644
--- a/configs/3.x-cfgs/GTX480/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/GTX480/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/GTX480/gpgpusim.config b/configs/deprecated-cfgs/GTX480/gpgpusim.config
index ee90c12..ee90c12 100644
--- a/configs/3.x-cfgs/GTX480/gpgpusim.config
+++ b/configs/deprecated-cfgs/GTX480/gpgpusim.config
diff --git a/configs/3.x-cfgs/GTX480/gpuwattch_gtx480.xml b/configs/deprecated-cfgs/GTX480/gpuwattch_gtx480.xml
index 304e0fd..304e0fd 100755
--- a/configs/3.x-cfgs/GTX480/gpuwattch_gtx480.xml
+++ b/configs/deprecated-cfgs/GTX480/gpuwattch_gtx480.xml
diff --git a/configs/3.x-cfgs/GeForceGTX750Ti/config_fermi_islip.icnt b/configs/deprecated-cfgs/GeForceGTX750Ti/config_fermi_islip.icnt
index 069ca02..069ca02 100644
--- a/configs/3.x-cfgs/GeForceGTX750Ti/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/GeForceGTX750Ti/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/GeForceGTX750Ti/gpgpusim.config b/configs/deprecated-cfgs/GeForceGTX750Ti/gpgpusim.config
index c675aab..c675aab 100644
--- a/configs/3.x-cfgs/GeForceGTX750Ti/gpgpusim.config
+++ b/configs/deprecated-cfgs/GeForceGTX750Ti/gpgpusim.config
diff --git a/configs/3.x-cfgs/GeForceGTX750Ti/gpuwattch_gtx750Ti.xml b/configs/deprecated-cfgs/GeForceGTX750Ti/gpuwattch_gtx750Ti.xml
index e2b2324..e2b2324 100755
--- a/configs/3.x-cfgs/GeForceGTX750Ti/gpuwattch_gtx750Ti.xml
+++ b/configs/deprecated-cfgs/GeForceGTX750Ti/gpuwattch_gtx750Ti.xml
diff --git a/configs/3.x-cfgs/QuadroFX5600/gpgpusim.config b/configs/deprecated-cfgs/QuadroFX5600/gpgpusim.config
index 6f836ee..6f836ee 100644
--- a/configs/3.x-cfgs/QuadroFX5600/gpgpusim.config
+++ b/configs/deprecated-cfgs/QuadroFX5600/gpgpusim.config
diff --git a/configs/3.x-cfgs/QuadroFX5600/gpuwattch_quadrofx5600.xml b/configs/deprecated-cfgs/QuadroFX5600/gpuwattch_quadrofx5600.xml
index 2c5a6fc..2c5a6fc 100644
--- a/configs/3.x-cfgs/QuadroFX5600/gpuwattch_quadrofx5600.xml
+++ b/configs/deprecated-cfgs/QuadroFX5600/gpuwattch_quadrofx5600.xml
diff --git a/configs/3.x-cfgs/QuadroFX5600/icnt_config_islip.icnt b/configs/deprecated-cfgs/QuadroFX5600/icnt_config_islip.icnt
index de3bcc8..de3bcc8 100644
--- a/configs/3.x-cfgs/QuadroFX5600/icnt_config_islip.icnt
+++ b/configs/deprecated-cfgs/QuadroFX5600/icnt_config_islip.icnt
diff --git a/configs/3.x-cfgs/QuadroFX5800/config_quadro_islip.icnt b/configs/deprecated-cfgs/QuadroFX5800/config_quadro_islip.icnt
index cfe9cac..cfe9cac 100644
--- a/configs/3.x-cfgs/QuadroFX5800/config_quadro_islip.icnt
+++ b/configs/deprecated-cfgs/QuadroFX5800/config_quadro_islip.icnt
diff --git a/configs/3.x-cfgs/QuadroFX5800/gpgpusim.config b/configs/deprecated-cfgs/QuadroFX5800/gpgpusim.config
index fef1110..fef1110 100644
--- a/configs/3.x-cfgs/QuadroFX5800/gpgpusim.config
+++ b/configs/deprecated-cfgs/QuadroFX5800/gpgpusim.config
diff --git a/configs/3.x-cfgs/SM6_GTX1080/config_fermi_islip.icnt b/configs/deprecated-cfgs/SM6_GTX1080/config_fermi_islip.icnt
index 2a69ddd..2a69ddd 100644
--- a/configs/3.x-cfgs/SM6_GTX1080/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/SM6_GTX1080/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/SM6_GTX1080/gpgpusim.config b/configs/deprecated-cfgs/SM6_GTX1080/gpgpusim.config
index fb044c6..fb044c6 100644
--- a/configs/3.x-cfgs/SM6_GTX1080/gpgpusim.config
+++ b/configs/deprecated-cfgs/SM6_GTX1080/gpgpusim.config
diff --git a/configs/3.x-cfgs/SM6_GTX1080/gpuwattch_gtx1080Ti.xml b/configs/deprecated-cfgs/SM6_GTX1080/gpuwattch_gtx1080Ti.xml
index 02619ff..02619ff 100755
--- a/configs/3.x-cfgs/SM6_GTX1080/gpuwattch_gtx1080Ti.xml
+++ b/configs/deprecated-cfgs/SM6_GTX1080/gpuwattch_gtx1080Ti.xml
diff --git a/configs/3.x-cfgs/SM6_P100/config_fermi_islip.icnt b/configs/deprecated-cfgs/SM6_P100/config_fermi_islip.icnt
index d26c8d9..d26c8d9 100644
--- a/configs/3.x-cfgs/SM6_P100/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/SM6_P100/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/SM6_P100/gpgpusim.config b/configs/deprecated-cfgs/SM6_P100/gpgpusim.config
index a5e6736..a5e6736 100644
--- a/configs/3.x-cfgs/SM6_P100/gpgpusim.config
+++ b/configs/deprecated-cfgs/SM6_P100/gpgpusim.config
diff --git a/configs/3.x-cfgs/SM6_P100/gpuwattch_gtx480.xml b/configs/deprecated-cfgs/SM6_P100/gpuwattch_gtx480.xml
index 304e0fd..304e0fd 100755
--- a/configs/3.x-cfgs/SM6_P100/gpuwattch_gtx480.xml
+++ b/configs/deprecated-cfgs/SM6_P100/gpuwattch_gtx480.xml
diff --git a/configs/3.x-cfgs/SM6_TITANX/config_fermi_islip.icnt b/configs/deprecated-cfgs/SM6_TITANX/config_fermi_islip.icnt
index 602daee..602daee 100644
--- a/configs/3.x-cfgs/SM6_TITANX/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/SM6_TITANX/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/SM6_TITANX/gpgpusim.config b/configs/deprecated-cfgs/SM6_TITANX/gpgpusim.config
index 28912a3..28912a3 100644
--- a/configs/3.x-cfgs/SM6_TITANX/gpgpusim.config
+++ b/configs/deprecated-cfgs/SM6_TITANX/gpgpusim.config
diff --git a/configs/3.x-cfgs/SM6_TITANX/gpuwattch_gtx480.xml b/configs/deprecated-cfgs/SM6_TITANX/gpuwattch_gtx480.xml
index 304e0fd..304e0fd 100755
--- a/configs/3.x-cfgs/SM6_TITANX/gpuwattch_gtx480.xml
+++ b/configs/deprecated-cfgs/SM6_TITANX/gpuwattch_gtx480.xml
diff --git a/configs/3.x-cfgs/SM7_TITANV/config_fermi_islip.icnt b/configs/deprecated-cfgs/SM7_TITANV/config_fermi_islip.icnt
index fac792a..fac792a 100644
--- a/configs/3.x-cfgs/SM7_TITANV/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/SM7_TITANV/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/SM7_TITANV/gpgpusim.config b/configs/deprecated-cfgs/SM7_TITANV/gpgpusim.config
index aefb04a..aefb04a 100644
--- a/configs/3.x-cfgs/SM7_TITANV/gpgpusim.config
+++ b/configs/deprecated-cfgs/SM7_TITANV/gpgpusim.config
diff --git a/configs/3.x-cfgs/TeslaC2050/config_fermi_islip.icnt b/configs/deprecated-cfgs/TeslaC2050/config_fermi_islip.icnt
index a11bd8e..a11bd8e 100644
--- a/configs/3.x-cfgs/TeslaC2050/config_fermi_islip.icnt
+++ b/configs/deprecated-cfgs/TeslaC2050/config_fermi_islip.icnt
diff --git a/configs/3.x-cfgs/TeslaC2050/gpgpusim.config b/configs/deprecated-cfgs/TeslaC2050/gpgpusim.config
index 6ac2c12..6ac2c12 100644
--- a/configs/3.x-cfgs/TeslaC2050/gpgpusim.config
+++ b/configs/deprecated-cfgs/TeslaC2050/gpgpusim.config
diff --git a/configs/4.x-cfgs/SM2_GTX480/config_fermi_islip.icnt b/configs/tested-cfgs/SM2_GTX480/config_fermi_islip.icnt
index c399db9..c399db9 100644
--- a/configs/4.x-cfgs/SM2_GTX480/config_fermi_islip.icnt
+++ b/configs/tested-cfgs/SM2_GTX480/config_fermi_islip.icnt
diff --git a/configs/4.x-cfgs/SM2_GTX480/gpgpusim.config b/configs/tested-cfgs/SM2_GTX480/gpgpusim.config
index 4096b09..4096b09 100644
--- a/configs/4.x-cfgs/SM2_GTX480/gpgpusim.config
+++ b/configs/tested-cfgs/SM2_GTX480/gpgpusim.config
diff --git a/configs/4.x-cfgs/SM2_GTX480/gpuwattch_gtx480.xml b/configs/tested-cfgs/SM2_GTX480/gpuwattch_gtx480.xml
index 304e0fd..304e0fd 100755
--- a/configs/4.x-cfgs/SM2_GTX480/gpuwattch_gtx480.xml
+++ b/configs/tested-cfgs/SM2_GTX480/gpuwattch_gtx480.xml
diff --git a/configs/4.x-cfgs/SM6_TITANX/config_fermi_islip.icnt b/configs/tested-cfgs/SM6_TITANX/config_fermi_islip.icnt
index dec4789..dec4789 100644
--- a/configs/4.x-cfgs/SM6_TITANX/config_fermi_islip.icnt
+++ b/configs/tested-cfgs/SM6_TITANX/config_fermi_islip.icnt
diff --git a/configs/4.x-cfgs/SM6_TITANX/gpgpusim.config b/configs/tested-cfgs/SM6_TITANX/gpgpusim.config
index ed35531..ed35531 100644
--- a/configs/4.x-cfgs/SM6_TITANX/gpgpusim.config
+++ b/configs/tested-cfgs/SM6_TITANX/gpgpusim.config
diff --git a/configs/4.x-cfgs/SM7_TITANV/config_fermi_islip.icnt b/configs/tested-cfgs/SM7_TITANV/config_fermi_islip.icnt
index 615d0a9..615d0a9 100644
--- a/configs/4.x-cfgs/SM7_TITANV/config_fermi_islip.icnt
+++ b/configs/tested-cfgs/SM7_TITANV/config_fermi_islip.icnt
diff --git a/configs/4.x-cfgs/SM7_TITANV/gpgpusim.config b/configs/tested-cfgs/SM7_TITANV/gpgpusim.config
index 03ef5b9..03ef5b9 100644
--- a/configs/4.x-cfgs/SM7_TITANV/gpgpusim.config
+++ b/configs/tested-cfgs/SM7_TITANV/gpgpusim.config
diff --git a/version b/version
index c33c361..1a1a990 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 3.3.0 ";
+const char *g_gpgpusim_version_string = "GPGPU-Sim Simulator Version 4.0.0 ";