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

[David Hildenbrand <david@redhat.com>]

On 16.02.22 15:19, Alex Bennée wrote:
> 
> David Hildenbrand <david@redhat.com> writes:
> 
>> 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 <dmiller423@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?
> 
> Yeah you'll need to update the docker container. The way it works is we
> always assume the docker based compilers have the compiler features
> needed to test something. tests/tcg/configure.sh does feature tests for
> compilers which are detected on the host filesystem (e.g. do we support
> SVE).
> 
> My last testing/next post:
> 
>   Subject: [PATCH  v1 00/11] testing/next (docker, lcitool, ci, tcg)
>   Date: Fri, 11 Feb 2022 16:02:58 +0000
>   Message-Id: <20220211160309.335014-1-alex.bennee@linaro.org>
> 
> converted the aarch64 container to debian11 with lci-tool. You should be
> able to do the same with the s390x one.
> 

I followed the upstream debain11 test-only aarch64 and powerpc example
and posted the s390x one that seems to work at:

https://lkml.kernel.org/r/20220216115102.206129-1-david@redhat.com

Hopefully that's what you had in mind as well. (I am not familiar with
lci-tool)

-- 
Thanks,

David / dhildenb