From c2790fe5375fd468fe0d70b70babb50c523170b3 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Thu, 29 Dec 2022 10:32:22 -0800 Subject: [PATCH] CI/Windows: Use waffle instead of freeglut for piglit Reviewed-by: Sil Vilerino Part-of: --- .gitlab-ci/image-tags.yml | 2 +- .gitlab-ci/windows/mesa_deps_test.ps1 | 60 ++++++++++--------- .../drivers/d3d12/ci/d3d12-quick_gl.txt | 42 ++++--------- .../drivers/d3d12/ci/d3d12-quick_shader.txt | 6 +- src/gallium/drivers/d3d12/ci/d3d12-skips.txt | 10 +++- 5 files changed, 55 insertions(+), 65 deletions(-) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 79b8fcb1396..135b862b290 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -28,4 +28,4 @@ variables: WINDOWS_X64_BUILD_TAG: "2023-01-03-ci-libva-2.17" WINDOWS_X64_TEST_PATH: "windows/x64_test" - WINDOWS_X64_TEST_TAG: "2022-12-28-piglit-no-install" + WINDOWS_X64_TEST_TAG: "2023-01-03-piglit-waffle" diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1 index 327e58e7f93..d326da4dec5 100644 --- a/.gitlab-ci/windows/mesa_deps_test.ps1 +++ b/.gitlab-ci/windows/mesa_deps_test.ps1 @@ -1,33 +1,36 @@ Get-Date -Write-Host "Downloading Freeglut" - -$freeglut_zip = 'freeglut-MSVC.zip' -$freeglut_url = "https://www.transmissionzero.co.uk/files/software/development/GLUT/$freeglut_zip" - -For ($i = 0; $i -lt 5; $i++) { - Invoke-WebRequest -Uri $freeglut_url -OutFile $freeglut_zip - $freeglut_downloaded = $? - if ($freeglut_downloaded) { - Break - } -} - -if (!$freeglut_downloaded) { - Write-Host "Failed to download Freeglut" - Exit 1 -} - -Get-Date -Write-Host "Installing Freeglut" -Expand-Archive $freeglut_zip -DestinationPath C:\ -if (!$?) { - Write-Host "Failed to install Freeglut" - Exit 1 -} +Write-Host "Cloning Waffle" $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent . "$MyPath\mesa_vs_init.ps1" +git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/waffle.git 'C:\src\waffle' +if (!$?) { + Write-Host "Failed to clone Waffle repository" + Exit 1 +} + +Push-Location -Path C:\src\waffle +git checkout 950a1f35a718bc2a8e1dda75845e52651bb331a7 +Pop-Location + +Get-Date +$waffle_build = New-Item -ItemType Directory -Path "C:\src\waffle" -Name "build" +Push-Location -Path $waffle_build.FullName +Write-Host "Compiling Waffle" +meson setup ` +--buildtype=release ` +--default-library=static ` +--prefix="C:\Waffle" && ` +ninja -j32 install +$buildstatus = $? +Pop-Location +Remove-Item -Recurse -Path $waffle_build +if (!$buildstatus) { + Write-Host "Failed to compile or install Waffle" + Exit 1 +} + Get-Date Write-Host "Downloading glext.h" New-Item -ItemType Directory -Path ".\glext" -Name "GL" @@ -49,8 +52,9 @@ Write-Host "Compiling Piglit" cmake -S . -B . ` -GNinja ` -DCMAKE_BUILD_TYPE=Release ` --DGLUT_INCLUDE_DIR=C:\freeglut\include ` --DGLUT_glut_LIBRARY_RELEASE=C:\freeglut\lib\x64\freeglut.lib ` +-DPIGLIT_USE_WAFFLE=ON ` +-DWaffle_INCLUDE_DIRS=C:\Waffle\include\waffle-1 ` +-DWaffle_LDFLAGS=C:\Waffle\lib\libwaffle-1.a ` -DGLEXT_INCLUDE_DIR=.\glext && ` ninja -j32 $buildstatus = $? @@ -60,8 +64,6 @@ if (!$buildstatus) { Exit 1 } -Copy-Item -Path C:\freeglut\bin\x64\freeglut.dll -Destination C:\Piglit\bin\freeglut.dll - Get-Date Write-Host "Cloning spirv-samples" git clone --no-progress --single-branch --no-checkout https://github.com/dneto0/spirv-samples.git C:\spirv-samples\ diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index 86b2fccf31c..f59cc4cb048 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -2,12 +2,12 @@ spec@!opengl 1.0@gl-1.0-beginend-coverage,Fail spec@!opengl 1.0@gl-1.0-beginend-coverage@glFlush,Fail spec@!opengl 1.0@gl-1.0-blend-func,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-simple-readbuffer,Fail spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail -spec@!opengl 1.1@clear-accum,Fail +spec@!opengl 1.1@line-smooth-coverage,Fail +spec@!opengl 1.1@line-smooth-stipple,Fail spec@!opengl 1.1@linestipple,Fail spec@!opengl 1.1@linestipple@Factor 2x,Fail spec@!opengl 1.1@linestipple@Factor 3x,Fail @@ -21,64 +21,42 @@ spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on right edg spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on top edge,Fail spec@!opengl 1.1@polygon-offset,Fail spec@!opengl 1.1@vertex-fallbacks,Crash -spec@!opengl 1.1@windowoverlap,Crash +spec@!opengl 1.1@windowoverlap,Missing spec@!opengl 2.0@gl-2.0-two-sided-stencil,Fail spec@!opengl 3.0@sampler-cube-shadow,Fail spec@!opengl 3.1@default-vao,Fail spec@!opengl 3.1@genned-names,Fail spec@!opengl 3.1@gl-3.1-enable-vertex-array,Fail spec@!opengl 3.1@gl-3.1-link-empty-prog-core,Fail -spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-last,Fail -spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-last,Fail -spec@!opengl 3.2@gl-3.2-adj-prims line cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims line cull-back pv-last,Fail -spec@!opengl 3.2@gl-3.2-adj-prims line cull-front pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims line cull-front pv-last,Fail -spec@!opengl 3.2@gl-3.2-adj-prims pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims pv-last,Fail -spec@arb_debug_output@arb_debug_output-api_error,Fail -spec@arb_direct_state_access@gettextureimage-formats,Crash spec@arb_draw_indirect@arb_draw_indirect-api-errors,Crash spec@arb_explicit_attrib_location@overlapping-locations-input-attribs api,Crash spec@arb_explicit_attrib_location@overlapping-locations-input-attribs shader,Crash spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic,Fail spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic@Per-sample,Fail spec@arb_get_program_binary@restore-sso-program,Fail -spec@arb_indirect_parameters@tf-count-arrays,Fail -spec@arb_indirect_parameters@tf-count-elements,Fail spec@arb_point_sprite@arb_point_sprite-mipmap,Fail spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2' on GL_PROGRAM_INPUT,Fail spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT,Fail -spec@arb_sample_shading@arb_sample_shading-builtin-gl-sample-mask-mrt-alpha-to-coverage-combinations,Fail +spec@arb_sample_shading@arb_sample_shading-builtin-gl-sample-mask-mrt-alpha-to-coverage,Fail spec@arb_seamless_cube_map@arb_seamless_cubemap,Fail spec@arb_shader_atomic_counters@semantics,Fail -spec@arb_shader_atomic_counters@semantics@Fragment shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@semantics@Geometry shader atomic built-in semantics,Fail spec@arb_shader_atomic_counters@semantics@Tessellation control shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@semantics@Tessellation evaluation shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@semantics@Vertex shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@unused-result,Fail -spec@arb_shader_atomic_counters@unused-result@Fragment shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@unused-result@Geometry shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@unused-result@Tessellation control shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@unused-result@Tessellation evaluation shader atomic built-in semantics,Fail -spec@arb_shader_atomic_counters@unused-result@Vertex shader atomic built-in semantics,Fail spec@arb_shader_image_load_store@semantics,Fail spec@arb_shader_image_load_store@semantics@imageAtomicMax/Vertex shader/r32ui/image1D test,Fail spec@arb_shader_image_size@builtin,Crash +spec@arb_texture_buffer_object@texture-buffer-size-clamp,Crash +spec@arb_texture_buffer_object@texture-buffer-size-clamp@r8ui_texture_buffer_size_via_sampler,Fail spec@arb_texture_buffer_range@ranges-2,Fail spec@arb_texture_buffer_range@ranges-2 compat,Fail spec@arb_texture_cube_map_array@arb_texture_cube_map_array-sampler-cube-array-shadow,Fail spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch,Fail spec@arb_texture_multisample@arb_texture_multisample-dsa-texelfetch@Texture type: GL_RGB9_E5,Fail -spec@arb_texture_multisample@sample-position@16,Fail -spec@arb_texture_multisample@sample-position@2,Fail -spec@arb_texture_multisample@sample-position@4,Fail -spec@arb_texture_multisample@sample-position@6,Fail -spec@arb_texture_multisample@sample-position@8,Fail spec@arb_texture_rg@texwrap formats-int,Fail spec@arb_texture_rg@texwrap formats-int offset,Fail spec@arb_texture_rg@texwrap formats-int offset@GL_R16I,Fail @@ -169,6 +147,7 @@ spec@arb_texture_stencil8@texwrap formats offset@GL_STENCIL_INDEX8- swizzled,Fai spec@arb_texture_stencil8@texwrap formats@GL_STENCIL_INDEX8,Fail spec@arb_texture_stencil8@texwrap formats@GL_STENCIL_INDEX8- NPOT,Fail spec@arb_texture_stencil8@texwrap formats@GL_STENCIL_INDEX8- swizzled,Fail +spec@arb_transform_feedback_instanced@draw-auto instanced,Fail spec@arb_vertex_attrib_64bit@arb_vertex_attrib_64bit-overlapping-locations api,Crash spec@arb_vertex_attrib_64bit@arb_vertex_attrib_64bit-overlapping-locations shader,Crash spec@arb_vertex_program@arb_vertex_program-matrix-property-bindings,Fail @@ -186,12 +165,16 @@ spec@ext_framebuffer_multisample@alpha-to-one-dual-src-blend 2,Fail spec@ext_framebuffer_multisample@alpha-to-one-dual-src-blend 4,Fail spec@ext_framebuffer_multisample@alpha-to-one-dual-src-blend 6,Fail spec@ext_framebuffer_multisample@alpha-to-one-dual-src-blend 8,Fail +spec@ext_framebuffer_multisample@draw-buffers-alpha-to-one 16,Fail +spec@ext_framebuffer_multisample@draw-buffers-alpha-to-one 2,Fail +spec@ext_framebuffer_multisample@draw-buffers-alpha-to-one 4,Fail +spec@ext_framebuffer_multisample@draw-buffers-alpha-to-one 6,Fail +spec@ext_framebuffer_multisample@draw-buffers-alpha-to-one 8,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 16,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 2,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 4,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 6,Fail spec@ext_framebuffer_multisample@sample-alpha-to-one 8,Fail -spec@ext_texture_integer@fbo-integer,Fail spec@ext_texture_integer@fbo_integer_precision_clear,Fail spec@ext_texture_integer@fbo_integer_readpixels_sint_uint,Fail spec@ext_texture_integer@texwrap formats,Fail @@ -435,3 +418,4 @@ spec@nv_copy_depth_to_color@nv_copy_depth_to_color 0 0x76356278,Fail spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Fail spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Fail spec@nv_copy_image@nv_copy_image-formats,Crash +wgl@wgl-multi-context-single-window,Fail diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt index 092fad71760..d22aea5c65e 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt @@ -2,9 +2,6 @@ spec@arb_gpu_shader5@execution@built-in-functions@fs-interpolateatcentroid-array spec@arb_gpu_shader5@execution@ubo_array_indexing@fs-masked,Fail spec@arb_gpu_shader5@execution@ubo_array_indexing@fs-nonuniform-control-flow,Fail spec@arb_gpu_shader5@execution@ubo_array_indexing@vs-nonuniform-control-flow,Fail -spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-frexp-dvec4-only-exponent,Fail -spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-frexp-dvec4-only-mantissa,Fail -spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-frexp-dvec4-variable-index,Fail spec@arb_gpu_shader_fp64@execution@inout@vs-out-fs-in-s1@2-s2@2-s3@2-double-location-0,Crash spec@arb_gpu_shader_fp64@execution@vs-fs-explicit-locations,Crash spec@arb_gpu_shader_int64@execution@indirect-array-two-accesses,Fail @@ -18,7 +15,10 @@ spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-cumulative,Fail spec@arb_tessellation_shader@execution@dmat-vs-gs-tcs-tes,Crash spec@arb_tessellation_shader@execution@gs-primitiveid-instanced,Fail spec@arb_tessellation_shader@execution@tcs-output-unmatched,Crash +spec@arb_tessellation_shader@execution@tcs-tes-levels-out-of-bounds-read,Crash +spec@arb_tessellation_shader@execution@tcs-tes-levels-out-of-bounds-write,Crash spec@arb_tessellation_shader@execution@tcs-tes-max-in-out-patch-components,Crash +spec@arb_tessellation_shader@execution@tes-tes-levels-out-of-bounds-read,Crash spec@arb_tessellation_shader@execution@tes-primitiveid,Fail spec@arb_tessellation_shader@execution@variable-indexing@tcs-input-array-dvec4-index-rd,Crash spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-dvec4-index-wr,Crash diff --git a/src/gallium/drivers/d3d12/ci/d3d12-skips.txt b/src/gallium/drivers/d3d12/ci/d3d12-skips.txt index 70aa23f1a8d..a633f781efe 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-skips.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-skips.txt @@ -26,8 +26,12 @@ shaders@glsl-bug-110796 amd_compressed_atc_texture intel_performance_query -# The WGL tests are only built when Piglit is using Waffle -wgl - # This test will timeout and slows down the whole job, so just skip it spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output +spec@glsl-1.50@gs-max-output + +# The > symbol in a test name causes the log to be unable to be written +> + +# This test requires glut +windowoverlap