From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH 19/27] make-bench-flight: create kernbench jobs Date: Wed, 10 Dec 2014 19:11:28 +0100 Message-ID: <20141210181128.26400.92702.stgit@Abyss.station> References: <20141210180651.26400.13356.stgit@Abyss.station> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20141210180651.26400.13356.stgit@Abyss.station> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Jackson , Wei Liu , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Dario Faggioli Cc: Wei Liu Cc: Ian Campbell Cc: Ian Jackson --- make-bench-flight | 55 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/make-bench-flight b/make-bench-flight index cdb22ff..125f244 100755 --- a/make-bench-flight +++ b/make-bench-flight @@ -56,8 +56,10 @@ test_matrix_branch_filter_callback () { } do_unixbench_tests () { - gvcpus=$1 - gmem=$2 + gt=$1 + sched=$2 + gvcpus=$3 + gmem=$4 # x86_64 only (for now) if [ $xenarch != amd64 ]; then @@ -73,20 +75,47 @@ do_unixbench_tests () { if [ $gvcpus -ge 2 ];then params="-c $(($gvcpus/2))"; fi params="$params -c $gvcpus -c $(($gvcpus*2)) -i 6" - for gt in pv hvm; do - for sched in credit credit2; do - job_create_test \ - bench-unixbench-$xenarch-$sched-$gt$gvcpus_suffix$gmem_suffix \ - bench-unixbench-$gt xl $xenarch $dom0arch $gvcpus_runvars $gmem_runvars \ - xen_boot_append="sched=$sched" unixbench_params="$params" $debian_runvars \ - bios=seabios debianhvm_image=debian-7.2.0-amd64-CD-1.iso \ - all_hostflags=$most_hostflags - done - done + job_create_test \ + bench-unixbench-$xenarch-$sched-$gt$gvcpus_suffix$gmem_suffix \ + bench-unixbench-$gt xl $xenarch $dom0arch $gvcpus_runvars $gmem_runvars \ + xen_boot_append="sched=$sched" unixbench_params="$params" $debian_runvars \ + bios=seabios debianhvm_image=debian-7.2.0-amd64-CD-1.iso \ + all_hostflags=$most_hostflags +} + +do_kernbench_tests () { + gt=$1 + sched=$2 + gvcpus=$3 + gmem=$4 + + # x86_64 only (for now) + if [ $xenarch != amd64 ]; then + return + fi + # "homogeneous" tests only (for now) + if [ $xenarch != $dom0arch ]; then + return + fi + + gvcpus_runvars=guests_vcpus=$gvcpus; gvcpus_suffix=-${gvcpus}vcpus + gmem_runvars=guests_memory=$gmem; gmem_suffix=-${gmem}ram + + job_create_test \ + bench-kernbench-$xenarch-$sched-$gt$gvcpus_suffix$gmem_suffix \ + bench-kernbench-$gt xl $xenarch $dom0arch $gvcpus_runvars $gmem_runvars \ + xen_boot_append="sched=$sched" kernbench_params="-n 4" $debian_runvars \ + bios=seabios debianhvm_image=debian-7.2.0-amd64-CD-1.iso \ + all_hostflags=$most_hostflags } test_matrix_do_one () { - do_unixbench_tests 4 4096 # 4 vcpus, 4GB RAM + for s in credit credit2; do + for t in pv hvm; do + do_unixbench_tests $t $s 4 4096 # 4 vcpus, 4GB RAM + do_kernbench_tests $t $s 4 4096 + done + done } test_matrix_iterate