git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ivshmem: remove library and its EAL integration
[dpdk.git]
/
app
/
test
/
autotest_data.py
diff --git
a/app/test/autotest_data.py
b/app/test/autotest_data.py
index
bdb7e94
..
9e8fd94
100644
(file)
--- a/
app/test/autotest_data.py
+++ b/
app/test/autotest_data.py
@@
-1,14
+1,14
@@
#!/usr/bin/python
# BSD LICENSE
#!/usr/bin/python
# BSD LICENSE
-#
+#
# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
# 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:
# 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
# * 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.
# * 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
# 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
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
# 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",
{
"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",
{
"Name" : "Timer autotest",
"Command" : "timer_autotest",
@@
-69,7
+74,7
@@
parallel_test_group_list = [
"Command" : "debug_autotest",
"Func" : default_autotest,
"Report" : None,
"Command" : "debug_autotest",
"Func" : default_autotest,
"Report" : None,
- },
+ },
{
"Name" : "Errno autotest",
"Command" : "errno_autotest",
{
"Name" : "Errno autotest",
"Command" : "errno_autotest",
@@
-87,31
+92,19
@@
parallel_test_group_list = [
"Command" : "common_autotest",
"Func" : default_autotest,
"Report" : None,
"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" : d
ump
_autotest,
+ "Name" : "
Resource autotest
",
+ "Command" : "
resource_autotest
",
+ "Func" : d
efault
_autotest,
"Report" : None,
},
]
},
{
"Prefix": "group_2",
"Report" : None,
},
]
},
{
"Prefix": "group_2",
- "Memory" : "
32
",
- "Tests" :
+ "Memory" : "
16
",
+ "Tests" :
[
{
"Name" : "Memory autotest",
[
{
"Name" : "Memory autotest",
@@
-165,8
+158,8
@@
parallel_test_group_list = [
},
{
"Prefix": "group_3",
},
{
"Prefix": "group_3",
- "Memory" :
all_sockets(256
),
- "Tests" :
+ "Memory" :
per_sockets(512
),
+ "Tests" :
[
{
"Name" : "LPM autotest",
[
{
"Name" : "LPM autotest",
@@
-174,6
+167,12
@@
parallel_test_group_list = [
"Func" : default_autotest,
"Report" : None,
},
"Func" : default_autotest,
"Report" : None,
},
+ {
+ "Name" : "LPM6 autotest",
+ "Command" : "lpm6_autotest",
+ "Func" : default_autotest,
+ "Report" : None,
+ },
{
"Name" : "Memcpy autotest",
"Command" : "memcpy_autotest",
{
"Name" : "Memcpy autotest",
"Command" : "memcpy_autotest",
@@
-202,8
+201,8
@@
parallel_test_group_list = [
},
{
"Prefix": "group_4",
},
{
"Prefix": "group_4",
- "Memory" :
all
_sockets(128),
- "Tests" :
+ "Memory" :
per
_sockets(128),
+ "Tests" :
[
{
"Name" : "PCI autotest",
[
{
"Name" : "PCI autotest",
@@
-245,8
+244,8
@@
parallel_test_group_list = [
},
{
"Prefix": "group_5",
},
{
"Prefix": "group_5",
- "Memory" : "
16
",
- "Tests" :
+ "Memory" : "
32
",
+ "Tests" :
[
{
"Name" : "Spinlock autotest",
[
{
"Name" : "Spinlock autotest",
@@
-282,8
+281,8
@@
parallel_test_group_list = [
},
{
"Prefix": "group_6",
},
{
"Prefix": "group_6",
- "Memory" :
all_sockets(620
),
- "Tests" :
+ "Memory" :
per_sockets(512
),
+ "Tests" :
[
{
"Name" : "Function reentrancy autotest",
[
{
"Name" : "Function reentrancy autotest",
@@
-319,7
+318,7
@@
parallel_test_group_list = [
},
{
"Prefix" : "group_7",
},
{
"Prefix" : "group_7",
- "Memory" : "
400
",
+ "Memory" : "
64
",
"Tests" :
[
{
"Tests" :
[
{
@@
-333,12
+332,6
@@
parallel_test_group_list = [
"Command" : "acl_autotest",
"Func" : default_autotest,
"Report" : None,
"Command" : "acl_autotest",
"Func" : default_autotest,
"Report" : None,
- },
- {
- "Name" : "Pattern match autotest",
- "Command" : "pm_autotest",
- "Func" : default_autotest,
- "Report" : None,
},
{
"Name" :"Sched autotest",
},
{
"Name" :"Sched autotest",
@@
-368,15
+361,9
@@
non_parallel_test_group_list = [
},
{
"Prefix": "mempool_perf",
},
{
"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",
{
"Name" : "Mempool performance autotest",
"Command" : "mempool_perf_autotest",
@@
-387,8
+374,8
@@
non_parallel_test_group_list = [
},
{
"Prefix": "memcpy_perf",
},
{
"Prefix": "memcpy_perf",
- "Memory" :
all
_sockets(512),
- "Tests" :
+ "Memory" :
per
_sockets(512),
+ "Tests" :
[
{
"Name" : "Memcpy performance autotest",
[
{
"Name" : "Memcpy performance autotest",
@@
-400,8
+387,8
@@
non_parallel_test_group_list = [
},
{
"Prefix": "hash_perf",
},
{
"Prefix": "hash_perf",
- "Memory" :
all
_sockets(512),
- "Tests" :
+ "Memory" :
per
_sockets(512),
+ "Tests" :
[
{
"Name" : "Hash performance autotest",
[
{
"Name" : "Hash performance autotest",
@@
-413,7
+400,7
@@
non_parallel_test_group_list = [
},
{
"Prefix" : "power",
},
{
"Prefix" : "power",
- "Memory" :
all_sockets(512)
,
+ "Memory" :
"16"
,
"Tests" :
[
{
"Tests" :
[
{
@@
-425,35
+412,35
@@
non_parallel_test_group_list = [
]
},
{
]
},
{
- "Prefix" : "
lpm6
",
- "Memory" : "
512
",
+ "Prefix" : "
power_acpi_cpufreq
",
+ "Memory" : "
16
",
"Tests" :
[
{
"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",
},
]
},
{
"Prefix": "timer_perf",
- "Memory" :
all
_sockets(512),
- "Tests" :
+ "Memory" :
per
_sockets(512),
+ "Tests" :
[
{
"Name" : "Timer performance autotest",
[
{
"Name" : "Timer performance autotest",
@@
-463,4
+450,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,
+ },
+ ]
+},
]
]