diff options
| -rw-r--r-- | Jenkinsfile | 9 | ||||
| -rw-r--r-- | setup_environment | 37 | ||||
| -rw-r--r-- | version_detection.mk | 2 |
3 files changed, 25 insertions, 23 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index a3db3e5..f6676bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,20 +90,17 @@ pipeline { } post { success { -// sh 'git remote rm upstream' - emailext body:'''${SCRIPT, template="groovy-html.success.template"}''', + emailext body: "See ${BUILD_URL}.", recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], - subject: "[AALP Jenkins] Build #${BUILD_NUMBER} - Success!", - attachmentsPattern: 'correl.*.txt', + subject: "[AALP Jenkins] Build ${JOB_NAME} #${BUILD_NUMBER} - Success!", to: '[email protected]' } failure { -// sh 'git remote rm upstream' emailext body: "See ${BUILD_URL}", recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], - subject: "[AALP Jenkins] Build #${BUILD_NUMBER} - ${currentBuild.result}", + subject: "[AALP Jenkins] Build ${JOB_NAME} #${BUILD_NUMBER} - ${currentBuild.result}", to: '[email protected]' } } diff --git a/setup_environment b/setup_environment index d3ff840..7eeaa4f 100644 --- a/setup_environment +++ b/setup_environment @@ -7,7 +7,7 @@ export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )" GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'` #Detect Git branch and commit # -GIT_COMMIT=`git --git-dir=$GPGPUSIM_ROOT/.git log -n 1 | head -1 | sed -re 's/commit (.*)/\1/'` +GIT_COMMIT=`git --git-dir=$GPGPUSIM_ROOT/.git log --abbrev-commit -n 1 | head -1 | sed -re 's/commit (.*)/\1/'` GIT_FILES_CHANGED=`git --git-dir=$GPGPUSIM_ROOT/.git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1./'` GIT_FILES_CHANGED+=`git --git-dir=$GPGPUSIM_ROOT/.git diff --numstat --cached | wc | sed -re 's/^\s+([0-9]+).*/\1/'` GPGPUSIM_BUILD_STRING="gpgpu-sim_git-commit-$GIT_COMMIT-modified_$GIT_FILES_CHANGED" @@ -143,21 +143,26 @@ fi if [ -z "$PTXAS_CUDA_INSTALL_PATH" ]; then export PTXAS_CUDA_INSTALL_PATH=$CUDA_INSTALL_PATH; fi -echo ""; -echo "----------------------------------------------------------------------------"; -echo "INFO - If you only care about PTX execution, ignore this message. GPGPU-Sim supports PTX execution in modern CUDA." -echo "If you want to run PTXPLUS (sm_1x SASS) with a modern card configuration - set the envronment variable" -echo "\$PTXAS_CUDA_INSTALL_PATH to point a CUDA version compabible with your card configurations (i.e. 8+ for PASCAL, 9+ for VOLTA etc..)" -echo "For example: \"export \$PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1\"" -echo "" -echo "The following text describes why:"; -echo "If you are using PTXPLUS, only sm_1x is supported and it requires that the app and simulator binaries are compiled in CUDA 4.2 or less."; -echo "The simulator requires it since CUDA headers desribe struct sizes in the exec which change from gen to gen."; -echo "The apps require 4.2 because new versions of CUDA tools have dropped parsing support for generating sm_1x"; -echo "When running using modern config (i.e. volta) and PTXPLUS with CUDA 4.2, the \$PTXAS_CUDA_INSTALL_PATH env variable is required to get proper register usage" -echo "(and hence occupancy) using a version of CUDA that knows the register usage on the real card." -echo ""; -echo "----------------------------------------------------------------------------"; + +# I am not sure PTXPlus really makes sense anymore and this verbose print to describe +# how to use it is probably not aging well. The info in here is good though if you care +# about PTXPlus, so I will leave it as a comment. +# +#echo ""; +#echo "----------------------------------------------------------------------------"; +#echo "INFO - If you only care about PTX execution or trace-based SASS execution, ignore this message." +#echo "If you want to run PTXPLUS (sm_1x SASS) with a modern card configuration - set the envronment variable" +#echo "\$PTXAS_CUDA_INSTALL_PATH to point a CUDA version compabible with your card configurations (i.e. 8+ for PASCAL, 9+ for VOLTA etc..)" +#echo "For example: \"export \$PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1\"" +#echo "" +#echo "The following text describes why:"; +#echo "If you are using PTXPLUS, only sm_1x is supported and it requires that the app and simulator binaries are compiled in CUDA 4.2 or less."; +#echo "The simulator requires it since CUDA headers desribe struct sizes in the exec which change from gen to gen."; +#echo "The apps require 4.2 because new versions of CUDA tools have dropped parsing support for generating sm_1x"; +#echo "When running using modern config (i.e. volta) and PTXPLUS with CUDA 4.2, the \$PTXAS_CUDA_INSTALL_PATH env variable is required to get proper register usage" +#echo "(and hence occupancy) using a version of CUDA that knows the register usage on the real card." +#echo ""; +#echo "----------------------------------------------------------------------------"; echo "setup_environment succeeded"; diff --git a/version_detection.mk b/version_detection.mk index ee71a62..81c1d2a 100644 --- a/version_detection.mk +++ b/version_detection.mk @@ -32,7 +32,7 @@ else GPGPUSIM_VERSION=$(shell cat $(GPGPUSIM_ROOT)/version | awk '/Version/ {print $$8}' ) #Detect Git branch and commit # -GIT_COMMIT := $(shell git log -n 1 | head -1 | sed -re 's/commit (.*)/\1/') +GIT_COMMIT := $(shell git log --abbrev-commit -n 1 | head -1 | sed -re 's/commit (.*)/\1/') GIT_FILES_CHANGED_A:=$(shell git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1./') GIT_FILES_CHANGED:= $(GIT_FILES_CHANGED_A)$(shell git diff --numstat --cached | wc | sed -re 's/^\s+([0-9]+).*/\1/') GPGPUSIM_BUILD := gpgpu-sim_git-commit-$(GIT_COMMIT)_modified_$(GIT_FILES_CHANGED) |