summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy G Rogers <[email protected]>2018-09-11 21:54:25 -0400
committerGitHub Enterprise <[email protected]>2018-09-11 21:54:25 -0400
commitbd2b9b3e64ea420917f9e85ab176ca7bbc48c1e9 (patch)
treefe97d7d2caf71b88b938f854aa3b260b7a21f6e1
parente4f8c0242f4b188638bafd4963117b751cef49f1 (diff)
parent7d75447aa9a0028f5a26e285c6586d9a0a2fb797 (diff)
Merge branch 'dev-purdue-integration' into dev-purdue-integration
-rw-r--r--Jenkinsfile4
-rw-r--r--configs/3.x-cfgs/SM6_TITANX/gpgpusim.config1
2 files changed, 3 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 16e932e..11a9fa6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
}, "9.1-functest": {
sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.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 TITANX,TITANX-L1ON,P100,TITANV -N regress-$$ && \
+ ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -B rodinia_2.0-ft,sdk-4.2 -C TITANX,TITANX-L1ON -N regress-$$ && \
PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/9.1-rodinia" && ssh [email protected] mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \
./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -s stats-$$.csv -N regress-$$ && \
./gpgpu-sim_simulations/util/plotting/plot-get-stats.py -c stats-$$.csv -p [email protected]:~/website/gpgpu-sim-plots/$PLOTDIR -w https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/$PLOTDIR -n $PLOTDIR'
@@ -75,7 +75,7 @@ pipeline {
sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.1_env_setup.sh &&\
source `pwd`/setup_environment &&\
PLOTDIR="jenkins/${JOB_NAME}" &&\
- ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh TITANX,TITANX-L1ON,P100,TITANV $PLOTDIR ${BUILD_NUMBER}'
+ ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh TITANX,TITANX-L1ON $PLOTDIR ${BUILD_NUMBER}'
}
}
}
diff --git a/configs/3.x-cfgs/SM6_TITANX/gpgpusim.config b/configs/3.x-cfgs/SM6_TITANX/gpgpusim.config
index f78bd02..28912a3 100644
--- a/configs/3.x-cfgs/SM6_TITANX/gpgpusim.config
+++ b/configs/3.x-cfgs/SM6_TITANX/gpgpusim.config
@@ -25,6 +25,7 @@
# shader core pipeline config
-gpgpu_shader_registers 65536
+-gpgpu_occupancy_sm_number 61
# This implies a maximum of 64 warps/SM
-gpgpu_shader_core_pipeline 2048:32