From patchwork Tue Oct 19 11:26:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 102212 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 94B75A0C43; Tue, 19 Oct 2021 13:27:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC3B1411BC; Tue, 19 Oct 2021 13:26:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id 401614111D for ; Tue, 19 Oct 2021 13:26:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634642773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1zZUB8Hq7HzHeHS+kFtSb2bCHBaDd96m85TWgiSDpG4=; b=gyAlEKL//BgZzxnqKbVB2nJ/VNX1ULOU0wOol3UsejqM7y45dNdMOqsXlmELr8hRPzBb9r c2v8JU8+d5bSEBdxOIkZE61sArSjxMF/ZsyamlRHzP+J+MV9BwnXzHB7E5SA5sTEQSjKiI 24XQ4V/MO7e1awdZ5VgahDhNn7B+P0M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-483-19TRjtAfNt24nv0EK2ajUg-1; Tue, 19 Oct 2021 07:26:10 -0400 X-MC-Unique: 19TRjtAfNt24nv0EK2ajUg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B9F5800685; Tue, 19 Oct 2021 11:26:09 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14DCB5F4E1; Tue, 19 Oct 2021 11:26:06 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: aconole@redhat.com, blo@iol.unh.edu, bruce.richardson@intel.com Date: Tue, 19 Oct 2021 13:26:02 +0200 Message-Id: <20211019112602.17782-1-david.marchand@redhat.com> In-Reply-To: <20211018170136.5189-1-david.marchand@redhat.com> References: <20211018170136.5189-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v2] test: rely on EAL detection for core list X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Cores count has a direct impact on the time needed to complete unit tests. Currently, the core list used for unit test is enforced to "all cores on the system" with no way for (CI) users to adapt it. On the other hand, EAL default behavior (when no -c/-l option gets passed) is to start threads on as many cores available in the process cpu affinity. Remove logic from meson: users can then select where to run the tests by either running meson with a custom cpu affinity (using taskset/cpuset depending on OS) or by passing a --test-args option to meson. Example: $ sudo meson test -C build --suite fast-tests -t 3 --test-args "-l 0-3" Signed-off-by: David Marchand Tested-by: Bruce Richardson Acked-by: Bruce Richardson Acked-by: Aaron Conole --- Changes since v1: - updated documentation, --- app/test/get-coremask.sh | 13 ------------- app/test/meson.build | 10 +--------- doc/guides/prog_guide/meson_ut.rst | 17 ++++++++++++++++- 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100755 app/test/get-coremask.sh diff --git a/app/test/get-coremask.sh b/app/test/get-coremask.sh deleted file mode 100755 index bb8cf404d2..0000000000 --- a/app/test/get-coremask.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh -e -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2019 Intel Corporation - -if [ "$(uname)" = "Linux" ] ; then - cat /sys/devices/system/cpu/present -elif [ "$(uname)" = "FreeBSD" ] ; then - ncpus=$(/sbin/sysctl -n hw.ncpu) - echo 0-$(expr $ncpus - 1) -else -# fallback - echo 0-3 -fi diff --git a/app/test/meson.build b/app/test/meson.build index a16374b7a1..c7b377d52d 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -463,13 +463,8 @@ message('hugepage availability: @0@'.format(has_hugepage)) timeout_seconds = 600 timeout_seconds_fast = 10 -get_coremask = find_program('get-coremask.sh') -num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip() - -default_test_args = [num_cores_arg] - foreach arg : fast_tests - test_args = default_test_args + test_args = [] run_test = true if not has_hugepage if arg[1] @@ -502,7 +497,6 @@ endforeach foreach arg : perf_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : default_test_args, timeout : timeout_seconds, is_parallel : false, suite : 'perf-tests') @@ -511,7 +505,6 @@ endforeach foreach arg : driver_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : default_test_args, timeout : timeout_seconds, is_parallel : false, suite : 'driver-tests') @@ -520,7 +513,6 @@ endforeach foreach arg : dump_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : default_test_args, timeout : timeout_seconds, is_parallel : false, suite : 'debug-tests') diff --git a/doc/guides/prog_guide/meson_ut.rst b/doc/guides/prog_guide/meson_ut.rst index fff88655dd..78cf3f845c 100644 --- a/doc/guides/prog_guide/meson_ut.rst +++ b/doc/guides/prog_guide/meson_ut.rst @@ -37,6 +37,14 @@ command:: $ meson test --suite fast-tests +If desired, additional arguments can be passed to the test run via the meson +``--test-args`` option. +For example, tests will by default run on as many available cores as is needed +for the test, starting with the lowest number core - generally core 0. +To run the fast-tests suite using only cores 8 through 16, one can use:: + + $ meson test --suite fast-tests --test-args="-l 8-16" + The meson command to list all available tests:: $ meson test --list @@ -47,9 +55,16 @@ Arguments of ``test()`` that can be provided in meson.build are as below: * ``is_parallel`` is used to run test case either in parallel or non-parallel mode. * ``timeout`` is used to specify the timeout of test case. -* ``args`` is used to specify test specific parameters. +* ``args`` is used to specify test specific parameters (see note below). * ``env`` is used to specify test specific environment parameters. +Note: the content of meson ``--test-args`` option and the content of ``args`` +are appended when invoking the DPDK test binary. +Because of this, it is recommended not to set any default coremask or memory +configuration in per test ``args`` and rather let users select what best fits +their environment. If a test can't run, then it should be skipped, as described +below. + Dealing with skipped test cases -------------------------------