On 16.02.22 10:28, Christian Borntraeger wrote: > > > Am 16.02.22 um 10:17 schrieb David Hildenbrand: >> On 15.02.22 21:27, David Miller wrote: >>> tests/tcg/s390x/mie3-compl.c: [N]*K instructions >>> tests/tcg/s390x/mie3-mvcrl.c: MVCRL instruction >>> tests/tcg/s390x/mie3-sel.c: SELECT instruction >>> >>> Signed-off-by: David Miller <dmiller...@gmail.com> >>> --- >>> tests/tcg/s390x/Makefile.target | 2 +- >>> tests/tcg/s390x/mie3-compl.c | 56 +++++++++++++++++++++++++++++++++ >>> tests/tcg/s390x/mie3-mvcrl.c | 31 ++++++++++++++++++ >>> tests/tcg/s390x/mie3-sel.c | 42 +++++++++++++++++++++++++ >>> 4 files changed, 130 insertions(+), 1 deletion(-) >>> create mode 100644 tests/tcg/s390x/mie3-compl.c >>> create mode 100644 tests/tcg/s390x/mie3-mvcrl.c >>> create mode 100644 tests/tcg/s390x/mie3-sel.c >>> >>> diff --git a/tests/tcg/s390x/Makefile.target >>> b/tests/tcg/s390x/Makefile.target >>> index 1a7238b4eb..16b9d45307 100644 >>> --- a/tests/tcg/s390x/Makefile.target >>> +++ b/tests/tcg/s390x/Makefile.target >>> @@ -1,6 +1,6 @@ >>> S390X_SRC=$(SRC_PATH)/tests/tcg/s390x >>> VPATH+=$(S390X_SRC) >>> -CFLAGS+=-march=zEC12 -m64 >>> +CFLAGS+=-march=z15 -m64 >> >> Unfortunately, this makes our docker builds unhappy -- fail. I assume the >> compiler in the container is outdated. >> >> $ make run-tcg-tests-s390x-linux-user >> changing dir to build for make "run-tcg-tests-s390x-linux-user"... >> make[1]: Entering directory '/home/dhildenb/git/qemu/build' >> GIT ui/keycodemapdb tests/fp/berkeley-testfloat-3 >> tests/fp/berkeley-softfloat-3 dtc capstone slirp >> BUILD debian10 >> BUILD debian-s390x-cross >> BUILD TCG tests for s390x-linux-user >> CHECK debian10 >> CHECK debian-s390x-cross >> BUILD s390x-linux-user guest-tests with docker qemu/debian-s390x-cross >> s390x-linux-gnu-gcc: error: unrecognized argument in option '-march=z15' >> s390x-linux-gnu-gcc: note: valid arguments to '-march=' are: arch10 arch11 >> arch12 arch3 arch5 arch6 arch7 arch8 arch9 g5 g6 native z10 z13 z14 z196 >> z9-109 z9-ec z900 z990 zEC12; did you mean 'z10'? >> >> Maybe debian11 could, work. >> >> @Thomas do you have any idea if we could get this to work with >> '-march=z15' or should we work around that by manually encoding >> the relevant instructions instead? > > Yes, the problem is that binutils reject new mnemomics for older -march > settings. > The Linux kernel handles this by using > .insn instead of the mnemonic. This will also allow to compile the testcase > with older compilers/binutils. > > So something like > "ncrk 0, 3, 2" -> ".insn rrf,0xb9f50000,0,3,2,0" >
I tried diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 9f2ab51eb0..10e70e0fe8 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -1,9 +1,9 @@ # # Docker s390 cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the debian Bullseye base image. # -FROM qemu/debian10 +FROM qemu/debian11 But some of the packages we need (including gcc-multilib-s390x-linux-gnu) seem to be "held broken": E: Unable to correct problems, you have held broken packages. -- Thanks, David / dhildenb
