diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index fac6559421b2b..ec98177e97e10 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -99,7 +99,7 @@ GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \ VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \ crosvm --no-syslog run \ --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \ - -m "${CROSVM_MEMORY:-4096}" -c 2 --disable-sandbox \ + -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \ --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \ --host-ip "192.168.30.1" --netmask "255.255.255.0" --mac "AA:BB:CC:00:00:12" \ -s $VM_SOCKET \ diff --git a/src/virtio/ci/deqp-venus.toml b/src/virtio/ci/deqp-venus.toml index 752d7ecac8757..cf05b3ebd7225 100644 --- a/src/virtio/ci/deqp-venus.toml +++ b/src/virtio/ci/deqp-venus.toml @@ -1,6 +1,5 @@ [[deqp]] -deqp = "/install/crosvm-runner.sh" +deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk" caselists = [ "/deqp/mustpass/vk-master.txt" ] -deqp_args = [ "/deqp/external/vulkancts/modules/vulkan/deqp-vk" ] timeout = 30.0 # Starting lots of Crosvm instances simultaneously can take some time renderer_check = "Virtio-GPU Venus.*llvmpipe" diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml index 0d2e8d170313f..85881c97df884 100644 --- a/src/virtio/ci/gitlab-ci.yml +++ b/src/virtio/ci/gitlab-ci.yml @@ -16,7 +16,9 @@ venus-lavapipe: DEQP_FRACTION: 15 DEQP_SUITE: venus GPU_VERSION: venus - LP_NUM_THREADS: 1 # There will be FDO_CI_CONCURRENT Crosvm processes, so each should use a single thread - FDO_CI_CONCURRENT: 32 # Seems to be the fastest value, more gets actually slower - CROSVM_MEMORY: 3072 + LP_NUM_THREADS: 2 + CROSVM_MEMORY: 12288 + CROSVM_CPU: $FDO_CI_CONCURRENT FLAKES_CHANNEL: "#virgl-ci" + script: + - ./install/crosvm-runner.sh ./install/deqp-runner.sh diff --git a/src/virtio/ci/venus-fails.txt b/src/virtio/ci/venus-fails.txt index 6c02bc5473d6f..133cbcc9c0fb0 100644 --- a/src/virtio/ci/venus-fails.txt +++ b/src/virtio/ci/venus-fails.txt @@ -1,4 +1,7 @@ # Full Venus list +dEQP-VK.multiview.dynamic_rendering.queries.15_15_15_15,Fail +dEQP-VK.multiview.dynamic_rendering.queries.15,Fail +dEQP-VK.multiview.dynamic_rendering.queries.5_10_5_10,Fail dEQP-VK.multiview.queries.15_15_15_15,Fail dEQP-VK.multiview.queries.15,Fail dEQP-VK.multiview.queries.5_10_5_10,Fail @@ -10,3 +13,4 @@ dEQP-VK.pipeline.extended_dynamic_state.before_draw.enable_raster,Fail dEQP-VK.pipeline.extended_dynamic_state.between_pipelines.enable_raster,Fail dEQP-VK.pipeline.extended_dynamic_state.cmd_buffer_start.enable_raster,Fail dEQP-VK.pipeline.extended_dynamic_state.two_draws_dynamic.enable_raster,Fail +dEQP-VK.memory_model.message_passing.ext.u64.noncoherent.atomic_atomic.atomicwrite.device.payload_local.physbuffer.guard_local.image.comp,Fail diff --git a/src/virtio/ci/venus-flakes.txt b/src/virtio/ci/venus-flakes.txt index e1256d83187bf..8a3f82af0e7b9 100644 --- a/src/virtio/ci/venus-flakes.txt +++ b/src/virtio/ci/venus-flakes.txt @@ -1,9 +1,20 @@ dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap +dEQP-VK.memory_model.transitive.coherent.fence_atomic.payload_local.physbuffer.guard_local.image.nontransvis dEQP-VK.synchronization.*16384 dEQP-VK.synchronization.*262144 dEQP-VK.spirv_assembly.instruction.graphics.64bit_compare.double.frag_opfordnotequal_nonan_vector +dEQP-VK.robustness.buffer_access.fragment.scalar_copy.r32_uint.oob_storage_read.range_4_bytes +dEQP-VK.robustness.buffer_access.fragment.scalar_copy.r32_uint.oob_uniform_read.range_1_byte +dEQP-VK.robustness.buffer_access.fragment.texel_copy.r32g32b32a32_sfloat.oob_storage_write.range_3_texels +dEQP-VK.robustness.buffer_access.fragment.texel_copy.r32g32b32a32_uint.oob_storage_read.range_3_texels +dEQP-VK.robustness.buffer_access.fragment.texel_copy.r32g32b32a32_uint.oob_storage_write.range_3_texels +dEQP-VK.robustness.buffer_access.fragment.vec4_copy.r32_sfloat.oob_storage_read.range_32_bytes +dEQP-VK.robustness.buffer_access.fragment.vec4_copy.r32_sint.oob_uniform_read.range_3_bytes dEQP-VK.robustness.buffer_access.fragment.vec4_copy.r32_uint.oob_storage_read.range_4_bytes dEQP-VK.robustness.buffer_access.fragment.vec4_copy.r32_uint.oob_storage_write.range_32_bytes -dEQP-VK.robustness.buffer_access.fragment.texel_copy.r32g32b32a32_sfloat.oob_storage_write.range_3_texels -dEQP-VK.robustness.buffer_access.fragment.texel_copy.r32g32b32a32_uint.oob_storage_write.range_3_texels +dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.16B_in_memory_with_vec4_u32 +dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.3B_out_of_memory_with_vec4_s32 +dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.3B_out_of_memory_with_vec4_u32 +dEQP-VK.robustness.buffer_access.through_pointers.graphics.reads.fragment.4B_in_memory_with_vec4_s32 +dEQP-VK.robustness.buffer_access.through_pointers.graphics.writes.fragment.16B_in_memory_with_vec4_u32 dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast_uvec4 diff --git a/src/virtio/ci/venus-skips.txt b/src/virtio/ci/venus-skips.txt index adbe6458fcc40..1c5ebb90091c7 100644 --- a/src/virtio/ci/venus-skips.txt +++ b/src/virtio/ci/venus-skips.txt @@ -5,6 +5,9 @@ dEQP-VK.pipeline.monolithic.* dEQP-VK.api.object_management.max_concurrent.graphics_pipeline dEQP-VK.api.object_management.max_concurrent.compute_pipeline +# Can timeout +dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_nearest_mipmap_linear_repeat + # Unknown lvp issues not seen on hw drivers since CTS 1.3.5.0 dEQP-VK.binding_model.buffer_device_address.* dEQP-VK.binding_model.shader_access.*