Re: [PATCH v3 3/3] s390x/tcg/tests: Tests for Miscellaneous-Instruction-Extensions Facility 3

[Thomas Huth]

On 16/02/2022 10.17, David Hildenbrand wrote:
> On 15.02.22 21:27, David Miller wrote:
...
> > 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?

I'm not an expert when it comes to containers, but I think you could try to 
update to debian11 in tests/docker/dockerfiles/debian-s390x-cross.docker and 
in ./.gitlab-ci.d/container-cross.yml ... if that does not work, it's maybe 
better to manually encode the instructions.

 Thomas