qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>,
	berrange@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
	f4bug@amsat.org,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Willian Rampazzo" <willianr@redhat.com>,
	stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com,
	"Matheus Ferst" <matheus.ferst@eldorado.org.br>,
	aurelien@aurel32.net
Subject: [PATCH  v2 26/30] tests/docker: gcc-10 based images for ppc64{, le} tests
Date: Tue,  4 May 2021 11:02:19 +0100	[thread overview]
Message-ID: <20210504100223.25427-27-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210504100223.25427-1-alex.bennee@linaro.org>

From: Matheus Ferst <matheus.ferst@eldorado.org.br>

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 <matheus.ferst@eldorado.org.br>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
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

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 \
-- 
2.20.1



  parent reply	other threads:[~2021-05-04 10:23 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-04 10:01 [PATCH v2 00/30] testing/next (hexagon, tricore, ppc, signals, cirrus) Alex Bennée
2021-05-04 10:01 ` [PATCH v2 01/30] checkpatch: Fix use of uninitialized value Alex Bennée
2021-05-12  4:47   ` Philippe Mathieu-Daudé
2021-05-04 10:01 ` [PATCH v2 02/30] tests/docker: fix copying of executable in "update" Alex Bennée
2021-05-04 10:01 ` [PATCH v2 03/30] tests/docker: make executable an optional argument to "update" Alex Bennée
2021-05-04 10:01 ` [PATCH v2 04/30] tests/docker: allow "update" to add the current user Alex Bennée
2021-05-04 10:01 ` [PATCH v2 05/30] tests/docker: add "fetch" sub-command Alex Bennée
2021-05-04 10:01 ` [PATCH v2 06/30] docker: Add Hexagon image Alex Bennée
2021-05-04 10:02 ` [PATCH v2 07/30] tests/tcg: Use Hexagon Docker image Alex Bennée
2021-05-04 10:02 ` [PATCH v2 08/30] gitlab: add build-user-hexagon test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 09/30] tests/tcg: don't iterate through other arch compilers Alex Bennée
2021-05-04 10:02 ` [PATCH v2 10/30] tests/docker: Added libbpf library to the docker files Alex Bennée
2021-05-04 10:02 ` [PATCH v2 11/30] tests/tcg: Add docker_as and docker_ld cmds Alex Bennée
2021-05-04 10:02 ` [PATCH v2 12/30] tests/tcg: Run timeout cmds using --foreground Alex Bennée
2021-05-04 10:02 ` [PATCH v2 13/30] hw/tricore: Add testdevice for tests in tests/tcg/ Alex Bennée
2021-05-04 10:02 ` [PATCH v2 14/30] tests/tcg/tricore: Add build infrastructure Alex Bennée
2021-05-04 10:02 ` [PATCH v2 15/30] configure: Emit HOST_CC to config-host.mak Alex Bennée
2021-05-04 10:02 ` [PATCH v2 16/30] tests/tcg/tricore: Add macros to create tests and first test 'abs' Alex Bennée
2021-05-04 10:02 ` [PATCH v2 17/30] tests/tcg/tricore: Add bmerge test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 18/30] tests/tcg/tricore: Add clz test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 19/30] tests/tcg/tricore: Add dvstep test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 20/30] tests/tcg/tricore: Add fadd test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 21/30] tests/tcg/tricore: Add fmul test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 22/30] tests/tcg/tricore: Add ftoi test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 23/30] tests/tcg/tricore: Add madd test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 24/30] tests/tcg/tricore: Add msub test Alex Bennée
2021-05-04 10:02 ` [PATCH v2 25/30] tests/tcg/tricore: Add muls test Alex Bennée
2021-05-04 10:02 ` Alex Bennée [this message]
2021-05-04 10:02 ` [PATCH v2 27/30] tests/tcg/ppc64le: tests for brh/brw/brd Alex Bennée
2021-05-04 10:02 ` [PATCH v2 28/30] tests/tcg: add a multiarch signals test to stress test signal delivery Alex Bennée
2021-05-04 10:02 ` [PATCH v2 29/30] cirrus.yml: Fix the MSYS2 task Alex Bennée
2021-05-12  4:49   ` Philippe Mathieu-Daudé
2021-05-12  4:53     ` 罗勇刚(Yonggang Luo)
2021-05-12  4:56   ` 罗勇刚(Yonggang Luo)
2021-05-04 10:02 ` [PATCH v2 30/30] configure: use cc, not host_cc to set cross_cc for build arch Alex Bennée
2021-05-12  4:50   ` Philippe Mathieu-Daudé
2021-05-04 10:39 ` [PATCH v2 00/30] testing/next (hexagon, tricore, ppc, signals, cirrus) no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210504100223.25427-27-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=matheus.ferst@eldorado.org.br \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=willianr@redhat.com \
    --subject='Re: [PATCH  v2 26/30] tests/docker: gcc-10 based images for ppc64{, le} tests' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox