Merge branch '1.1.0-prerelease' into release

Author: tgrogers

Jenkinsfile

@@ -16,26 +16,29 @@ pipeline {
         }
         stage('accel-sim-build'){
             steps{
-                sh '''#!/bin/bash
+                sh '''#!/bin/bash -xe
                 source ./env-setup/11.0_env_setup.sh
                 rm -rf ./gpu-simulator/gpgpu-sim
                 source ./gpu-simulator/setup_environment.sh
+                make -j -C gpu-simulator
+                make clean -C gpu-simulator
                 make -j -C gpu-simulator'''
             }
         }
         stage('rodinia_2.0-ft'){
             steps{
                 parallel "sass": {
-                sh '''#!/bin/bash
+                sh '''#!/bin/bash -xe
                 source ./env-setup/11.0_env_setup.sh
                 source ./gpu-simulator/setup_environment.sh
                 ./util/job_launching/run_simulations.py -B rodinia_2.0-ft -C QV100-SASS -T ~/../common/accel-sim/traces/tesla-v100/latest/rodinia_2.0-ft/9.1/ -N rodinia_2.0-ft-sass-$$
                 ./util/job_launching/monitor_func_test.py -I -v -s rodinia-stats-per-app-sass.csv -N rodinia_2.0-ft-sass-$$'''
                }, "ptx": {
-                sh '''#!/bin/bash
+                sh '''#!/bin/bash -xe
                 source ./env-setup/11.0_env_setup.sh
                 source ./gpu-simulator/setup_environment.sh
 
+                rm -rf ./gpu-app-collection
                 git clone git@github.com:accel-sim/gpu-app-collection.git
                 source ./gpu-app-collection/src/setup_environment
                 make rodinia_2.0-ft -j -C ./gpu-app-collection/src

README.md

@@ -112,6 +112,12 @@ the apps in from this collection as well as just on your own, with your own apps
     ./util/job_launching/get_stats.py -N myTest | tee stats.csv
     ```
 
+    If you want to run the accel-sim.out executable command itself for specific workload, you can use:
+    ```bash
+    /gpu-simulator/bin/release/accel-sim.out -trace ./hw_run/rodinia_2.0-ft/9.1/backprop-rodinia-2.0-ft/4096___data_result_4096_txt/traces/kernelslist.g -config ./gpu-simulator/gpgpu-sim/configs/tested-cfgs/SM7_QV100/gpgpusim.config -config ./gpu-simulator/configs/tested-cfgs/SM7_QV100/trace.config
+    ```
+    However, we encourage you to use our workload launch manager 'run_simulations' script as shown above, which will greatly simplify the simulation process and increase productivity.
+
     To understand what is going on and how to just run the simulator in isolation without the framework, read [this](https://github.com/accel-sim/accel-sim-framework/tree/dev/util/job_launching/README.md).  
 
 3. **Accel-Sim Correlator**: A tool that matches, plots and correlates statistics from the performance model with real hardware statistics generated by profiling tools. To use the correlator, you must first generate hardware output and simulation statistics. To generate output from the GPU, use the scripts in [./util/hw_stats](./util/hw_stats).

get-accel-sim-traces.py

@@ -7,6 +7,7 @@
 import sys
 from subprocess import Popen, STDOUT
 
+VERSION = "1.1.0"
 WEB_DIRECTORY = "ftp://ftp.ecn.purdue.edu/tgrogers/accel-sim/traces/"
 this_directory = os.path.dirname(os.path.realpath(__file__)) + "/"
 
@@ -60,7 +61,7 @@ def getTotalUncompressed(self):
         return total
 
 def downloadTrace(cardName, suiteName):
-    webFile = os.path.join(WEB_DIRECTORY, cardName, "latest", suiteName + ".tgz")
+    webFile = os.path.join(WEB_DIRECTORY, cardName, VERSION + ".latest", suiteName + ".tgz")
     print "\n\nDownloading {0}".format(webFile)
     wget = Popen(["wget " + webFile], stderr=STDOUT, shell=True)
     wget.communicate()
@@ -79,17 +80,17 @@ def main():
         os.makedirs(hw_run_dir)
     os.chdir(hw_run_dir)
     # Parse the trace summary
-    trace_summary = os.path.join(hw_run_dir, "trace.summary.txt")
+    trace_summary = os.path.join(hw_run_dir, VERSION + ".trace.summary.txt")
     try:
         os.remove(trace_summary)
     except OSError:
         pass
 
     Popen(["wget " + " " +
-            WEB_DIRECTORY + "trace.summary.txt" ],
+            WEB_DIRECTORY + VERSION + ".trace.summary.txt" ],
           stderr=STDOUT, shell=True).communicate()
 
-    lineFormat = re.compile(r"(.*)\t(.*)/latest/(.*)")
+    lineFormat = re.compile(r"(.*)\t(.*)/" + VERSION + ".latest/(.*)")
     sizeDict = {}
     for line in open(trace_summary):
         lineMatch = lineFormat.match(line)

…tor/trace-driven/ISA_Def/kepler_opcode.h gpu-simulator/ISA_Def/kepler_opcode.hgpu-simulator/trace-driven/ISA_Def/kepler_opcode.h renamed to gpu-simulator/ISA_Def/kepler_opcode.h gpu-simulator/trace-driven/ISA_Def/kepler_opcode.h renamed to gpu-simulator/ISA_Def/kepler_opcode.h

@@ -10,7 +10,6 @@
 #include <unordered_map>
 
 #define KEPLER_BINART_VERSION 35
-#define KEPLER_SHARED_MEMORY_VIRTIAL_ADDRESS_START 0x00007f2c60000000
 
 // TO DO: moving this to a yml or def files
 

…tor/trace-driven/ISA_Def/pascal_opcode.h gpu-simulator/ISA_Def/pascal_opcode.hgpu-simulator/trace-driven/ISA_Def/pascal_opcode.h renamed to gpu-simulator/ISA_Def/pascal_opcode.h gpu-simulator/trace-driven/ISA_Def/pascal_opcode.h renamed to gpu-simulator/ISA_Def/pascal_opcode.h

@@ -12,8 +12,6 @@
 #define PASCAL_TITANX_BINART_VERSION 61
 #define PASCAL_P100_BINART_VERSION 60
 
-#define PASCAL_SHARED_MEMORY_VIRTIAL_ADDRESS_START 0x00007f2c60000000
-
 // TO DO: moving this to a yml or def files
 
 /// Pascal SM_61 ISA

…ator/trace-driven/ISA_Def/trace_opcode.h gpu-simulator/ISA_Def/trace_opcode.hgpu-simulator/trace-driven/ISA_Def/trace_opcode.h renamed to gpu-simulator/ISA_Def/trace_opcode.h gpu-simulator/trace-driven/ISA_Def/trace_opcode.h renamed to gpu-simulator/ISA_Def/trace_opcode.h

@@ -10,7 +10,6 @@
 #include <unordered_map>
 
 #define TURING_BINART_VERSION 75
-#define TURING_SHARED_MEMORY_VIRTIAL_ADDRESS_START 0x00007f2c60000000
 
 // TO DO: moving this to a yml or def files
 

…tor/trace-driven/ISA_Def/turing_opcode.h gpu-simulator/ISA_Def/turing_opcode.hgpu-simulator/trace-driven/ISA_Def/turing_opcode.h renamed to gpu-simulator/ISA_Def/turing_opcode.h gpu-simulator/trace-driven/ISA_Def/turing_opcode.h renamed to gpu-simulator/ISA_Def/turing_opcode.h

@@ -10,7 +10,6 @@
 #include <unordered_map>
 
 #define VOLTA_BINART_VERSION 70
-#define VOLTA_SHARED_MEMORY_VIRTIAL_ADDRESS_START 0x00007f2c60000000
 
 // TO DO: moving this to a yml or def files
 

…ator/trace-driven/ISA_Def/volta_opcode.h gpu-simulator/ISA_Def/volta_opcode.hgpu-simulator/trace-driven/ISA_Def/volta_opcode.h renamed to gpu-simulator/ISA_Def/volta_opcode.h gpu-simulator/trace-driven/ISA_Def/volta_opcode.h renamed to gpu-simulator/ISA_Def/volta_opcode.h

@@ -37,9 +37,9 @@ else
 endif
 
 ifeq ($(DEBUG),1)
-	CXXFLAGS = -Wall -O0 -g3 -fPIC
+	CXXFLAGS = -Wall -O0 -g3 -fPIC -std=c++11
 else
-	CXXFLAGS = -Wall -O3 -g3 -fPIC
+	CXXFLAGS = -Wall -O3 -g3 -fPIC -std=c++11
 endif
 
 all: $(BIN_DIR)/accel-sim.out
@@ -59,11 +59,11 @@ checkenv: makedirs
 		exit 1; \
 	fi
 
-$(BIN_DIR)/accel-sim.out: trace-driven gpgpu-sim makedirs $(BUILD_DIR)/main.o version
+$(BIN_DIR)/accel-sim.out: trace-driven trace-parser gpgpu-sim makedirs $(BUILD_DIR)/main.o version
 	$(CXX) -std=c++0x -o $(BIN_DIR)/accel-sim.out  -L$(GPGPUSIM_ROOT)/lib/$(GPGPUSIM_CONFIG)/ -lcudart -lm -lz -lGL -pthread $(BUILD_DIR)/*.o
 
 $(BUILD_DIR)/main.o: main.cc version
-	$(CXX) $(CXXFLAGS)  -I$(BUILD_DIR) -I./trace-driven -I$(GPGPUSIM_ROOT)/libcuda -I$(GPGPUSIM_ROOT)/src -I$(CUDA_INSTALL_PATH)/include -c main.cc -o $(BUILD_DIR)/main.o
+	$(CXX) $(CXXFLAGS)  -I$(BUILD_DIR) -I./trace-driven -I./trace-parser -I$(GPGPUSIM_ROOT)/libcuda -I$(GPGPUSIM_ROOT)/src -I$(CUDA_INSTALL_PATH)/include -c main.cc -o $(BUILD_DIR)/main.o
 
 version:
 	echo "const char *g_accelsim_version=\"$(ACCELSIM_BUILD)\";" > $(BUILD_DIR)/accelsim_version.h
@@ -76,6 +76,10 @@ trace-driven: checkenv makedirs
 	$(MAKE) -C trace-driven depend
 	$(MAKE) -C trace-driven
 
+trace-parser: checkenv makedirs
+	$(MAKE) -C trace-parser depend
+	$(MAKE) -C trace-parser
+
 clean:
 	rm -rf $(BIN_DIR)
 	rm -rf $(BUILD_DIR)

gpu-simulator/Makefile

@@ -2,10 +2,10 @@
 
 ![Accel-Sim Class Overview](https://accel-sim.github.io/assets/img/accel-sim-class.png)
 
-The Accel-Sim's performance model relies on GPGPU-Sim 4.0 Performance mopdel. We created new classes with "exec_" and "trace_" prefix that are inherited from gpgpu-sim performance model classes, then we moved some function implementations from the performance model to the new inherited classes using virtual functions. These functions are the ones that differ from exec-driven mode versus trace-driven mode. For example, when gpgpu-sim call the function "get_next_inst()", the exec_shader_core_ctx implementation will get the next instruction from the functional model, whereas the trace_shader_core_ctx will get the next inst from the traces.
+The Accel-Sim's performance model relies on GPGPU-Sim 4.0 performance model. We created new classes with "exec_" and "trace_" prefix that are inherited from gpgpu-sim performance model classes, then we moved some function implementations from the performance model to the new inherited classes using virtual functions. These functions are the ones that differ from exec-driven mode versus trace-driven mode. For example, when gpgpu-sim call the function "get_next_inst()", the exec_shader_core_ctx implementation will get the next instruction from the functional model, whereas the trace_shader_core_ctx will get the next inst from the traces.
 The blue blocks in the image are maintained in GPGPU-Sim 4.0 repo [here](https://github.com/gpgpu-sim/gpgpu-sim_distribution), whereas the green blocks are maintained by accel-sim in this repo.
 
-For each new GPU generation, we have to crease ISA_def file that specifies the SASS instructions. For now, we have created the ISA_def files for NVIDIA's Kepler, Pascal, Turing and Volta generations. Please see the directory [./trace-driven/ISA_Def](./trace-driven/ISA_Def).
+For each new GPU generation, we have to crease ISA_def file that specifies the SASS instructions. For now, we have created the ISA_def files for NVIDIA's Kepler, Pascal, Turing and Volta generations. Please see the directory [./ISA_Def](./ISA_Def).
 We were able to generate these files using the NVIDIA's CUDA Binary Utilities documentation from [here](https://docs.nvidia.com/cuda/cuda-binary-utilities/index.html#instruction-set-ref).
 
-For more info on the Accel-Sim front-end and how to compile, please see "Accel-Sim SASS Frontend" entry in the main read-me page [here](https://github.com/accel-sim/accel-sim-framework/blob/dev/README.md).
+You do not need to clone the GPGPU-Sim 4.0 by your self. The [./setup_environment.sh](./setup_environment.sh) will clone the recent GPGPU-Sim model and integrate it with Accel-Sim. For more info on the Accel-Sim front-end and how to compile, please see "Accel-Sim SASS Frontend" entry in the main read-me page [here](https://github.com/accel-sim/accel-sim-framework/blob/dev/README.md).