| Message ID | 1483934694-32425-3-git-send-email-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Jan 09, 2017 at 12:04:54PM +0800, Peter Xu wrote: > run_task.sh is getting slow. This patch is trying to make it faster by > running the tests concurrently. > > We provide a new parameter "-j" for the run_tests.sh, which can be used > to specify how many run queues we want for the tests. Default queue > length is 1, which is the old behavior. > > Quick test on my laptop (4 cores, 2 threads each) shows 3x speed boost: > > |-----------------+-----------| > | command | time used | > |-----------------+-----------| > | run_test.sh | 75s | > | run_test.sh -j8 | 27s | > |-----------------+-----------| > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > run_tests.sh | 12 ++++++++++-- > scripts/common.bash | 16 +++++++++++++++- > 2 files changed, 25 insertions(+), 3 deletions(-) > > diff --git a/run_tests.sh b/run_tests.sh > index 1e36d66..795cf73 100755 > --- a/run_tests.sh > +++ b/run_tests.sh > @@ -13,10 +13,11 @@ function usage() > { > cat <<EOF > > -Usage: $0 [-g group] [-h] [-v] > +Usage: $0 [-g group] [-h] [-v] [-j num_run_queues] > > -g: Only execute tests in the given group > -h: Output this help text > + -j: Execute tests in parallel > -v: Enables verbose mode > > Set the environment variable QEMU=/path/to/qemu-system-ARCH to > @@ -28,7 +29,7 @@ EOF > RUNTIME_arch_run="./$TEST_DIR/run" > source scripts/runtime.bash > > -while getopts "g:hv" opt; do > +while getopts "g:hj:v" opt; do > case $opt in > g) > only_group=$OPTARG > @@ -37,6 +38,13 @@ while getopts "g:hv" opt; do > usage > exit > ;; > + j) > + unittest_run_queues=$OPTARG > + if ! (( "$unittest_run_queues" > 0 )); then The equivalent expression without '!' is (( $var <= 0 )), and no need for the "'s around the var. > + echo "Invalid -j option: $unittest_run_queues" > + exit 1 > + fi > + ;; > v) > verbose="yes" > ;; > diff --git a/scripts/common.bash b/scripts/common.bash > index 2dd7360..83aebf8 100644 > --- a/scripts/common.bash > +++ b/scripts/common.bash > @@ -1,11 +1,19 @@ > : ${unittest_log_dir:=logs} > +: ${unittest_run_queues:=1} > > function run_task() > { > local testname="$2" > > + while (( "$(jobs | wc -l)" == $unittest_run_queues )); do Why the "'s? The result must resolve to an int, otherwise we don't want ((...)) > + # wait for any background test to finish > + wait -n > + done > + > RUNTIME_log_file="${unittest_log_dir}/${testname}.log" > - "$@" > + > + # start the testcase in the background > + "$@" & > } > > function for_each_unittest() > @@ -22,6 +30,8 @@ function for_each_unittest() > local accel > local timeout > > + trap "wait; exit 130" SIGINT > + > exec {fd}<"$unittests" > > while read -u $fd line; do > @@ -55,5 +65,9 @@ function for_each_unittest() > fi > done > run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > + > + # wait all task finish wait until all tasks finish > + wait > + > exec {fd}<&- > } > -- > 2.7.4 > >
On Tue, Jan 10, 2017 at 06:39:59PM +0100, Andrew Jones wrote: > On Mon, Jan 09, 2017 at 12:04:54PM +0800, Peter Xu wrote: > > run_task.sh is getting slow. This patch is trying to make it faster by > > running the tests concurrently. > > > > We provide a new parameter "-j" for the run_tests.sh, which can be used > > to specify how many run queues we want for the tests. Default queue > > length is 1, which is the old behavior. > > > > Quick test on my laptop (4 cores, 2 threads each) shows 3x speed boost: > > > > |-----------------+-----------| > > | command | time used | > > |-----------------+-----------| > > | run_test.sh | 75s | > > | run_test.sh -j8 | 27s | > > |-----------------+-----------| > > > > Signed-off-by: Peter Xu <peterx@redhat.com> > > --- > > run_tests.sh | 12 ++++++++++-- > > scripts/common.bash | 16 +++++++++++++++- > > 2 files changed, 25 insertions(+), 3 deletions(-) > > > > diff --git a/run_tests.sh b/run_tests.sh > > index 1e36d66..795cf73 100755 > > --- a/run_tests.sh > > +++ b/run_tests.sh > > @@ -13,10 +13,11 @@ function usage() > > { > > cat <<EOF > > > > -Usage: $0 [-g group] [-h] [-v] > > +Usage: $0 [-g group] [-h] [-v] [-j num_run_queues] > > > > -g: Only execute tests in the given group > > -h: Output this help text > > + -j: Execute tests in parallel > > -v: Enables verbose mode > > > > Set the environment variable QEMU=/path/to/qemu-system-ARCH to > > @@ -28,7 +29,7 @@ EOF > > RUNTIME_arch_run="./$TEST_DIR/run" > > source scripts/runtime.bash > > > > -while getopts "g:hv" opt; do > > +while getopts "g:hj:v" opt; do > > case $opt in > > g) > > only_group=$OPTARG > > @@ -37,6 +38,13 @@ while getopts "g:hv" opt; do > > usage > > exit > > ;; > > + j) > > + unittest_run_queues=$OPTARG > > + if ! (( "$unittest_run_queues" > 0 )); then > > The equivalent expression without '!' is (( $var <= 0 )), and > no need for the "'s around the var. > > > + echo "Invalid -j option: $unittest_run_queues" > > + exit 1 > > + fi > > + ;; > > v) > > verbose="yes" > > ;; > > diff --git a/scripts/common.bash b/scripts/common.bash > > index 2dd7360..83aebf8 100644 > > --- a/scripts/common.bash > > +++ b/scripts/common.bash > > @@ -1,11 +1,19 @@ > > : ${unittest_log_dir:=logs} > > +: ${unittest_run_queues:=1} > > > > function run_task() > > { > > local testname="$2" > > > > + while (( "$(jobs | wc -l)" == $unittest_run_queues )); do > > Why the "'s? The result must resolve to an int, otherwise we don't > want ((...)) > > > + # wait for any background test to finish > > + wait -n > > + done > > + > > RUNTIME_log_file="${unittest_log_dir}/${testname}.log" > > - "$@" > > + > > + # start the testcase in the background > > + "$@" & > > } > > > > function for_each_unittest() > > @@ -22,6 +30,8 @@ function for_each_unittest() > > local accel > > local timeout > > > > + trap "wait; exit 130" SIGINT > > + > > exec {fd}<"$unittests" > > > > while read -u $fd line; do > > @@ -55,5 +65,9 @@ function for_each_unittest() > > fi > > done > > run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" > > + > > + # wait all task finish > > wait until all tasks finish Fixing all three places, thanks! -- peterx
diff --git a/run_tests.sh b/run_tests.sh index 1e36d66..795cf73 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -13,10 +13,11 @@ function usage() { cat <<EOF -Usage: $0 [-g group] [-h] [-v] +Usage: $0 [-g group] [-h] [-v] [-j num_run_queues] -g: Only execute tests in the given group -h: Output this help text + -j: Execute tests in parallel -v: Enables verbose mode Set the environment variable QEMU=/path/to/qemu-system-ARCH to @@ -28,7 +29,7 @@ EOF RUNTIME_arch_run="./$TEST_DIR/run" source scripts/runtime.bash -while getopts "g:hv" opt; do +while getopts "g:hj:v" opt; do case $opt in g) only_group=$OPTARG @@ -37,6 +38,13 @@ while getopts "g:hv" opt; do usage exit ;; + j) + unittest_run_queues=$OPTARG + if ! (( "$unittest_run_queues" > 0 )); then + echo "Invalid -j option: $unittest_run_queues" + exit 1 + fi + ;; v) verbose="yes" ;; diff --git a/scripts/common.bash b/scripts/common.bash index 2dd7360..83aebf8 100644 --- a/scripts/common.bash +++ b/scripts/common.bash @@ -1,11 +1,19 @@ : ${unittest_log_dir:=logs} +: ${unittest_run_queues:=1} function run_task() { local testname="$2" + while (( "$(jobs | wc -l)" == $unittest_run_queues )); do + # wait for any background test to finish + wait -n + done + RUNTIME_log_file="${unittest_log_dir}/${testname}.log" - "$@" + + # start the testcase in the background + "$@" & } function for_each_unittest() @@ -22,6 +30,8 @@ function for_each_unittest() local accel local timeout + trap "wait; exit 130" SIGINT + exec {fd}<"$unittests" while read -u $fd line; do @@ -55,5 +65,9 @@ function for_each_unittest() fi done run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + + # wait all task finish + wait + exec {fd}<&- }
run_task.sh is getting slow. This patch is trying to make it faster by running the tests concurrently. We provide a new parameter "-j" for the run_tests.sh, which can be used to specify how many run queues we want for the tests. Default queue length is 1, which is the old behavior. Quick test on my laptop (4 cores, 2 threads each) shows 3x speed boost: |-----------------+-----------| | command | time used | |-----------------+-----------| | run_test.sh | 75s | | run_test.sh -j8 | 27s | |-----------------+-----------| Signed-off-by: Peter Xu <peterx@redhat.com> --- run_tests.sh | 12 ++++++++++-- scripts/common.bash | 16 +++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-)