From 03f6d7eb714a93c0ddff024fb92288ae9131f01c Mon Sep 17 00:00:00 2001 From: tgrogers Date: Wed, 10 Jun 2020 22:01:35 -0400 Subject: CUDA 11 support --- Makefile | 1 + linux-so-version.txt | 2 ++ setup_environment | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4e8e4b..5e964b8 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,7 @@ $(SIM_LIB_DIR)/libcudart.so: makedirs $(LIBS) cudalib if [ ! -f $(SIM_LIB_DIR)/libcudart.so.9.2 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.9.2; fi if [ ! -f $(SIM_LIB_DIR)/libcudart.so.10.0 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.10.0; fi if [ ! -f $(SIM_LIB_DIR)/libcudart.so.10.1 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.10.1; fi + if [ ! -f $(SIM_LIB_DIR)/libcudart.so.11.0 ]; then ln -s libcudart.so $(SIM_LIB_DIR)/libcudart.so.11.0; fi $(SIM_LIB_DIR)/libcudart.dylib: makedirs $(LIBS) cudalib diff --git a/linux-so-version.txt b/linux-so-version.txt index 45c40dd..3db07ac 100644 --- a/linux-so-version.txt +++ b/linux-so-version.txt @@ -8,5 +8,7 @@ libcudart.so.10.0{ }; libcudart.so.10.1{ }; +libcudart.so.11.0{ +}; libcuda.so.1{ }; diff --git a/setup_environment b/setup_environment index daf7fab..07d0788 100644 --- a/setup_environment +++ b/setup_environment @@ -48,7 +48,7 @@ CC_VERSION=`gcc --version | head -1 | awk '{for(i=1;i<=NF;i++){ if(match($i,/^[0 CUDA_VERSION_STRING=`$CUDA_INSTALL_PATH/bin/nvcc --version | awk '/release/ {print $5;}' | sed 's/,//'`; export CUDA_VERSION_NUMBER=`echo $CUDA_VERSION_STRING | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($1), 10*$2);}'` -if [ $CUDA_VERSION_NUMBER -gt 10100 -o $CUDA_VERSION_NUMBER -lt 2030 ]; then +if [ $CUDA_VERSION_NUMBER -gt 11100 -o $CUDA_VERSION_NUMBER -lt 2030 ]; then echo "ERROR ** GPGPU-Sim version $GPGPUSIM_VERSION_STRING not tested with CUDA version $CUDA_VERSION_STRING (please see README)"; echo $CUDA_VERSION_NUMBER return -- cgit v1.3 From c2bd1cf2ffc99f14071d35b822a9463e1222bada Mon Sep 17 00:00:00 2001 From: tgrogers Date: Mon, 22 Jun 2020 22:52:17 -0400 Subject: Now that there is no 4.2 - lets just build the latest CUDA --- Jenkinsfile | 81 +++++++++++++++++++++++++------------------------------------ 1 file changed, 33 insertions(+), 48 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4495461..3ba8b7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -pipeline { +0ipeline { agent { label "purdue-cluster" } @@ -11,7 +11,7 @@ pipeline { stage('formatting-check') { steps { sh ''' - source /home/tgrogers-raid/a/common/gpgpu-sim-setup/common/export_gcc_version.sh 5.3.0 + source ./env-setup/common/export_gcc_version.sh 5.3.0 git remote add upstream https://github.com/purdue-aalp/gpgpu-sim_distribution git fetch upstream if git diff --name-only upstream/dev | grep -E "*.cc|*.h|*.cpp|*.hpp" ; then @@ -21,17 +21,18 @@ pipeline { } } */ + stage('env-setup') { + steps { + sh 'rm -rf env-setup && git clone git@github.com:purdue-aalp/env-setup.git &&\ + cd env-setup && git checkout cluster-ubuntu' + } + } stage('simulator-build') { steps { - parallel "4.2": { - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - make -j 10' - }, "10.1" : { - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/10.1_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - make -j 10' - } + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh + source `pwd`/setup_environment + make -j 10''' } } stage('simulations-build'){ @@ -41,35 +42,24 @@ pipeline { cd gpgpu-sim_simulations && \ git pull && \ ln -s /home/tgrogers-raid/a/common/data_dirs benchmarks/' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - cd gpgpu-sim_simulations && \ - source ./benchmarks/src/setup_environment && \ - make -j 10 -C ./benchmarks/src rodinia_2.0-ft sdk-4.2 && \ - make -C ./benchmarks/src data' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/10.1_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - cd gpgpu-sim_simulations && \ - source ./benchmarks/src/setup_environment && \ - make -j 10 -C ./benchmarks/src/ rodinia_2.0-ft sdk-4.2 && \ - make -C ./benchmarks/src data' + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh + source `pwd`/setup_environment + cd gpgpu-sim_simulations + source ./benchmarks/src/setup_environment + make -j 10 -C ./benchmarks/src/ rodinia_2.0-ft sdk-4.2 + make -C ./benchmarks/src data''' } } stage('regress'){ steps { - parallel "4.2-rodinia": { - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - export PTXAS_CUDA_INSTALL_PATH=/home/tgrogers-raid/a/common/cuda-10.1 &&\ - ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft -C TITANV-PTXPLUS -N regress-$$ && \ - PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/4.2" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \ - ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress-$$ -s stats-per-app-4.2.csv' - }, "10.1-functest": { - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/10.1_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C TITANV -N regress-$$ && \ - PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/10.1" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \ - ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -s stats-per-app-10.1.csv -N regress-$$' + "11.0-functest": { + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh &&\ + source `pwd`/setup_environment &&\ + ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C QV100 -N regress-$$ && \ + PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/11.0" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \ + ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -s stats-per-app-11.0.csv -N regress-$$''' } } } @@ -78,20 +68,15 @@ pipeline { sh './gpgpu-sim_simulations/run_hw/get_hw_data.sh' sh 'rm -rf ./gpgpu-sim_simulations/util/plotting/correl-html && rm -rf gpgpu-sim-results-repo && rm -rf ./gpgpu-sim_simulations/util/plotting/htmls' sh 'git clone git@github.com:purdue-aalp/gpgpu-sim-results-repo.git' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\ - ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft -C TITANV-PTXPLUS -A > stats-per-kernel-4.2-ptxplus.csv' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/10.1_env_setup.sh &&\ - ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C TITANV -A > stats-per-kernel-10.1.csv' + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh &&\ + ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C QV100 -A > stats-per-kernel-11.0.csv''' sh 'if [ ! -d ./gpgpu-sim-results-repo/${JOB_NAME} ]; then mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ ; cp ./gpgpu-sim-results-repo/purdue-aalp/gpgpu-sim_distribution/dev/* ./gpgpu-sim-results-repo/${JOB_NAME}/ ; fi' - sh './gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-4.2.csv,./stats-per-app-4.2.csv -R > per-app-merge-4.2.csv' - sh './gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-10.1.csv,./stats-per-app-10.1.csv -R > per-app-merge-10.1.csv' + sh './gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-11.0.csv,./stats-per-app-11.0.csv -R > per-app-merge-11.0.csv' sh 'PLOTDIR="jenkins/${JOB_NAME}" &&\ - ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c per-app-merge-4.2.csv -P cuda-4.2 &&\ - ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c per-app-merge-10.1.csv -P cuda-10.1 &&\ - ./gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-4.2-ptxplus.csv,./stats-per-kernel-4.2-ptxplus.csv -R > per-kernel-merge-4.2-ptxplus.csv &&\ - ./gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-10.1.csv,./stats-per-kernel-10.1.csv -R > per-kernel-merge-10.1.csv &&\ - ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c per-kernel-merge-4.2-ptxplus.csv -p cuda-4.2 | grep -B 1 "Correl=" | tee correl.4.2.txt &&\ - ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c per-kernel-merge-10.1.csv -p cuda-10.1 | grep -B 1 "Correl=" | tee correl.10.1.txt &&\ + ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c per-app-merge-11.0.csv -P cuda-11.0 &&\ + ./gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-11.0.csv,./stats-per-kernel-11.0.csv -R > per-kernel-merge-11.0.csv &&\ + ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c per-kernel-merge-11.0.csv -p cuda-11.0 | grep -B 1 "Correl=" | tee correl.11.0.txt &&\ mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ && cp stats-per-*.csv ./gpgpu-sim-results-repo/${JOB_NAME}/ &&\ cd ./gpgpu-sim-results-repo &&\ git diff --quiet && git diff --staged --quiet || git commit -am "Jenkins automated checkin ${JOB_NAME} Build:${BUILD_NUMBER}" &&\ -- cgit v1.3 From 9696e57a0a77ddc4232100ba9796abec204f926b Mon Sep 17 00:00:00 2001 From: tgrogers Date: Mon, 22 Jun 2020 22:55:01 -0400 Subject: Update broken Jenkinsfile syntax --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ba8b7b..9888594 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,16 +51,14 @@ make -C ./benchmarks/src data''' } } - stage('regress'){ + stage('11.0 Regressions'){ steps { - "11.0-functest": { sh '''#!/bin/bash source ./env-setup/11.0_env_setup.sh &&\ source `pwd`/setup_environment &&\ ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C QV100 -N regress-$$ && \ PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/11.0" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \ ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -s stats-per-app-11.0.csv -N regress-$$''' - } } } stage('correlate-delta-and-archive') { -- cgit v1.3 From 93e2c9ac7efbf0ad29ed11b0dc5f85175f8722ac Mon Sep 17 00:00:00 2001 From: tgrogers Date: Mon, 22 Jun 2020 22:56:05 -0400 Subject: syntax error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9888594..371663e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -0ipeline { +pipeline { agent { label "purdue-cluster" } -- cgit v1.3 From cbd9868621b08f0bd59cadf9f6cdaa2d899384b8 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Mon, 22 Jun 2020 23:14:18 -0400 Subject: slurm load --- Jenkinsfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 371663e..cd3ec73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,10 +54,11 @@ pipeline { stage('11.0 Regressions'){ steps { sh '''#!/bin/bash - source ./env-setup/11.0_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C QV100 -N regress-$$ && \ - PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/11.0" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \ + module load slurm + source ./env-setup/11.0_env_setup.sh + source `pwd`/setup_environment + ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C QV100 -N regress-$$ + PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/11.0" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -s stats-per-app-11.0.csv -N regress-$$''' } } @@ -67,7 +68,8 @@ pipeline { sh 'rm -rf ./gpgpu-sim_simulations/util/plotting/correl-html && rm -rf gpgpu-sim-results-repo && rm -rf ./gpgpu-sim_simulations/util/plotting/htmls' sh 'git clone git@github.com:purdue-aalp/gpgpu-sim-results-repo.git' sh '''#!/bin/bash - source ./env-setup/11.0_env_setup.sh &&\ + module load slurm + source ./env-setup/11.0_env_setup.sh ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C QV100 -A > stats-per-kernel-11.0.csv''' sh 'if [ ! -d ./gpgpu-sim-results-repo/${JOB_NAME} ]; then mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ ; cp ./gpgpu-sim-results-repo/purdue-aalp/gpgpu-sim_distribution/dev/* ./gpgpu-sim-results-repo/${JOB_NAME}/ ; fi' sh './gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-11.0.csv,./stats-per-app-11.0.csv -R > per-app-merge-11.0.csv' -- cgit v1.3 From 5842a4b1cfbc56a77c0851332e331ef765ac4d62 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Tue, 23 Jun 2020 10:15:45 -0400 Subject: Not sure we still need this --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd3ec73..f0c9da6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,7 +54,6 @@ pipeline { stage('11.0 Regressions'){ steps { sh '''#!/bin/bash - module load slurm source ./env-setup/11.0_env_setup.sh source `pwd`/setup_environment ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C QV100 -N regress-$$ @@ -68,7 +67,6 @@ pipeline { sh 'rm -rf ./gpgpu-sim_simulations/util/plotting/correl-html && rm -rf gpgpu-sim-results-repo && rm -rf ./gpgpu-sim_simulations/util/plotting/htmls' sh 'git clone git@github.com:purdue-aalp/gpgpu-sim-results-repo.git' sh '''#!/bin/bash - module load slurm source ./env-setup/11.0_env_setup.sh ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C QV100 -A > stats-per-kernel-11.0.csv''' sh 'if [ ! -d ./gpgpu-sim-results-repo/${JOB_NAME} ]; then mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ ; cp ./gpgpu-sim-results-repo/purdue-aalp/gpgpu-sim_distribution/dev/* ./gpgpu-sim-results-repo/${JOB_NAME}/ ; fi' -- cgit v1.3 From c83e6fcfe79eb3a4fa829711849ef7e08eb6c2a1 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Tue, 23 Jun 2020 11:10:49 -0400 Subject: no more old sdk regression --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0c9da6..2be3b61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { source `pwd`/setup_environment cd gpgpu-sim_simulations source ./benchmarks/src/setup_environment - make -j 10 -C ./benchmarks/src/ rodinia_2.0-ft sdk-4.2 + make -j 10 -C ./benchmarks/src/ rodinia_2.0-ft make -C ./benchmarks/src data''' } } @@ -56,7 +56,7 @@ pipeline { sh '''#!/bin/bash source ./env-setup/11.0_env_setup.sh source `pwd`/setup_environment - ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C QV100 -N regress-$$ + ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft -C QV100 -N regress-$$ PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/11.0" && ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -s stats-per-app-11.0.csv -N regress-$$''' } @@ -68,7 +68,7 @@ pipeline { sh 'git clone git@github.com:purdue-aalp/gpgpu-sim-results-repo.git' sh '''#!/bin/bash source ./env-setup/11.0_env_setup.sh - ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C QV100 -A > stats-per-kernel-11.0.csv''' + ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft -C QV100 -A > stats-per-kernel-11.0.csv''' sh 'if [ ! -d ./gpgpu-sim-results-repo/${JOB_NAME} ]; then mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ ; cp ./gpgpu-sim-results-repo/purdue-aalp/gpgpu-sim_distribution/dev/* ./gpgpu-sim-results-repo/${JOB_NAME}/ ; fi' sh './gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-11.0.csv,./stats-per-app-11.0.csv -R > per-app-merge-11.0.csv' sh 'PLOTDIR="jenkins/${JOB_NAME}" &&\ -- cgit v1.3 From a770fd724831a9f4e0b6df4b353e30e77abb88ec Mon Sep 17 00:00:00 2001 From: tgrogers Date: Tue, 23 Jun 2020 12:04:27 -0400 Subject: Be more specific about which hardware data to correlate against so it doesn't spend forever parsing cards we don't care about. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2be3b61..176d20e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { sh 'PLOTDIR="jenkins/${JOB_NAME}" &&\ ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c per-app-merge-11.0.csv -P cuda-11.0 &&\ ./gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-11.0.csv,./stats-per-kernel-11.0.csv -R > per-kernel-merge-11.0.csv &&\ - ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c per-kernel-merge-11.0.csv -p cuda-11.0 | grep -B 1 "Correl=" | tee correl.11.0.txt &&\ + ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -H ./gpgpu-sim_simulations/run_hw/QUADRO-V100/device-0/9.1/ ./-c per-kernel-merge-11.0.csv -p cuda-11.0 | grep -B 1 "Correl=" | tee correl.11.0.txt &&\ mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ && cp stats-per-*.csv ./gpgpu-sim-results-repo/${JOB_NAME}/ &&\ cd ./gpgpu-sim-results-repo &&\ git diff --quiet && git diff --staged --quiet || git commit -am "Jenkins automated checkin ${JOB_NAME} Build:${BUILD_NUMBER}" &&\ -- cgit v1.3 From 2ade5cc4e1278c6e4f73aa260ed426730014547f Mon Sep 17 00:00:00 2001 From: tgrogers Date: Tue, 23 Jun 2020 16:32:11 -0400 Subject: another Jenkins typo by me --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 176d20e..a3db3e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { sh 'PLOTDIR="jenkins/${JOB_NAME}" &&\ ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c per-app-merge-11.0.csv -P cuda-11.0 &&\ ./gpgpu-sim_simulations/util/plotting/merge-stats.py -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-11.0.csv,./stats-per-kernel-11.0.csv -R > per-kernel-merge-11.0.csv &&\ - ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -H ./gpgpu-sim_simulations/run_hw/QUADRO-V100/device-0/9.1/ ./-c per-kernel-merge-11.0.csv -p cuda-11.0 | grep -B 1 "Correl=" | tee correl.11.0.txt &&\ + ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -H ./gpgpu-sim_simulations/run_hw/QUADRO-V100/device-0/9.1/ -c per-kernel-merge-11.0.csv -p cuda-11.0 | grep -B 1 "Correl=" | tee correl.11.0.txt &&\ mkdir -p ./gpgpu-sim-results-repo/${JOB_NAME}/ && cp stats-per-*.csv ./gpgpu-sim-results-repo/${JOB_NAME}/ &&\ cd ./gpgpu-sim-results-repo &&\ git diff --quiet && git diff --staged --quiet || git commit -am "Jenkins automated checkin ${JOB_NAME} Build:${BUILD_NUMBER}" &&\ -- cgit v1.3 From 6b73061c17a91e7dea1cda247d34c58252c792f6 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Wed, 24 Jun 2020 10:10:14 -0400 Subject: update nightly --- nightly.jenkinsfile | 54 ++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/nightly.jenkinsfile b/nightly.jenkinsfile index c841fb0..e28e2b8 100644 --- a/nightly.jenkinsfile +++ b/nightly.jenkinsfile @@ -15,9 +15,10 @@ pipeline { stages { stage('nightly-simulator-build') { steps { - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.1_env_setup.sh &&\ - source `pwd`/setup_environment &&\ - make -j 10' + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh + source `pwd`/setup_environment + make -j 10''' } } stage('nightly-simulations-build'){ @@ -30,12 +31,13 @@ pipeline { cd gpgpu-sim_simulations && \ git pull && \ ln -s /home/tgrogers-raid/a/common/data_dirs benchmarks/' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.1_env_setup.sh &&\ + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh &&\ source `pwd`/setup_environment &&\ cd gpgpu-sim_simulations && \ source ./benchmarks/src/setup_environment && \ make -i -j 10 -C ./benchmarks/src/ all && \ - make -C ./benchmarks/src data' + make -C ./benchmarks/src data''' } } stage('nightly-2B-insn-run'){ @@ -43,13 +45,14 @@ pipeline { sh 'rm -rf ./gpgpu-sim_simulations/util/plotting/correl-html && rm -rf gpgpu-sim-results-repo &&\ rm -rf ./gpgpu-sim_simulations/util/plotting/htmls' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.1_env_setup.sh &&\ - source `pwd`/setup_environment &&\ + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh + source `pwd`/setup_environment ./gpgpu-sim_simulations/util/job_launching/run_simulations.py \ - -B `cat ./gpgpu-sim_simulations/util/job_launching/apps/correlation-apps.list` -C QV100-2B -N nightly-$$ && \ + -B `cat ./gpgpu-sim_simulations/util/job_launching/apps/correlation-apps.list` -C QV100-2B -N nightly-$$ ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -I -S 1800 -v \ - -s stats-per-app-9.1.csv -T 12 -K -N nightly-$$ && \ - ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c stats-per-app-9.1.csv -P cuda-9.1.nightly' + -s stats-per-app-11.0.csv -T 12 -K -N nightly-$$ + ./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c stats-per-app-11.0.csv -P cuda-11.0.nightly''' } } stage('nightly-correlate'){ @@ -63,25 +66,26 @@ pipeline { fi && \ ./gpgpu-sim_simulations/run_hw/get_hw_data.sh' - sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.1_env_setup.sh &&\ + sh '''#!/bin/bash + source ./env-setup/11.0_env_setup.sh ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k \ -B `cat ./gpgpu-sim_simulations/util/job_launching/apps/correlation-apps.list` \ - -C QV100-2B > stats-per-kernel-9.1.csv &&\ + -C QV100-2B > stats-per-kernel-11.0.csv ./gpgpu-sim_simulations/util/plotting/merge-stats.py \ - -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-9.1.csv,./stats-per-app-9.1.csv -R \ - > per-app-merge-9.1.csv &&\ + -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-app-11.0.csv,./stats-per-app-11.0.csv -R \ + > per-app-merge-11.0.csv ./gpgpu-sim_simulations/util/plotting/merge-stats.py \ - -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-9.1.csv,./stats-per-kernel-9.1.csv -R \ - > per-kernel-merge-9.1.csv &&\ - source `pwd`/setup_environment &&\ - ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c per-kernel-merge-9.1.csv \ - -p cuda-9.1.nightly -b ./gpgpu-sim_simulations/util/plotting/known.correlation.outliers.list \ - | grep "Correl=" -B 1 | tee correl.9.1.txt &&\ - cp stats-per-*.csv ./gpgpu-sim-results-repo/${JOB_NAME}/ &&\ - cd ./gpgpu-sim-results-repo &&\ - git pull &&\ - git diff --quiet && git diff --staged --quiet || git commit -am "Jenkins automated checkin ${JOB_NAME} Build:${BUILD_NUMBER}" &&\ - git push' + -c ./gpgpu-sim-results-repo/${JOB_NAME}/stats-per-kernel-11.0.csv,./stats-per-kernel-11.0.csv -R \ + > per-kernel-merge-11.0.csv + source `pwd`/setup_environment + ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c per-kernel-merge-11.0.csv \ + -p cuda-11.0.nightly -b ./gpgpu-sim_simulations/util/plotting/known.correlation.outliers.list \ + | grep "Correl=" -B 1 | tee correl.11.0.txt + cp stats-per-*.csv ./gpgpu-sim-results-repo/${JOB_NAME}/ + cd ./gpgpu-sim-results-repo + git pull + git diff --quiet && git diff --staged --quiet || git commit -am "Jenkins automated checkin ${JOB_NAME} Build:${BUILD_NUMBER}" + git push''' sh 'PLOTDIR="/home/dynamo/a/tgrogers/website/gpgpu-sim-plots/jenkins/${JOB_NAME}" &&\ ssh tgrogers@dynamo.ecn.purdue.edu mkdir -p $PLOTDIR/${BUILD_NUMBER} && \ -- cgit v1.3 From b1fdc6da937e638fc1cf735829613f1037bbbf1a Mon Sep 17 00:00:00 2001 From: tgrogers Date: Wed, 24 Jun 2020 10:14:58 -0400 Subject: get the env setup scripts --- nightly.jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nightly.jenkinsfile b/nightly.jenkinsfile index e28e2b8..1c88551 100644 --- a/nightly.jenkinsfile +++ b/nightly.jenkinsfile @@ -13,6 +13,12 @@ pipeline { } stages { + stage('env-setup') { + steps { + sh 'rm -rf env-setup && git clone git@github.com:purdue-aalp/env-setup.git &&\ + cd env-setup && git checkout cluster-ubuntu' + } + } stage('nightly-simulator-build') { steps { sh '''#!/bin/bash -- cgit v1.3