From patchwork Fri Sep 29 14:15:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 132218 X-Patchwork-Delegate: thomas@monjalon.net 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 74FE14266A; Fri, 29 Sep 2023 16:15:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02B4F402AD; Fri, 29 Sep 2023 16:15:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id ECB84402AA for ; Fri, 29 Sep 2023 16:15:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695996915; 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; bh=nswm6K0SAqvAaNrLhy4N5j0lTvuhaPlglRvrMzYmBd0=; b=EfsN+PEiBlRkCjNM4ZS8tPgAPdzF1UGdI5LT6ovEaU9KEWz9k0VMBxDHj9rDCVjz6uTR11 PArocYqVKOORaEU73nqFnqjIxW6ssbbODiFoA5ySXHeVhUuPJj/ZvrrDQwphSWM/Iv0iOZ kbOPMqs2moNaSJBBmXVs6/zHpI81fDo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-bgPwA9C2PAyWBhgRcIOAVQ-1; Fri, 29 Sep 2023 10:15:13 -0400 X-MC-Unique: bgPwA9C2PAyWBhgRcIOAVQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF2F4858F1B; Fri, 29 Sep 2023 14:15:12 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93379400E89; Fri, 29 Sep 2023 14:15:11 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, Aaron Conole , Michael Santana , Bruce Richardson Subject: [PATCH] ci: test stdatomic API Date: Fri, 29 Sep 2023 16:15:10 +0200 Message-ID: <20230929141510.3114938-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 Add some compilation tests with C11 atomics enabled. The headers check can't be enabled (as gcc and clang don't provide stdatomic before C++23). Signed-off-by: David Marchand Reviewed-by: Aaron Conole --- .ci/linux-build.sh | 6 +++++- .github/workflows/build.yml | 8 ++++++++ devtools/test-meson-builds.sh | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index e0b62bac90..b09df07b55 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -92,7 +92,11 @@ fi OPTS="$OPTS -Dplatform=generic" OPTS="$OPTS -Ddefault_library=$DEF_LIB" OPTS="$OPTS -Dbuildtype=$buildtype" -OPTS="$OPTS -Dcheck_includes=true" +if [ "$STDATOMIC" = "true" ]; then + OPTS="$OPTS -Denable_stdatomic=true" +else + OPTS="$OPTS -Dcheck_includes=true" +fi if [ "$MINI" = "true" ]; then OPTS="$OPTS -Denable_drivers=net/null" OPTS="$OPTS -Ddisable_libs=*" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a2ac0ceee..14328622fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,7 @@ jobs: REF_GIT_TAG: none RISCV64: ${{ matrix.config.cross == 'riscv64' }} RUN_TESTS: ${{ contains(matrix.config.checks, 'tests') }} + STDATOMIC: ${{ contains(matrix.config.checks, 'stdatomic') }} strategy: fail-fast: false @@ -38,6 +39,12 @@ jobs: - os: ubuntu-20.04 compiler: gcc mini: mini + - os: ubuntu-20.04 + compiler: gcc + checks: stdatomic + - os: ubuntu-20.04 + compiler: clang + checks: stdatomic - os: ubuntu-20.04 compiler: gcc checks: debug+doc+examples+tests @@ -241,6 +248,7 @@ jobs: > ~/env echo CC=ccache ${{ matrix.config.compiler }} >> ~/env echo DEF_LIB=${{ matrix.config.library }} >> ~/env + echo STDATOMIC=false >> ~/env - name: Load the cached image run: | docker load -i ~/.image/${{ matrix.config.image }}.tar diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index c41659d28b..ca32e3d5a5 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -239,6 +239,9 @@ done build build-mini cc skipABI $use_shared -Ddisable_libs=* \ -Denable_drivers=net/null +build build-gcc-shared-stdatomic gcc skipABI -Denable_stdatomic=true $use_shared +build build-clang-shared-stdatomic clang skipABI -Denable_stdatomic=true $use_shared + # test compilation with minimal x86 instruction set # Set the install path for libraries to "lib" explicitly to prevent problems # with pkg-config prefixes if installed in "lib/x86_64-linux-gnu" later.