Each test requires a certain minimal amount of memory.
Spreading memory on all sockets means that the test will get less memory than
what it wanted on multi sockets system.
So replace all_sockets() with per_sockets().
Also doubled memory on group_5 as current requirement is not enough.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Signed-off-by: David Marchand <david.marchand@6wind.com>
-# spread given number for all sockets
-# e.g. 32 becomes 16,16 or 8,8,8,8 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
- "Memory" : all_sockets(8),
+ "Memory" : per_sockets(8),
},
{
"Prefix": "group_3",
},
{
"Prefix": "group_3",
- "Memory" : all_sockets(1024),
+ "Memory" : per_sockets(1024),
},
{
"Prefix": "group_4",
},
{
"Prefix": "group_4",
- "Memory" : all_sockets(128),
+ "Memory" : per_sockets(128),
},
{
"Prefix": "group_5",
},
{
"Prefix": "group_5",
},
{
"Prefix": "group_6",
},
{
"Prefix": "group_6",
- "Memory" : all_sockets(620),
+ "Memory" : per_sockets(620),
},
{
"Prefix": "mempool_perf",
},
{
"Prefix": "mempool_perf",
- "Memory" : all_sockets(256),
+ "Memory" : per_sockets(256),
},
{
"Prefix": "memcpy_perf",
},
{
"Prefix": "memcpy_perf",
- "Memory" : all_sockets(512),
+ "Memory" : per_sockets(512),
},
{
"Prefix": "hash_perf",
},
{
"Prefix": "hash_perf",
- "Memory" : all_sockets(512),
+ "Memory" : per_sockets(512),
- "Memory" : all_sockets(512),
+ "Memory" : per_sockets(512),
},
{
"Prefix" : "power_acpi_cpufreq",
},
{
"Prefix" : "power_acpi_cpufreq",
- "Memory" : all_sockets(512),
+ "Memory" : per_sockets(512),
},
{
"Prefix": "timer_perf",
},
{
"Prefix": "timer_perf",
- "Memory" : all_sockets(512),
+ "Memory" : per_sockets(512),
#
{
"Prefix": "ring_perf",
#
{
"Prefix": "ring_perf",
- "Memory" : all_sockets(512),
+ "Memory" : per_sockets(512),