X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fautotest_data.py;h=6f34d6b9e36e15de28abdc816e4c4e5a4c43dd6f;hb=34fcd34982377801accd6e64ccbd8952bfce40b8;hp=a322ce7c36add11c81b2139477183994a4c50e4e;hpb=1fb8b07ee51109f9cfda8c4b060a73d4dc781516;p=dpdk.git diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py old mode 100755 new mode 100644 index a322ce7c36..6f34d6b9e3 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -1,36 +1,35 @@ #!/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 +# +# 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 +# +# * 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 -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the # distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived +# * 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 -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# +# 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 +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# # Test data for autotests @@ -44,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 @@ -56,8 +54,8 @@ parallel_test_group_list = [ { "Prefix": "group_1", - "Memory" : "2", - "Tests" : + "Memory" : per_sockets(8), + "Tests" : [ { "Name" : "Timer autotest", @@ -70,7 +68,7 @@ parallel_test_group_list = [ "Command" : "debug_autotest", "Func" : default_autotest, "Report" : None, - }, + }, { "Name" : "Errno autotest", "Command" : "errno_autotest", @@ -88,7 +86,7 @@ parallel_test_group_list = [ "Command" : "common_autotest", "Func" : default_autotest, "Report" : None, - }, + }, { "Name" : "Dump log history", "Command" : "dump_log_history", @@ -111,8 +109,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_2", - "Memory" : "32", - "Tests" : + "Memory" : "64", + "Tests" : [ { "Name" : "Memory autotest", @@ -166,8 +164,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_3", - "Memory" : all_sockets(256), - "Tests" : + "Memory" : per_sockets(1024), + "Tests" : [ { "Name" : "LPM autotest", @@ -175,6 +173,12 @@ parallel_test_group_list = [ "Func" : default_autotest, "Report" : None, }, + { + "Name" : "IVSHMEM autotest", + "Command" : "ivshmem_autotest", + "Func" : default_autotest, + "Report" : None, + }, { "Name" : "Memcpy autotest", "Command" : "memcpy_autotest", @@ -203,8 +207,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_4", - "Memory" : all_sockets(128), - "Tests" : + "Memory" : per_sockets(128), + "Tests" : [ { "Name" : "PCI autotest", @@ -236,12 +240,18 @@ parallel_test_group_list = [ "Func" : default_autotest, "Report" : None, }, + { + "Name" : "Ring autotest", + "Command" : "ring_autotest", + "Func" : default_autotest, + "Report" : None, + }, ] }, { "Prefix": "group_5", - "Memory" : "16", - "Tests" : + "Memory" : "32", + "Tests" : [ { "Name" : "Spinlock autotest", @@ -277,8 +287,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_6", - "Memory" : all_sockets(600), - "Tests" : + "Memory" : per_sockets(620), + "Tests" : [ { "Name" : "Function reentrancy autotest", @@ -318,14 +328,14 @@ parallel_test_group_list = [ "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, }, @@ -357,8 +367,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "mempool_perf", - "Memory" : all_sockets(256), - "Tests" : + "Memory" : per_sockets(256), + "Tests" : [ { "Name" : "Cycles autotest", @@ -376,8 +386,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "memcpy_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Memcpy performance autotest", @@ -389,8 +399,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "hash_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Hash performance autotest", @@ -402,7 +412,7 @@ non_parallel_test_group_list = [ }, { "Prefix" : "power", - "Memory" : all_sockets(512), + "Memory" : per_sockets(512), "Tests" : [ { @@ -413,6 +423,32 @@ non_parallel_test_group_list = [ }, ] }, +{ + "Prefix" : "power_acpi_cpufreq", + "Memory" : per_sockets(512), + "Tests" : + [ + { + "Name" : "Power ACPI cpufreq autotest", + "Command" : "power_acpi_cpufreq_autotest", + "Func" : default_autotest, + "Report" : None, + }, + ] +}, +{ + "Prefix" : "power_kvm_vm", + "Memory" : "512", + "Tests" : + [ + { + "Name" : "Power KVM VM autotest", + "Command" : "power_kvm_vm_autotest", + "Func" : default_autotest, + "Report" : None, + }, + ] +}, { "Prefix" : "lpm6", "Memory" : "512", @@ -427,17 +463,33 @@ non_parallel_test_group_list = [ ] }, { - "Prefix": "ring_perf", - "Memory" : all_sockets(512), - "Tests" : + "Prefix": "timer_perf", + "Memory" : per_sockets(512), + "Tests" : [ { - "Name" : "Ring autotest", - "Command" : "ring_autotest", - "Func" : ring_autotest, + "Name" : "Timer performance autotest", + "Command" : "timer_perf_autotest", + "Func" : default_autotest, "Report" : None, }, ] }, +# +# 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, + }, + ] +}, ]