aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jenkinsfile7
-rw-r--r--groovy-html.success.template28
2 files changed, 12 insertions, 23 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 23bfe43..2c06f49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -67,8 +67,7 @@ pipeline {
source `pwd`/setup_environment &&\
PLOTDIR="jenkins/${JOB_NAME}" &&\
./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft -C GTX480,GTX480-PTXPLUS > stats-per-kernel-4.2.csv &&\
- ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-4.2.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.4.2.txt &&\
- export CORREL_42=`sed "s/$/<br>/" correl.4.2.txt`'
+ ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-4.2.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.4.2.txt'
}
}
stage('9.1-correlate'){
@@ -77,8 +76,7 @@ pipeline {
source `pwd`/setup_environment &&\
PLOTDIR="jenkins/${JOB_NAME}" &&\
./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C TITANV > stats-per-kernel-9.1.csv &&\
- ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-9.1.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.9.1.txt &&\
- export CORREL_91=`sed "s/$/<br>/" correl.9.1.txt`'
+ ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-9.1.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.9.1.txt'
}
}
stage('archive-and-delta') {
@@ -90,6 +88,7 @@ pipeline {
./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft -C GTX480 > stats-per-kernel-4.2-ptx.csv'
sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.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 > stats-per-kernel-9.1.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-9.1.csv,./stats-per-app-9.1.csv -R > per-app-merge-9.1.csv'
sh 'PLOTDIR="jenkins/${JOB_NAME}" &&\
diff --git a/groovy-html.success.template b/groovy-html.success.template
index fec4628..7e1fa00 100644
--- a/groovy-html.success.template
+++ b/groovy-html.success.template
@@ -60,28 +60,18 @@
def JOB_NAME= build.getEnvVars()["JOB_NAME"];
def BUILD_NUMBER= build.getEnvVars()["BUILD_NUMBER"];
def BUILD_URL= build.getEnvVars()["BUILD_URL"];
-
- def CORREL_42= build.getEnvVars()["CORREL_42"];
- def CORREL_91= build.getEnvVars()["CORREL_91"];
%>
-Statistics changes since last commit:<br>
+See ${BUILD_URL} for full build detials.
+
+<pre>Statistics changes since last commit:
<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/deltas/9.1
<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/deltas/4.2
<pre> Correlation:
-<pre> 4.2:<br>
-
-${CORREL_42}
-
-<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/gtx480-cycles.html.GTX480-PTXPLUS.GTX480.html
-<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/gtx480-cycles.html.GTX480-PTXPLUS.GTX480.appsincluded.txt
-<pre> 9.1:<br>
-
-
-${CORREL_91}
-
-<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/titanv-cycles.html.TITANV.html
-<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/titanv-cycles.html.TITANV.appsincluded.txt
-<br><br>
-See ${BUILD_URL} for full build detials.
+<pre> 4.2:
+<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/gtx480-cycles.html.GTX480-PTXPLUS.GTX480.html
+<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/gtx480-cycles.html.GTX480-PTXPLUS.GTX480.appsincluded.txt
+<pre> 9.1:
+<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/titanv-cycles.html.TITANV.html
+<pre> https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/titanv-cycles.html.TITANV.appsincluded.txt
</BODY>