From 4f56ded36263bf18545627764d5af63194bb8ec8 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 19 Jul 2021 16:49:02 -0700 Subject: [PATCH] ci: Stop disabling filter hacks for llvmpipe. Now that we've disabled brilinear and have per-pixel cube derivatives, we can use the same rendering paths that end users will see. In a few cases, we switch to the no_quad_lod option instead, because otherwise we get a piglit failure. Reviewed-by: Roland Scheidegger Part-of: --- .gitlab-ci/deqp-runner.sh | 2 +- .gitlab-ci/piglit/run.sh | 2 +- src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 5 ++-- .../drivers/llvmpipe/ci/traces-llvmpipe.yml | 16 +++++----- src/gallium/drivers/virgl/ci/traces-virgl.yml | 30 +++++++++---------- src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 +- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index b3d0bd93953..e9c02f4a26a 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -197,7 +197,7 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then fi GALLIUM_DRIVER=llvmpipe \ - GALLIVM_PERF="nopt,no_filter_hacks" \ + GALLIVM_PERF="nopt" \ virgl_test_server $VTEST_ARGS >$RESULTS/vtest-log.txt 2>&1 & sleep 1 diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index 5a45b4a3867..490a72bab0c 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -107,7 +107,7 @@ else LD_LIBRARY_PATH="$__LD_LIBRARY_PATH" \ GALLIUM_DRIVER=llvmpipe \ - GALLIVM_PERF="nopt,no_filter_hacks" \ + GALLIVM_PERF="nopt" \ VTEST_USE_EGL_SURFACELESS=1 \ VTEST_USE_GLES=1 \ virgl_test_server >"$RESULTS"/vtest-log.txt 2>&1 & diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index d70b6541f3c..ee2f4f0eb6d 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -28,7 +28,7 @@ llvmpipe-piglit-quick_gl: - .piglit-test - .llvmpipe-test variables: - GALLIVM_PERF: "no_filter_hacks" + GALLIVM_PERF: "no_quad_lod" LP_NUM_THREADS: 0 PIGLIT_OPTIONS: > --process-isolation false @@ -62,7 +62,6 @@ llvmpipe-piglit-quick_shader: - .piglit-test - .llvmpipe-test variables: - GALLIVM_PERF: "no_filter_hacks" LP_NUM_THREADS: 1 PIGLIT_PROFILES: quick_shader PIGLIT_RESULTS: "llvmpipe-quick_shader" @@ -80,7 +79,7 @@ llvmpipe-traces: .llvmpipe-deqp-test: variables: - GALLIVM_PERF: "nopt,no_filter_hacks" + GALLIVM_PERF: "nopt" # Don't use threads inside llvmpipe, we've already got all cores # busy at the deqp-runner level. LP_NUM_THREADS: 0 diff --git a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml index 302fbb45a62..02d0db80621 100644 --- a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml +++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml @@ -17,7 +17,7 @@ traces: - path: 0ad/0ad.trace expectations: - device: gl-vmware-llvmpipe - checksum: ea522d045da5d416e7291479e3616aea + checksum: b44ebac7708c6e677b145754f1efcbb7 - path: pathfinder/demo.trace expectations: - device: gl-vmware-llvmpipe @@ -37,7 +37,7 @@ traces: - path: gputest/pixmark-piano.trace expectations: - device: gl-vmware-llvmpipe - checksum: 919c9f302b35982ccd9a210e8d3d8c83 + checksum: f73a68e9814405910c4628a2824f1eae - path: gputest/triangle.trace expectations: - device: gl-vmware-llvmpipe @@ -69,7 +69,7 @@ traces: - path: bgfx/06-bump.rdc expectations: - device: gl-vmware-llvmpipe - checksum: 58e188b7156f8438ce895f0bba269c21 + checksum: 75a8ac1b7bbcba03a93159243ade2c83 - path: bgfx/07-callback.rdc expectations: - device: gl-vmware-llvmpipe @@ -89,15 +89,15 @@ traces: - path: bgfx/12-lod.rdc expectations: - device: gl-vmware-llvmpipe - checksum: 2806a6d3c178c2c35447dbe87edddff3 + checksum: 5e95c12eecb4a422c8b529e2bac592fd - path: bgfx/13-stencil.rdc expectations: - device: gl-vmware-llvmpipe - checksum: f6386365acdd2c88ea302c8cb686705e + checksum: 81266a254b1558ac90e89a6b02077ae1 - path: bgfx/14-shadowvolumes.rdc expectations: - device: gl-vmware-llvmpipe - checksum: 46b4daab08d030f919120136b67f711b + checksum: 66f789a7c813945e43e59c187fba1d19 - path: bgfx/15-shadowmaps-simple.rdc expectations: - device: gl-vmware-llvmpipe @@ -145,7 +145,7 @@ traces: - path: bgfx/33-pom.rdc expectations: - device: gl-vmware-llvmpipe - checksum: cefa7c60c8907bba62a68e374e2accf3 + checksum: f68403ec95113c4720e1a66e4cf956c8 - path: bgfx/34-mvs.rdc expectations: - device: gl-vmware-llvmpipe @@ -169,7 +169,7 @@ traces: - path: bgfx/39-assao.rdc expectations: - device: gl-vmware-llvmpipe - checksum: dc6f9c6995168a955d0f628213137b13 + checksum: 74b3570d73241fa0798afb0869e5b121 - path: bgfx/40-svt.rdc expectations: - device: gl-vmware-llvmpipe diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml index dca5770af6b..195b9b05a06 100644 --- a/src/gallium/drivers/virgl/ci/traces-virgl.yml +++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml @@ -17,11 +17,11 @@ traces: - path: gputest/furmark.trace expectations: - device: gl-virgl - checksum: 54ddc30b236e664440a605e0ab754b94 + checksum: 87ffd45be95f2d55f82325c86ce32f20 - path: gputest/pixmark-piano.trace expectations: - device: gl-virgl - checksum: 45464b6b708d69d58dcd8490ef110413 + checksum: 8293e59b818715ddf1c23e9f60b17851 - path: gputest/triangle.trace expectations: - device: gl-virgl @@ -29,11 +29,11 @@ traces: - path: humus/Portals.trace expectations: - device: gl-virgl - checksum: d39319e26da8a572e585f9c0d3c3718e + checksum: 6d78eed6749f01cc5625dec0ad129c66 - path: 0ad/0ad.trace expectations: - device: gl-virgl - checksum: 0ca75ef632fafdcd3e83fdf02b65230e + checksum: 04e8615b6cc890738fd0b260df306633 - path: glmark2/buffer-columns=200:interleave=false:update-dispersion=0.9:update-fraction=0.5:update-method=map.rdc expectations: - device: gl-virgl @@ -121,7 +121,7 @@ traces: - path: glmark2/refract.rdc expectations: - device: gl-virgl - checksum: f6b03908b728e8a441264ecf80c82f1d + checksum: ba5762900aa0446f4995494515d34c60 - path: glmark2/shading-shading=blinn-phong-inf.rdc expectations: - device: gl-virgl @@ -149,7 +149,7 @@ traces: - path: glmark2/texture-texture-filter=mipmap.rdc expectations: - device: gl-virgl - checksum: b0a7fd92474a7a8dcbe77a8279acd4c7 + checksum: 7eb8acb8163669cad716e309e1c95306 - path: glmark2/texture-texture-filter=nearest.rdc expectations: - device: gl-virgl @@ -188,7 +188,7 @@ traces: - path: humus/AmbientAperture.trace expectations: - device: gl-virgl - checksum: 1f8af80f6b7d4075167c0e0cad8b1b0a + checksum: d5635a3660405651a572b5efc6107827 - path: humus/CelShading.trace expectations: - device: gl-virgl @@ -197,19 +197,19 @@ traces: expectations: # speckling present on the ground that isn't there on other drivers. - device: gl-virgl - checksum: 87fbaddbcc4a849f3001054ceed3f288 + checksum: 45f7f54972d196c173763f77082393bb - path: humus/HDR.trace expectations: - device: gl-virgl - checksum: 85b80ba4477afc2431373224e45a8a16 + checksum: c04b8feeb0d41763db0c636373d3ba4e - path: humus/RaytracedShadows.trace expectations: - device: gl-virgl - checksum: b612996af7d0bfbebb8c2de3416c9fdc + checksum: a0d3b811a34033465441776d7115462c - path: humus/VolumetricFogging2.trace expectations: - device: gl-virgl - checksum: 24aca071aca25efd6c3e054eafe60e60 + checksum: 6260e5d1e7e6fc050d48e6a1790c6117 # Crash # - path: itoral-gl-terrain-demo/demo.trace # expectations: @@ -218,7 +218,7 @@ traces: - path: neverball/neverball.trace expectations: - device: gl-virgl - checksum: 452267404823d8bfd2442a18e50f8f63 + checksum: 4ad035fd572792648c82903e0c3b87ed # Crash # - path: pathfinder/canvas_moire.trace # expectations: @@ -237,7 +237,7 @@ traces: - path: supertuxkart/supertuxkart-mansion-egl-gles.trace expectations: - device: gl-virgl - checksum: 74e9081b18e48c31f1755fadcb6fc068 + checksum: ecc2d8fdcc88a665c999f95c1ce26209 # Sometimes crashes # - path: xonotic/xonotic-keybench-high.trace # expectations: @@ -246,7 +246,7 @@ traces: - path: valve/counterstrike.trace expectations: - device: gl-virgl - checksum: b80943e141871e7b00920fc6b1a50a19 + checksum: 7f3ae17190d74da032d9a463c738404a # Piglit times-out when trying to run these two # - path: valve/counterstrike-source.trace # expectations: @@ -259,7 +259,7 @@ traces: - path: valve/portal-2.trace expectations: - device: gl-virgl - checksum: f63e8bda6fde5869feb65c30350c2036 + checksum: adf249c3d2ee204ef6583641f70816db # Piglit crashes when trying to run this one # - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc # expectations: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index cd782580f1c..fcbdb58e511 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -6,7 +6,7 @@ LIBGL_ALWAYS_SOFTWARE: "1" GPU_VERSION: zink-lvp # Fix non-conformant llvmpipe filter defaults - GALLIVM_PERF: "no_filter_hacks" + GALLIVM_PERF: "no_quad_lod" LP_NUM_THREADS: 0 .zink-lvp-deqp-test: