From patchwork Wed May 12 10:20:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 435500 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4701555jao; Wed, 12 May 2021 03:43:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW5184qb+pS4dbv9kj5ml5sWDplNvufJRBoHlnYKhY0WgpPQbuDmlU2ox+oVMSh85jB8yc X-Received: by 2002:aed:2043:: with SMTP id 61mr32273944qta.308.1620816180500; Wed, 12 May 2021 03:43:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620816180; cv=none; d=google.com; s=arc-20160816; b=INyXxu0KZ2XIqdSEhp1SgjJIA37h7Zyjmyjgf5xy+hYcgvPgyww5ymhDsfbxlQG7uk UIFKzTMSVsQLQB45ht1O2XPet5kdG04zAYdox+WRcMAreKAVCw2Qdld9DQRTV4yihSWf M96psN7YeyhkM7AyfgADujBF19L7PI4tKW1uGSDrMmJqmXxHOkxeW/u5onm0enFQ0YtI e4Tk1mPi30CJldH6P4yuroK4DbPeZ16RciYn/WkqCYlmpbvysZ5gL5LQEgQh66Yi+GrD /0DgLyikrEUSrkx9Gv9NG43XL8ukAEEmIEfiCTxd+pd09cagfNa0DnNjC3XN/UY3TILp 3vjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=W/ukiiX+2G/6Tr/Ondx70r9sB5+hCuUswyNpWg3QywQ=; b=vO7Hjbtwaq3bhYzLDNqSRGYEqcLBetHYQo/IJTxv8R3e1+tBmBDuXya8ei8JNE7jfU d579yChUGSAa/f1iLi2Kadw7eunLjhXXbBjddDZ9uPc1F5tqqkNihdgDrli6j6PJejsj YM0EhBHq3kYSaEq5eti7FWmtvOlHs31eNWy/n9x3dTV0mvaJBWa7fXRj9TNT9646T2Yr 0y2/3PM36iQTjice4WKbEobw5M8E88ac3efcRBnC93fAE/GnXywQGabwhZRluIVPILp6 7EJYJu4qNGvfQ6Ou5dv3xXQtd6xV46GupGNY9fsUo0U7Hl5130RNkqoPEtZuuARjXNOk CgXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bj1scvms; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 2si1623510qvr.200.2021.05.12.03.43.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 May 2021 03:43:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bj1scvms; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgmKR-0001sb-Ip for patch@linaro.org; Wed, 12 May 2021 06:42:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgm8a-0000l7-Oa for qemu-devel@nongnu.org; Wed, 12 May 2021 06:30:45 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:42796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgm8W-0000cS-Te for qemu-devel@nongnu.org; Wed, 12 May 2021 06:30:44 -0400 Received: by mail-wr1-x429.google.com with SMTP id x8so785333wrq.9 for ; Wed, 12 May 2021 03:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W/ukiiX+2G/6Tr/Ondx70r9sB5+hCuUswyNpWg3QywQ=; b=bj1scvmsNYCoCkdycAFhvakxB1xDc//rrUjiKbv8PBilHVJZtM8HTufy+Q/Cdl0pMR 25e2BCr63uF9uty3rZvY/dZMjHorYATRJIHsv3tQerWO52hVPlJbVmZLyJEs6iJDVcw3 YDgm+7YHwZ2sqiWT6RcSJjd1lFEoZgnrYq6B0CVlDAxvsHKQCVpkNc5llbXqxTErR2e7 gYtUtqJuKU0J7+NSLQTjQ/LX9KSt6ZCoyMgkQTZkTM7+6rF7U1LCzcJquvW4YnweEowB xXYgqD29EeL2WibYxvrs4ev7FT18wAKPc6KHygfV+grMa/DiPHd6IlrZZRws7TTEIf7e AuQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W/ukiiX+2G/6Tr/Ondx70r9sB5+hCuUswyNpWg3QywQ=; b=m2lCUFIcdzjJGEjB7WtjNDb8JUb9SRUa6AzEr9hyIdHDA8A0CB1NcF9CsRzqoyD43t yq4oEATv+g1LbpggOm4LrHT9+fC1vhPiCfrMCxjLtEiwSpVD8ftMu39vwKlH+tjXexEA rHuDGdgLxC1VMea2bOZcq5kUqLSd5JfqLevlteskTOepo/yAD6zjPkZ9OwmRHMjqQJjh Z07Ix+xONBIBt48QRb5kDKsQW3U83UwgzDchbo17xWqbix7EyF8YunbH24c+2i05XLKw 6ZOJI3HHFvZsH1zFYpQYcodm9vI3RFZPTWhK5F+yiD7bWwENc5unZipbwfZeDvvM0azD ihmw== X-Gm-Message-State: AOAM530Nx562SsCBuJTjIXl7orPLunmM07gO6HXaU04ShqtTe3fLvxLo Kb5qG3kW618SyT/VAMYVoNjC9g== X-Received: by 2002:a5d:654b:: with SMTP id z11mr44485046wrv.167.1620815439373; Wed, 12 May 2021 03:30:39 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x11sm3856426wrl.13.2021.05.12.03.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 03:30:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC2951FFB1; Wed, 12 May 2021 11:20:53 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 26/31] tests/docker: gcc-10 based images for ppc64{, le} tests Date: Wed, 12 May 2021 11:20:46 +0100 Message-Id: <20210512102051.12134-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210512102051.12134-1-alex.bennee@linaro.org> References: <20210512102051.12134-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, Matheus Ferst , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Matheus Ferst A newer compiler is needed to build tests for Power10 instructions. As done for arm64 on c729a99d2701, a new '-test-cross' image is created for ppc64 and ppc64le. As done on 936fda4d771f, a test for compiler support is added to verify that the toolchain in use has '-mpower10'. Finally, Unused images (docker-power-cross and docker-ppc64-cross) are removed. Signed-off-by: Matheus Ferst Signed-off-by: Alex Bennée Message-Id: <20210423205757.1752480-2-matheus.ferst@eldorado.org.br> --- .gitlab-ci.d/containers.yml | 13 +++--------- tests/docker/Makefile.include | 5 ++--- .../dockerfiles/debian-powerpc-cross.docker | 12 ----------- .../debian-powerpc-test-cross.docker | 17 ++++++++++++++++ .../dockerfiles/debian-ppc64-cross.docker | 11 ---------- tests/tcg/configure.sh | 20 +++++++++---------- 6 files changed, 32 insertions(+), 46 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-powerpc-cross.docker create mode 100644 tests/docker/dockerfiles/debian-powerpc-test-cross.docker delete mode 100644 tests/docker/dockerfiles/debian-ppc64-cross.docker -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e23..325191627d 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -144,19 +144,12 @@ mipsel-debian-cross-container: variables: NAME: debian-mipsel-cross -powerpc-debian-cross-container: +powerpc-test-debian-cross-container: <<: *container_job_definition stage: containers-layer2 - needs: ['amd64-debian10-container'] - variables: - NAME: debian-powerpc-cross - -ppc64-debian-cross-container: - <<: *container_job_definition - stage: containers-layer2 - needs: ['amd64-debian10-container'] + needs: ['amd64-debian11-container'] variables: - NAME: debian-ppc64-cross + NAME: debian-powerpc-test-cross ppc64el-debian-cross-container: <<: *container_job_definition diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8967ecf118..ff5d732889 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -140,8 +140,6 @@ docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-mips64el-cross: docker-image-debian10 docker-image-debian-mipsel-cross: docker-image-debian10 -docker-image-debian-powerpc-cross: docker-image-debian10 -docker-image-debian-ppc64-cross: docker-image-debian10 docker-image-debian-ppc64el-cross: docker-image-debian10 docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 @@ -174,13 +172,14 @@ docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.dock docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 +docker-image-debian-powerpc-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross +DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross -DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker deleted file mode 100644 index 07e1789650..0000000000 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ /dev/null @@ -1,12 +0,0 @@ -# -# Docker powerpc cross-compiler target -# -# This docker target builds on the debian Buster base image. -# -FROM qemu/debian10 - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-powerpc-linux-gnu \ - libc6-dev-powerpc-cross diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker new file mode 100644 index 0000000000..36b336f709 --- /dev/null +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -0,0 +1,17 @@ +# +# Docker powerpc/ppc64/ppc64le cross-compiler target +# +# This docker target builds on the debian Bullseye base image. +# +FROM qemu/debian11 + +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross \ + gcc-10-powerpc64-linux-gnu \ + libc6-dev-ppc64-cross \ + gcc-10-powerpc64le-linux-gnu \ + libc6-dev-ppc64el-cross + diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/docker/dockerfiles/debian-ppc64-cross.docker deleted file mode 100644 index 8efe68874e..0000000000 --- a/tests/docker/dockerfiles/debian-ppc64-cross.docker +++ /dev/null @@ -1,11 +0,0 @@ -# -# Docker ppc64 cross-compiler target -# -# This docker target builds on the debian Buster base image. -FROM qemu/debian10 - -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 11009fe433..6627318adf 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -147,18 +147,14 @@ for target in $target_list; do ;; ppc-*|ppc64abi32-*) container_hosts=x86_64 - container_image=debian-powerpc-cross - container_cross_cc=powerpc-linux-gnu-gcc + container_image=debian-powerpc-test-cross + container_cross_cc=powerpc-linux-gnu-gcc-10 ;; - ppc64-*) + ppc64-*|ppc64le-*) container_hosts=x86_64 - container_image=debian-ppc64-cross - container_cross_cc=powerpc64-linux-gnu-gcc - ;; - ppc64le-*) - container_hosts=x86_64 - container_image=debian-ppc64el-cross - container_cross_cc=powerpc64le-linux-gnu-gcc + container_image=debian-powerpc-test-cross + container_cross_cc=${target%%-*}-linux-gnu-gcc-10 + container_cross_cc=powerpc${container_cross_cc#ppc} ;; riscv64-*) container_hosts=x86_64 @@ -272,6 +268,10 @@ for target in $target_list; do -mpower8-vector -o $TMPE $TMPC; then echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak fi + if do_compiler "$target_compiler" $target_compiler_cflags \ + -mpower10 -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak + fi ;; i386-linux-user) if do_compiler "$target_compiler" $target_compiler_cflags \