From 587ad3430ddc030c1b31a2e7bbdbf932279d1c16 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 26 May 2023 10:51:38 -0700 Subject: [PATCH] ci/windows: Update WARP to 1.0.7 Part-of: --- .gitlab-ci/image-tags.yml | 2 +- .gitlab-ci/windows/mesa_deps_test.ps1 | 2 +- src/microsoft/ci/warp-fails.txt | 75 +++++++++++++++++---------- src/microsoft/ci/warp-skips.txt | 10 ++-- 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index e36c74370c9..0ead720b10f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -30,4 +30,4 @@ variables: WINDOWS_X64_BUILD_TAG: "2023-04-13-agility-610" WINDOWS_X64_TEST_PATH: "windows/x64_test" - WINDOWS_X64_TEST_TAG: "2023-05-08-warp-1.0.6" + WINDOWS_X64_TEST_TAG: "2023-05-26-warp-1.0.7" diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1 index 7bb1fd10cf3..f377495a483 100644 --- a/.gitlab-ci/windows/mesa_deps_test.ps1 +++ b/.gitlab-ci/windows/mesa_deps_test.ps1 @@ -148,7 +148,7 @@ Remove-Item -Recurse 'C:\agility' Get-Date Write-Host "Downloading Updated WARP" -Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.6 -OutFile 'warp.zip' +Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.7 -OutFile 'warp.zip' Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp' Remove-Item 'warp.zip' diff --git a/src/microsoft/ci/warp-fails.txt b/src/microsoft/ci/warp-fails.txt index 81d213f90fc..0af97e2e4ed 100644 --- a/src/microsoft/ci/warp-fails.txt +++ b/src/microsoft/ci/warp-fails.txt @@ -40,29 +40,52 @@ dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2dshadow_vertex,Fail dEQP-VK.glsl.texture_functions.textureprojoffset.sampler1dshadow_bias_fragment,Fail dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2dshadow_bias_fragment,Fail -# WARP/DXC bug, some phi/control flow lowering caused incorrect values to be loaded after the loop. -# Fix incoming: https://github.com/microsoft/DirectXShaderCompiler/pull/5180 -dEQP-VK.glsl.loops.generic.do_while_dynamic_iterations.basic_highp_float_fragment,Fail -dEQP-VK.glsl.loops.generic.do_while_dynamic_iterations.basic_highp_float_vertex,Fail -dEQP-VK.glsl.loops.generic.do_while_dynamic_iterations.basic_mediump_float_fragment,Fail -dEQP-VK.glsl.loops.generic.do_while_dynamic_iterations.basic_mediump_float_vertex,Fail -dEQP-VK.glsl.loops.generic.do_while_uniform_iterations.basic_highp_float_fragment,Fail -dEQP-VK.glsl.loops.generic.do_while_uniform_iterations.basic_highp_float_vertex,Fail -dEQP-VK.glsl.loops.generic.do_while_uniform_iterations.basic_mediump_float_fragment,Fail -dEQP-VK.glsl.loops.generic.do_while_uniform_iterations.basic_mediump_float_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.dowhile_trap_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.dowhile_trap_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.nested_sequence_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.nested_sequence_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.sequence_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.sequence_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.vector_counter_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_dynamic_iterations.vector_counter_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.dowhile_trap_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.dowhile_trap_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.nested_sequence_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.nested_sequence_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.sequence_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.sequence_vertex,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.vector_counter_fragment,Fail -dEQP-VK.glsl.loops.special.do_while_uniform_iterations.vector_counter_vertex,Fail +# 64-bit prefix int add, prefix double add, and prefix double float all produce +# incorrect values for one of WARP's 4 SIMD threads. Fix incoming. +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_dvec2,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_dvec2_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_dvec4,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_i64vec2,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_i64vec4_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_u64vec2,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_u64vec4,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusiveadd_uint64_t_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusivemul_dvec2,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupexclusivemul_dvec3,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusiveadd_double,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusiveadd_i64vec2,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusiveadd_i64vec3_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusiveadd_int64_t_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusiveadd_u64vec4_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusiveadd_uint64_t,Fail +dEQP-VK.subgroups.arithmetic.compute.subgroupinclusivemul_dvec2_requiredsubgroupsize,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_dvec2_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_dvec3_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_u64vec2_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_u64vec3_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_u64vec3_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_u64vec4_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusiveadd_uint64_t_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusivemul_double_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupexclusivemul_dvec3_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_double_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_double_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_dvec2_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_dvec4_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_int64_t_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_u64vec2_vertex,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusiveadd_uint64_t_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusivemul_double_geometry,Fail +dEQP-VK.subgroups.arithmetic.framebuffer.subgroupinclusivemul_dvec2_geometry,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusiveadd_i64vec2,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusiveadd_i64vec3,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusiveadd_i64vec4,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusiveadd_u64vec4,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusiveadd_uint64_t,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupexclusivemul_double,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusiveadd_dvec2,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusiveadd_i64vec4,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusiveadd_u64vec2,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusivemul_double,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusivemul_dvec3,Fail +dEQP-VK.subgroups.arithmetic.graphics.subgroupinclusivemul_dvec4,Fail diff --git a/src/microsoft/ci/warp-skips.txt b/src/microsoft/ci/warp-skips.txt index c1363389ce4..ff1d6814d42 100644 --- a/src/microsoft/ci/warp-skips.txt +++ b/src/microsoft/ci/warp-skips.txt @@ -1,12 +1,8 @@ -# Several bugs in WARP's 64-bit wave ops. Fixes incoming -dEQP-VK.subgroups.*int64_t.* -dEQP-VK.subgroups.*double.* -dEQP-VK.subgroups.*i64vec.* -dEQP-VK.subgroups.*u64vec.* -dEQP-VK.subgroups.*dvec.* - # If the Windows runner becomes sluggish due to external load, such as # gstreamer, it can cause the tests to exceed their time limit. dEQP-VK.api.object_management.multithreaded_per_thread_resources.device_group dEQP-VK.ubo.3_level_array.scalar.column_major_mat4.both_comp_access dEQP-VK.ubo.3_level_array.std140.row_major_mat4.both + +# Test hits an infinite loop in WARP, fix incoming. +dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops