From cc8ee38f16569846c344e1ad511bb8de57506f8b Mon Sep 17 00:00:00 2001 From: tgrogers Date: Thu, 14 Sep 2017 13:32:50 -0400 Subject: Adding Mahmoud's Jenkisfile changes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dfe2d1c..3a716b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { source `pwd`/setup_environment &&\ cd gpgpu-sim_simulations && \ source ./benchmarks/src/setup_environment && \ - make -j -C ./benchmarks/src all' + make -j -f Makefile.PTX5 ./benchmarks/src all' } } stage('rodinia-regress'){ -- cgit v1.3 From f9ffcb4a6932eb8484d8f9be81ba5653429c3f63 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Thu, 14 Sep 2017 13:45:34 -0400 Subject: Fixing the make command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3a716b4..de37bb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { source `pwd`/setup_environment &&\ cd gpgpu-sim_simulations && \ source ./benchmarks/src/setup_environment && \ - make -j -f Makefile.PTX5 ./benchmarks/src all' + make -j -f Makefile.PTX5 -C ./benchmarks/src/ all' } } stage('rodinia-regress'){ -- cgit v1.3 From a4d5a911660629713f8fa87272f7abadcf6676d2 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Thu, 14 Sep 2017 13:54:42 -0400 Subject: Getting rid of -j since it is making the build output harder to read --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index de37bb4..289fef4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,12 +28,12 @@ pipeline { source `pwd`/setup_environment &&\ cd gpgpu-sim_simulations && \ source ./benchmarks/src/setup_environment && \ - make -j -C ./benchmarks/src all' + make -C ./benchmarks/src all' sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/8.0_env_setup.sh &&\ source `pwd`/setup_environment &&\ cd gpgpu-sim_simulations && \ source ./benchmarks/src/setup_environment && \ - make -j -f Makefile.PTX5 -C ./benchmarks/src/ all' + make -f Makefile.PTX5 -C ./benchmarks/src/ all' } } stage('rodinia-regress'){ -- cgit v1.3 From eb85a913d5f6d3ef152cd3024ea0e59f3b177423 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Sun, 1 Oct 2017 14:22:42 -0400 Subject: properly pulling the latest changes to the simulations dir to get updated results. --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 289fef4..387aaa8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,8 @@ pipeline { sh 'rm -rf gpgpu-sim_simulations' sh 'git clone git@github.rcac.purdue.edu:TimRogersGroup/gpgpu-sim_simulations.git && \ cd gpgpu-sim_simulations && \ - git checkout purdue-cluster' + git checkout purdue-cluster && \ + git pull' sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\ source `pwd`/setup_environment &&\ cd gpgpu-sim_simulations && \ -- cgit v1.3 From cd7ae9179812d114dc1ad5383482a6dd6a5c7479 Mon Sep 17 00:00:00 2001 From: tgrogers Date: Sun, 1 Oct 2017 15:24:33 -0400 Subject: calling out the running of rodinia --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 387aaa8..a670e18 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,7 @@ pipeline { parallel "4.2-rodinia": { sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\ source `pwd`/setup_environment &&\ - ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -N regress-$$ && \ + ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -b ./gpgpu-sim_simulations/util/job_launching/regression_recipies/rodinia_2.0-ft/benchmarks.yml -N regress-$$ && \ ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress-$$' }, "8.0-rodinia": { sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/8.0_env_setup.sh &&\ -- cgit v1.3 From 472878e74255acf1c44fc1a50d886cc754078b53 Mon Sep 17 00:00:00 2001 From: "Mahmoud Khairy A. Abdallah" Date: Wed, 11 Oct 2017 18:58:51 -0400 Subject: Fixing deadlock because of dp_unit --- src/gpgpu-sim/shader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index 5547a18..a654a06 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -235,7 +235,7 @@ shader_core_ctx::shader_core_ctx( class gpgpu_sim *gpu, //op collector configuration enum { SP_CUS, DP_CUS, SFU_CUS, MEM_CUS, GEN_CUS }; m_operand_collector.add_cu_set(SP_CUS, m_config->gpgpu_operand_collector_num_units_sp, m_config->gpgpu_operand_collector_num_out_ports_sp); - m_operand_collector.add_cu_set(DP_CUS, m_config->gpgpu_operand_collector_num_units_sp, m_config->gpgpu_operand_collector_num_out_ports_dp); + m_operand_collector.add_cu_set(DP_CUS, m_config->gpgpu_operand_collector_num_units_dp, m_config->gpgpu_operand_collector_num_out_ports_dp); m_operand_collector.add_cu_set(SFU_CUS, m_config->gpgpu_operand_collector_num_units_sfu, m_config->gpgpu_operand_collector_num_out_ports_sfu); m_operand_collector.add_cu_set(MEM_CUS, m_config->gpgpu_operand_collector_num_units_mem, m_config->gpgpu_operand_collector_num_out_ports_mem); m_operand_collector.add_cu_set(GEN_CUS, m_config->gpgpu_operand_collector_num_units_gen, m_config->gpgpu_operand_collector_num_out_ports_gen); -- cgit v1.3 From e643e2e56344db6264b17d7ffce28f22c8fbabe8 Mon Sep 17 00:00:00 2001 From: "Mahmoud Khairy A. Abdallah" Date: Wed, 11 Oct 2017 19:00:47 -0400 Subject: Fixing deadlock because of dp_unit (2) --- src/gpgpu-sim/shader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index 544d8d8..2c54332 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -1087,6 +1087,7 @@ public: switch(inst.op) { case SFU_OP: break; case ALU_SFU_OP: break; + case DP_OP: break; //for compute <= 29 (i..e Fermi and GT200) default: return false; } return pipelined_simd_unit::can_issue(inst); -- cgit v1.3