diff --git a/Batch/run-benchs.sh b/Batch/run-benchs.sh index 3340dd6e81fba908778e1dfd7bbbc322bb4c3075..f9d9d1224f069b07559d5ed8ab600c0142d892f7 100644 --- a/Batch/run-benchs.sh +++ b/Batch/run-benchs.sh @@ -54,7 +54,7 @@ function main(){ NB_LOOPS=10 # AXPY - "$RUN_DIR/Benchmark/axpy/axpy" --lp=$NB_LOOPS --minnbb=16 --maxnbb=256 --minbs=128 --maxbs=131072 --gputh=256 --od="$results_dir" >> "$results_dir/output_axpy.txt" + "$RUN_DIR/Benchmark/axpy/axpy" --lp=$NB_LOOPS --minnbb=256 --maxnbb=1024 --minbs=131072 --maxbs=524288 --gputh=256 --od="$results_dir" >> "$results_dir/output_axpy.txt" remove_core_files # Cholesky/gemm @@ -65,7 +65,7 @@ function main(){ remove_core_files # Particles - "$RUN_DIR/Benchmark/particles/particles-simu" --lp=$NB_LOOPS --minp=500 --maxp=15000 --minnbgroups=128 --maxnbgroups=1024 --od="$results_dir" >> "$results_dir/output_particles.txt" + "$RUN_DIR/Benchmark/particles/particles-simu" --lp=$NB_LOOPS --minp=500 --maxp=512 --minnbgroups=128 --maxnbgroups=1024 --od="$results_dir" >> "$results_dir/output_particles.txt" remove_core_files } diff --git a/Benchmark/particles/particles-simu.cpp b/Benchmark/particles/particles-simu.cpp index 4360854c7d0380c5830ec74a388dcb57141fee50..94adf1d79692458b03f25d82b917d5422da23b6d 100644 --- a/Benchmark/particles/particles-simu.cpp +++ b/Benchmark/particles/particles-simu.cpp @@ -960,7 +960,7 @@ void BenchmarkTest(int argc, char** argv, const TuneResult& inKernelConfig){ const bool usePrioPairs = std::get<1>(useMultiprioAndPairs); const bool useLocality = std::get<2>(useMultiprioAndPairs); - file << idxGpu << "," << idxBlock << "," + file << nbCpus << "," << nbGpus << "," << idxBlock << "," << (useMultiprio?"TRUE":"FALSE") << "," << (usePrioPairs?"TRUE":"FALSE") << "," << (useLocality?"TRUE":"FALSE") << ","