From patchwork Fri Mar 29 17:22:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 51930 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09C054C91; Fri, 29 Mar 2019 18:22:51 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 488DF2C28 for ; Fri, 29 Mar 2019 18:22:45 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A68B4307E056 for ; Fri, 29 Mar 2019 17:22:44 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (ovpn-121-152.rdu2.redhat.com [10.10.121.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63CFE60BFB for ; Fri, 29 Mar 2019 17:22:44 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Date: Fri, 29 Mar 2019 13:22:39 -0400 Message-Id: <20190329172241.11916-2-aconole@redhat.com> In-Reply-To: <20190329172241.11916-1-aconole@redhat.com> References: <20190329172241.11916-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 29 Mar 2019 17:22:44 +0000 (UTC) Subject: [dpdk-dev] [RFC 1/3] test/meson: auto detect number of cores X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Some environments do not provide a minimum 4 cores for running tests. This allows those environments to still execute 'ninja test' without causing multiple failures. Signed-off-by: Aaron Conole --- app/test/meson.build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/test/meson.build b/app/test/meson.build index ddb4d09ae..975b38daa 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -337,10 +337,15 @@ if get_option('tests') timeout_seconds = 600 timeout_seconds_fast = 10 + # Retreive the number of CPU cores + num_cores = run_command('lscpu', '-p=cpu').stdout().strip().split('\n')[-1] + num_cores_arg = '-l 0-' + num_cores + + test_args = [num_cores_arg, '-n 4'] foreach arg : fast_parallel_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : ['-c f','-n 4', '--file-prefix=@0@'.format(arg)], + args : test_args + ['--file-prefix=@0@'.format(arg)], timeout : timeout_seconds_fast, suite : 'fast-tests') endforeach @@ -348,6 +353,7 @@ if get_option('tests') foreach arg : fast_non_parallel_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], timeout : timeout_seconds_fast, is_parallel : false, suite : 'fast-tests') @@ -356,6 +362,7 @@ if get_option('tests') foreach arg : perf_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], timeout : timeout_seconds, is_parallel : false, suite : 'perf-tests') @@ -364,6 +371,7 @@ if get_option('tests') foreach arg : driver_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], timeout : timeout_seconds, is_parallel : false, suite : 'driver-tests') @@ -372,6 +380,7 @@ if get_option('tests') foreach arg : dump_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], timeout : timeout_seconds, is_parallel : false, suite : 'debug-tests') From patchwork Fri Mar 29 17:22:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 51931 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F0C114CAB; Fri, 29 Mar 2019 18:22:53 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A50251B05 for ; Fri, 29 Mar 2019 18:22:45 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1ABB01E2CC for ; Fri, 29 Mar 2019 17:22:45 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (ovpn-121-152.rdu2.redhat.com [10.10.121.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8FFC60BFB for ; Fri, 29 Mar 2019 17:22:44 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Date: Fri, 29 Mar 2019 13:22:40 -0400 Message-Id: <20190329172241.11916-3-aconole@redhat.com> In-Reply-To: <20190329172241.11916-1-aconole@redhat.com> References: <20190329172241.11916-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 29 Mar 2019 17:22:45 +0000 (UTC) Subject: [dpdk-dev] [RFC 2/3] meson-tests: separate slower tests X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When running some tests in the CI environment, the run time can take in excess of 10 minutes to produce output. This causes the entire CI run not to succeed. Separate these tests so that they can be run from a normal environment, and deselected in a CI environment. There's also a small whitespace fix bundled in for the perf_tests block. Signed-off-by: Aaron Conole --- app/test/meson.build | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 975b38daa..1b0ff0523 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -171,7 +171,6 @@ fast_parallel_test_names = [ 'red_autotest', 'ring_autotest', 'ring_pmd_autotest', - 'rwlock_autotest', 'sched_autotest', 'spinlock_autotest', 'string_autotest', @@ -214,15 +213,21 @@ fast_non_parallel_test_names = [ 'thash_autotest', ] +# These test cases are non-parallel and also take > 10m to execute in +# some environments (such as CI systems), so allow deselecting them +slow_test_names = [ + 'rwlock_autotest', + 'mempool_perf_autotest', + 'reciprocal_division', + 'reciprocal_division_perf', +] + # All test cases in perf_test_names list are non-parallel perf_test_names = [ 'ring_perf_autotest', - 'mempool_perf_autotest', 'memcpy_perf_autotest', 'hash_perf_autotest', 'timer_perf_autotest', - 'reciprocal_division', - 'reciprocal_division_perf', 'lpm_perf_autotest', 'red_all', 'barrier_autotest', @@ -332,7 +337,7 @@ if get_option('tests') install_rpath: driver_install_path, install: false) - # some perf tests (eg: memcpy perf autotest)take very long + # some tests (eg: the slow tests) take very long # to complete, so timeout to 10 minutes timeout_seconds = 600 timeout_seconds_fast = 10 @@ -359,13 +364,22 @@ if get_option('tests') suite : 'fast-tests') endforeach + foreach arg : slow_test_names + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], + timeout : timeout_seconds, + is_parallel : false, + suite : 'slow-tests') + endforeach + foreach arg : perf_test_names test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - args : test_args + ['--file-prefix=@0@'.format(arg)], - timeout : timeout_seconds, - is_parallel : false, - suite : 'perf-tests') + env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], + timeout : timeout_seconds, + is_parallel : false, + suite : 'perf-tests') endforeach foreach arg : driver_test_names From patchwork Fri Mar 29 17:22:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 51932 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DFB8A4CC5; Fri, 29 Mar 2019 18:22:56 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 184F01B05 for ; Fri, 29 Mar 2019 18:22:46 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 805AF81252 for ; Fri, 29 Mar 2019 17:22:45 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (ovpn-121-152.rdu2.redhat.com [10.10.121.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D64660BFB for ; Fri, 29 Mar 2019 17:22:45 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Date: Fri, 29 Mar 2019 13:22:41 -0400 Message-Id: <20190329172241.11916-4-aconole@redhat.com> In-Reply-To: <20190329172241.11916-1-aconole@redhat.com> References: <20190329172241.11916-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 29 Mar 2019 17:22:45 +0000 (UTC) Subject: [dpdk-dev] [RFC 3/3] ci: enable tests on non-arm platforms X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When building under Travis (or another linux CI service), enable running the tests for each build. Signed-off-by: Aaron Conole --- .ci/linux-build.sh | 7 +++++++ .ci/linux-setup.sh | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 4eb7c3cf0..72510a433 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -22,3 +22,10 @@ fi OPTS="$OPTS --default-library=$DEF_LIB" meson build --werror -Dexamples=all $OPTS ninja -C build + +if [ "$AARCH64" != "1" ]; then + sudo meson test -C build --suite fast-tests + sudo meson test -C build --suite perf-tests + sudo meson test -C build --suite driver-tests + sudo meson test -C build --suite debug-tests +fi diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh index acdf9f370..18d2b22fc 100755 --- a/.ci/linux-setup.sh +++ b/.ci/linux-setup.sh @@ -1,3 +1,7 @@ #!/bin/sh -python3 -m pip install --upgrade meson --user +sudo python3 -m pip install --upgrade meson + +cat /proc/meminfo +sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' +cat /proc/meminfo