Re: [PULL 23/32] tests/functional: extend test_aarch64_virt with vulkan test

[Thomas Huth <thuth@redhat.com>]

On 19/02/2025 14.25, Philippe Mathieu-Daudé wrote:
> (+Markus for CLI)
> 
> On 10/1/25 14:17, Alex Bennée wrote:
>> Now that we have virtio-gpu Vulkan support, let's add a test for it.
>> Currently this is using images build by buildroot:
>>
>>    https://lists.buildroot.org/pipermail/buildroot/2024-December/768196.html
>>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Message-Id: <20250108121054.1126164-24-alex.bennee@linaro.org>
>>
>> diff --git a/tests/functional/test_aarch64_virt.py b/tests/functional/ 
>> test_aarch64_virt.py
>> index 201c5ed023..6b2336a28d 100755
>> --- a/tests/functional/test_aarch64_virt.py
>> +++ b/tests/functional/test_aarch64_virt.py
>> @@ -13,10 +13,12 @@
>>   import logging
>>   from subprocess import check_call, DEVNULL
>> +from qemu.machine.machine import VMLaunchFailure
>> +
>>   from qemu_test import QemuSystemTest, Asset
>> -from qemu_test import exec_command_and_wait_for_pattern
>> +from qemu_test import exec_command, exec_command_and_wait_for_pattern
>>   from qemu_test import wait_for_console_pattern
>> -from qemu_test import get_qemu_img
>> +from qemu_test import skipIfMissingCommands, get_qemu_img
>>   class Aarch64VirtMachine(QemuSystemTest):
>> @@ -132,5 +134,73 @@ def test_aarch64_virt_gicv2(self):
>>           self.common_aarch64_virt("virt,gic-version=2")
>> +    ASSET_VIRT_GPU_KERNEL = Asset(
>> +        'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/'
>> +        'download?path=%2F&files='
>> +        'Image',
>> +        '89e5099d26166204cc5ca4bb6d1a11b92c217e1f82ec67e3ba363d09157462f6')
>> +
>> +    ASSET_VIRT_GPU_ROOTFS = Asset(
>> +        'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/'
>> +        'download?path=%2F&files='
>> +        'rootfs.ext4.zstd',
>> +        '792da7573f5dc2913ddb7c638151d4a6b2d028a4cb2afb38add513c1924bdad4')
>> +
>> +    @skipIfMissingCommands('zstd')
>> +    def test_aarch64_virt_with_gpu(self):
>> +        # This tests boots with a buildroot test image that contains
>> +        # vkmark and other GPU exercising tools. We run a headless
>> +        # weston that nevertheless still exercises the virtio-gpu
>> +        # backend.
>> +
>> +        self.set_machine('virt')
>> +        self.require_accelerator("tcg")
>> +
>> +        kernel_path = self.ASSET_VIRT_GPU_KERNEL.fetch()
>> +        image_path = self.uncompress(self.ASSET_VIRT_GPU_ROOTFS, 
>> format="zstd")
>> +
>> +        self.vm.set_console()
>> +        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
>> +                               'console=ttyAMA0 root=/dev/vda')
>> +
>> +        self.vm.add_args("-accel", "tcg")
>> +        self.vm.add_args("-cpu", "neoverse-v1,pauth-impdef=on")
>> +        self.vm.add_args("-machine", "virt,gic-version=max",
>> +                         '-kernel', kernel_path,
>> +                         '-append', kernel_command_line)
>> +        self.vm.add_args("-smp", "2", "-m", "2048")
>> +        self.vm.add_args("-device",
>> +                         "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on")
>> +        self.vm.add_args("-display", "egl-headless")
>> +        self.vm.add_args("-display", "dbus,gl=on")
> 
> [*]
> 
>> +        self.vm.add_args("-device", "virtio-blk-device,drive=hd0")
>> +        self.vm.add_args("-blockdev",
>> +                         "driver=raw,file.driver=file,"
>> +                         "node-name=hd0,read-only=on,"
>> +                         f"file.filename={image_path}")
>> +        self.vm.add_args("-snapshot")
>> +
>> +        try:
>> +            self.vm.launch()
>> +        except VMLaunchFailure as excp:
>> +            if "old virglrenderer, blob resources unsupported" in 
>> excp.output:
>> +                self.skipTest("No blob support for virtio-gpu")
>> +            elif "old virglrenderer, venus unsupported" in excp.output:
>> +                self.skipTest("No venus support for virtio-gpu")
> 
> This seems dependent on the order of the CLI arguments, as I got:
> 
> qemu-system-aarch64: -device virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on: 
> 'virtio-gpu-gl-pci' is not a valid device model name
> 
> I understand it is too complex to check this device availability with
> meson, in order to avoid running the test.
> 
> Can we use device introspection instead, like we do in QTest with
> qtest_qom_has_concrete_type() for accelerators? Maybe in the lines of:
> 
>    @skipIfMissingQOMType('virtio-gpu-gl-pci')

We already have "self.require_device('...')" that can be used to check for 
the availability of devices and skip the test if it is not built in ... 
would that be suitable here?

  Thomas