From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by dpdk.org (Postfix) with ESMTP id E534DDE4 for ; Mon, 1 Jun 2015 14:11:10 +0200 (CEST) Received: by wicmx19 with SMTP id mx19so68807874wic.0 for ; Mon, 01 Jun 2015 05:11:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=669W+Ivrf2yaT5bgl5MBq4FrC0KFEBdOFXz+27ZKQcc=; b=YCHvlUVL4ppZM2UAH86EaOxhgUbgRIqLjds7KFmd1RbKoKLdQzk3pub4iqlaOR2OaH VMKF52CqyTaVsG0MBSJ25cQQQf/ZvLMmPDvJfIR4hFes1xD8CeKV28wy3gcbkC2YyG+8 1UOZZh7wW1uDsaV0adWb8606MtKySPLoOqSjp0++X/udMiJI2zX2Jb3uON5nNdB1tilv gEAmXUEdIYCNEpQC6Ioewy0Udh3m19XCp1W/fTfjVXSoI6XJejCmMe5FIPeDJNW146iH 8oW4ccz8bGecLWE1/fyJJESn16LKeo73s7L3AALnN211huRarB53Tj7/Ey5x2EfQESVY uG1Q== X-Gm-Message-State: ALoCoQl61TXhlKRRVZX3WfSPTVbT7iomYpqAkaQzcUPIrB+TTZfrvAZ4NoU0d06dInjIAxd+5C5Q X-Received: by 10.180.95.163 with SMTP id dl3mr20358786wib.30.1433160670694; Mon, 01 Jun 2015 05:11:10 -0700 (PDT) Received: from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id fa8sm16382817wib.14.2015.06.01.05.11.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 05:11:09 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Mon, 1 Jun 2015 14:11:00 +0200 Message-Id: <1433160660-20773-1-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 Subject: [dpdk-dev] [PATCH] app/test: fix default memory assignment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2015 12:11:11 -0000 From: Gaetan Rivet 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 Signed-off-by: David Marchand --- app/test/autotest_data.py | 61 ++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index 618a946..0c3802b 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -43,11 +43,10 @@ def num_sockets(): return 1 return result -# 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 @@ -55,8 +54,8 @@ parallel_test_group_list = [ { "Prefix": "group_1", - "Memory" : all_sockets(8), - "Tests" : + "Memory" : per_sockets(8), + "Tests" : [ { "Name" : "Timer autotest", @@ -69,7 +68,7 @@ parallel_test_group_list = [ "Command" : "debug_autotest", "Func" : default_autotest, "Report" : None, - }, + }, { "Name" : "Errno autotest", "Command" : "errno_autotest", @@ -87,7 +86,7 @@ parallel_test_group_list = [ "Command" : "common_autotest", "Func" : default_autotest, "Report" : None, - }, + }, { "Name" : "Dump log history", "Command" : "dump_log_history", @@ -111,7 +110,7 @@ parallel_test_group_list = [ { "Prefix": "group_2", "Memory" : "32", - "Tests" : + "Tests" : [ { "Name" : "Memory autotest", @@ -165,8 +164,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_3", - "Memory" : all_sockets(1024), - "Tests" : + "Memory" : per_sockets(1024), + "Tests" : [ { "Name" : "LPM autotest", @@ -208,8 +207,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_4", - "Memory" : all_sockets(128), - "Tests" : + "Memory" : per_sockets(128), + "Tests" : [ { "Name" : "PCI autotest", @@ -251,8 +250,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_5", - "Memory" : "16", - "Tests" : + "Memory" : "32", + "Tests" : [ { "Name" : "Spinlock autotest", @@ -288,8 +287,8 @@ parallel_test_group_list = [ }, { "Prefix": "group_6", - "Memory" : all_sockets(620), - "Tests" : + "Memory" : per_sockets(620), + "Tests" : [ { "Name" : "Function reentrancy autotest", @@ -368,8 +367,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "mempool_perf", - "Memory" : all_sockets(256), - "Tests" : + "Memory" : per_sockets(256), + "Tests" : [ { "Name" : "Cycles autotest", @@ -387,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", @@ -400,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", @@ -413,7 +412,7 @@ non_parallel_test_group_list = [ }, { "Prefix" : "power", - "Memory" : all_sockets(512), + "Memory" : per_sockets(512), "Tests" : [ { @@ -426,7 +425,7 @@ non_parallel_test_group_list = [ }, { "Prefix" : "power_acpi_cpufreq", - "Memory" : all_sockets(512), + "Memory" : per_sockets(512), "Tests" : [ { @@ -465,8 +464,8 @@ non_parallel_test_group_list = [ }, { "Prefix": "timer_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Timer performance autotest", @@ -476,14 +475,14 @@ non_parallel_test_group_list = [ }, ] }, - + # # Please always make sure that ring_perf is the last test! # { "Prefix": "ring_perf", - "Memory" : all_sockets(512), - "Tests" : + "Memory" : per_sockets(512), + "Tests" : [ { "Name" : "Ring performance autotest", -- 1.7.10.4