From 107c470356e76dff780c5cf197a376d5667097b8 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Wed, 15 May 2019 15:31:20 +0200 Subject: CSV file generation for benches (only binary_search for now) --- test/monniaux/run_benches.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 test/monniaux/run_benches.sh (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh new file mode 100755 index 00000000..9537f63a --- /dev/null +++ b/test/monniaux/run_benches.sh @@ -0,0 +1,23 @@ + +source benches.sh + +rm -f commands.txt +for bench in $benches; do + echo "(cd $bench && make -j5 exec)" >> commands.txt +done + +cat commands.txt | xargs -n1 -I{} -P4 bash -c '{}' + +## +# Gather all the CSV files +## + +benches_csv="" +for bench in $benches; do + if [ -f $bench/measures.csv ]; then + benches_csv="$benches_csv $bench/measures.csv" + fi +done + +nawk 'FNR==1 && NR!=1{next;}{print}' $benches_csv > measures.csv +echo "measures.csv done" -- cgit From c1e6f2db8e9e3589e6bdc463256cbc9c59906ae7 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Wed, 15 May 2019 16:11:26 +0200 Subject: Measures for bitslices-aes, bitsliced-tea and complex_mat --- test/monniaux/run_benches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index 9537f63a..4db4b5a2 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -3,7 +3,7 @@ source benches.sh rm -f commands.txt for bench in $benches; do - echo "(cd $bench && make -j5 exec)" >> commands.txt + echo "(cd $bench && make -j5 run)" >> commands.txt done cat commands.txt | xargs -n1 -I{} -P4 bash -c '{}' -- cgit From 9f58c4419596fbab69c8fe25c3d51e66acb613d0 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Fri, 17 May 2019 16:19:04 +0200 Subject: Premier jet de graphes de mesures (à améliorer) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/monniaux/run_benches.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index 4db4b5a2..479d09eb 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -21,3 +21,6 @@ done nawk 'FNR==1 && NR!=1{next;}{print}' $benches_csv > measures.csv echo "measures.csv done" + +./gengraphs.py measures.csv +echo "Graphs done" -- cgit From 3652fd819ce652bc97c47f95d88e400139931524 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Wed, 19 Jun 2019 15:26:09 +0200 Subject: Adding measures graph generation in the Makefile --- test/monniaux/run_benches.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index 479d09eb..5f9f22cb 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -19,8 +19,5 @@ for bench in $benches; do fi done -nawk 'FNR==1 && NR!=1{next;}{print}' $benches_csv > measures.csv -echo "measures.csv done" - -./gengraphs.py measures.csv -echo "Graphs done" +nawk 'FNR==1 && NR!=1{next;}{print}' $benches_csv > $1 +echo "$1 done" -- cgit From fd2898bef357da68ae4962120ce723748b488137 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Sat, 29 Jun 2019 16:32:28 +0200 Subject: Decreasing amount of concurrent -j5 on run_benches.sh --- test/monniaux/run_benches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index 5f9f22cb..a562a117 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -6,7 +6,7 @@ for bench in $benches; do echo "(cd $bench && make -j5 run)" >> commands.txt done -cat commands.txt | xargs -n1 -I{} -P4 bash -c '{}' +cat commands.txt | xargs -n1 -I{} -P5 bash -c '{}' ## # Gather all the CSV files -- cgit From 3a78733f68c8c02f8578fbfa8ca08bbed8ac7988 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Fri, 30 Aug 2019 12:08:59 +0200 Subject: Decreasing a bit the number of processes in run_benches --- test/monniaux/run_benches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index a562a117..5f9f22cb 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -6,7 +6,7 @@ for bench in $benches; do echo "(cd $bench && make -j5 run)" >> commands.txt done -cat commands.txt | xargs -n1 -I{} -P5 bash -c '{}' +cat commands.txt | xargs -n1 -I{} -P4 bash -c '{}' ## # Gather all the CSV files -- cgit From 962c8f9935b257c1df6bddfc88ec41d4822f65c3 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Wed, 13 Nov 2019 11:55:18 +0100 Subject: Removing clutter from building + running benches --- test/monniaux/run_benches.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index 5f9f22cb..60eec865 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -3,10 +3,11 @@ source benches.sh rm -f commands.txt for bench in $benches; do - echo "(cd $bench && make -j5 run)" >> commands.txt + echo "(cd $bench && echo \"Running $bench..\" &&\ + make -j4 run > /dev/null && echo \"$bench DONE\")" >> commands.txt done -cat commands.txt | xargs -n1 -I{} -P4 bash -c '{}' +cat commands.txt | xargs -n1 -I{} -P6 bash -c '{}' ## # Gather all the CSV files -- cgit From def114623f2d03ea7838900b531f7b3beec5a7a0 Mon Sep 17 00:00:00 2001 From: Cyril SIX Date: Tue, 26 Nov 2019 17:07:59 +0100 Subject: run-benches.sh adapting to number of CPU cores --- test/monniaux/run_benches.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test/monniaux/run_benches.sh') diff --git a/test/monniaux/run_benches.sh b/test/monniaux/run_benches.sh index 60eec865..2b2e28d6 100755 --- a/test/monniaux/run_benches.sh +++ b/test/monniaux/run_benches.sh @@ -1,13 +1,16 @@ source benches.sh +cores=$(grep -c ^processor /proc/cpuinfo) +processes=$((cores/4)) + rm -f commands.txt for bench in $benches; do echo "(cd $bench && echo \"Running $bench..\" &&\ make -j4 run > /dev/null && echo \"$bench DONE\")" >> commands.txt done -cat commands.txt | xargs -n1 -I{} -P6 bash -c '{}' +cat commands.txt | xargs -n1 -I{} -P$processes bash -c '{}' ## # Gather all the CSV files -- cgit