X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fautotest_data.py;h=c69705ed459b406e6783d08d915c769328213f61;hb=38c9817ee1d8;hp=a48c1e075eb79d3dcde3d0cb96e2b111065609a3;hpb=20309d504068c089bf853f78c55b738e78406862;p=dpdk.git diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index a48c1e075e..c69705ed45 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -1,14 +1,14 @@ #!/usr/bin/python # BSD LICENSE -# -# Copyright(c) 2010-2013 Intel Corporation. All rights reserved. +# +# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -18,7 +18,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -43,11 +43,10 @@ def num_sockets(): return 1 return result -# multiply given number for all sockets -# e.g. 32 becomes 32,32 or 32,32,32,32 etc. -def all_sockets(num): - mem_per_socket = num / num_sockets() - return ",".join([str(mem_per_socket)] * num_sockets()) +# Assign given number to each socket +# e.g. 32 becomes 32,32 or 32,32,32,32 +def per_sockets(num): + return ",".join([str(num)] * num_sockets()) # groups of tests that can be run in parallel # the grouping has been found largely empirically @@ -55,9 +54,15 @@ parallel_test_group_list = [ { "Prefix": "group_1", - "Memory" : all_sockets(8), - "Tests" : + "Memory" : per_sockets(8), + "Tests" : [ + { + "Name" : "Cycles autotest", + "Command" : "cycles_autotest", + "Func" : default_autotest, + "Report" : None, + }, { "Name" : "Timer autotest", "Command" : "timer_autotest", @@ -69,7 +74,7 @@ parallel_test_group_list = [ "Command" : "debug_autotest", "Func" : default_autotest, "Report" : None, - }, + }, { "Name" : "Errno autotest", "Command" : "errno_autotest", @@ -87,31 +92,19 @@ parallel_test_group_list = [ "Command" : "common_autotest", "Func" : default_autotest, "Report" : None, - }, - { - "Name" : "Dump log history", - "Command" : "dump_log_history", - "Func" : dump_autotest, - "Report" : None, - }, - { - "Name" : "Dump rings", - "Command" : "dump_ring", - "Func" : dump_autotest, - "Report" : None, }, { - "Name" : "Dump mempools", - "Command" : "dump_mempool", - "Func" : dump_autotest, + "Name" : "Resource autotest", + "Command" : "resource_autotest", + "Func" : default_autotest, "Report" : None, }, ] }, { "Prefix": "group_2", - "Memory" : "32", - "Tests" : + "Memory" : "16", + "Tests" : [ { "Name" : "Memory autotest", @@ -165,8 +158,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_3", - "Memory" : all_sockets(256), - "Tests" : + "Memory" : per_sockets(390), + "Tests" : [ { "Name" : "LPM autotest", @@ -174,6 +167,18 @@ parallel_test_group_list = [ "Func" : default_autotest, "Report" : None, }, + { + "Name" : "LPM6 autotest", + "Command" : "lpm6_autotest", + "Func" : default_autotest, + "Report" : None, + }, + { + "Name" : "IVSHMEM autotest", + "Command" : "ivshmem_autotest", + "Func" : default_autotest, + "Report" : None, + }, { "Name" : "Memcpy autotest", "Command" : "memcpy_autotest", @@ -202,8 +207,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_4", - "Memory" : all_sockets(128), - "Tests" : + "Memory" : per_sockets(128), + "Tests" : [ { "Name" : "PCI autotest", @@ -245,8 +250,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_5", - "Memory" : "16", - "Tests" : + "Memory" : "32", + "Tests" : [ { "Name" : "Spinlock autotest", @@ -282,8 +287,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_6", - "Memory" : all_sockets(620), - "Tests" : + "Memory" : per_sockets(128), + "Tests" : [ { "Name" : "Function reentrancy autotest", @@ -319,18 +324,18 @@ parallel_test_group_list = [ }, { "Prefix" : "group_7", - "Memory" : "400", + "Memory" : "64", "Tests" : [ { - "Name" : "Access list control autotest", - "Command" : "acl_autotest", + "Name" : "PMD ring autotest", + "Command" : "ring_pmd_autotest", "Func" : default_autotest, "Report" : None, }, { - "Name" : "Pattern match autotest", - "Command" : "pm_autotest", + "Name" : "Access list control autotest", + "Command" : "acl_autotest", "Func" : default_autotest, "Report" : None, }, @@ -362,15 +367,9 @@ non_parallel_test_group_list = [ }, { "Prefix": "mempool_perf", - "Memory" : all_sockets(256), - "Tests" : + "Memory" : per_sockets(256), + "Tests" : [ - { - "Name" : "Cycles autotest", - "Command" : "cycles_autotest", - "Func" : default_autotest, - "Report" : None, - }, { "Name" : "Mempool performance autotest", "Command" : "mempool_perf_autotest", @@ -381,8 +380,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "memcpy_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Memcpy performance autotest", @@ -394,8 +393,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "hash_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Hash performance autotest", @@ -407,7 +406,7 @@ non_parallel_test_group_list = [ }, { "Prefix" : "power", - "Memory" : all_sockets(512), + "Memory" : "16", "Tests" : [ { @@ -419,35 +418,35 @@ non_parallel_test_group_list = [ ] }, { - "Prefix" : "lpm6", - "Memory" : "512", + "Prefix" : "power_acpi_cpufreq", + "Memory" : "16", "Tests" : [ { - "Name" : "LPM6 autotest", - "Command" : "lpm6_autotest", - "Func" : default_autotest, - "Report" : None, - }, + "Name" : "Power ACPI cpufreq autotest", + "Command" : "power_acpi_cpufreq_autotest", + "Func" : default_autotest, + "Report" : None, + }, ] }, { - "Prefix": "ring_perf", - "Memory" : all_sockets(512), - "Tests" : + "Prefix" : "power_kvm_vm", + "Memory" : "16", + "Tests" : [ { - "Name" : "Ring performance autotest", - "Command" : "ring_perf_autotest", - "Func" : default_autotest, - "Report" : None, + "Name" : "Power KVM VM autotest", + "Command" : "power_kvm_vm_autotest", + "Func" : default_autotest, + "Report" : None, }, ] }, { "Prefix": "timer_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Timer performance autotest", @@ -457,4 +456,21 @@ non_parallel_test_group_list = [ }, ] }, + +# +# Please always make sure that ring_perf is the last test! +# +{ + "Prefix": "ring_perf", + "Memory" : per_sockets(512), + "Tests" : + [ + { + "Name" : "Ring performance autotest", + "Command" : "ring_perf_autotest", + "Func" : default_autotest, + "Report" : None, + }, + ] +}, ]