diff --git a/.gitlab-ci/container/debian/x86_test.sh b/.gitlab-ci/container/debian/x86_test.sh index ff81f72..522b5b1 100755 --- a/.gitlab-ci/container/debian/x86_test.sh +++ b/.gitlab-ci/container/debian/x86_test.sh @@ -4,7 +4,7 @@ set -ex # # Copy platform dependent -*.txt files and remove test type prefix. -# Additionally, deploy *.toml and *.yml files. +# Additionally, deploy the *.toml files. # # arg1: test platform (host, virt) # @@ -16,9 +16,7 @@ deploy_expectations() { cp -a ${file} install/$(printf "%s" "${file##*/}" | sed "s/^${tt}-//") done - cp -a ${CI_PROJECT_DIR}/.gitlab-ci/expectations/${tp}/*.toml \ - ${CI_PROJECT_DIR}/.gitlab-ci/expectations/${tp}/*.yml \ - install/ + cp -a ${CI_PROJECT_DIR}/.gitlab-ci/expectations/${tp}/*.toml install/ } if [ ${MESA_PROJECT_PATH} = "mesa/mesa" ]; then diff --git a/.gitlab-ci/expectations/host/traces-virgl.yml b/.gitlab-ci/expectations/host/traces-virgl.yml deleted file mode 100644 index aece140..0000000 --- a/.gitlab-ci/expectations/host/traces-virgl.yml +++ /dev/null @@ -1,277 +0,0 @@ -traces-db: - download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/" - -traces: - - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace - expectations: - - device: gl-virgl - checksum: 26080879ac8eb63c2c5da3de5fc732f4 - - path: glmark2/jellyfish.trace - expectations: - - device: gl-virgl - checksum: 91dbe94735a132aeb192ae5c618ddc06 - - path: glxgears/glxgears-2.trace - expectations: - - device: gl-virgl - checksum: f8eba0fec6e3e0af9cb09844bc73bdc8 - - path: gputest/furmark.trace - expectations: - - device: gl-virgl - checksum: 87ffd45be95f2d55f82325c86ce32f20 - - path: gputest/pixmark-piano.trace - expectations: - - device: gl-virgl - checksum: 8293e59b818715ddf1c23e9f60b17851 - - path: gputest/triangle.trace - expectations: - - device: gl-virgl - checksum: 848436d1a2448bdc76fd6220382d8606 - - path: humus/Portals.trace - expectations: - - device: gl-virgl - checksum: 846df7d54649319dec1b68b371633cd1 - - path: 0ad/0ad.trace - expectations: - - device: gl-virgl - checksum: 3975d6d29509ec21a11a0cf88e3467b2 - - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace - expectations: - - device: gl-virgl - checksum: 0a44720bfe9cce13c52299a3125b2aae - - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace - expectations: - - device: gl-virgl - checksum: c109416afbc0db4ba466d5a453b8a6dc - - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace - expectations: - - device: gl-virgl - checksum: 1c0551f10a5dc9358f3fb9bb9f059883 - - path: glmark2/bump:bump-render=height.trace - expectations: - - device: gl-virgl - checksum: 4d5211dfb0fd82a1a1dbb498dc2e5b8b - - path: glmark2/bump:bump-render=high-poly.trace - expectations: - - device: gl-virgl - checksum: 4b4d4a4b7bb1341bbd0299c7eb3a6ac9 - - path: glmark2/bump:bump-render=normals.trace - expectations: - - device: gl-virgl - checksum: 832e5baf289b27dd84a665f1c85f57c2 - - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace - expectations: - - device: gl-virgl - checksum: b78f28d97b675fcc7649cced3930650a - - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace - expectations: - - device: gl-virgl - checksum: d0782a516f06a6dddac4f1e1249f41e7 - - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace - expectations: - - device: gl-virgl - checksum: 1ae280a9c6cae495f2d272516a52167e - - path: glmark2/desktop:windows=4:effect=shadow.trace - expectations: - - device: gl-virgl - checksum: f5312a6270ed394b5fcbe66d590f4e49 - - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace - expectations: - - device: gl-virgl - checksum: 25d3b5d18a64a86fc812872987f4f5e7 - - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace - expectations: - - device: gl-virgl - checksum: b80963dae6ecf40c83bfb16943ef1011 - - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace - expectations: - - device: gl-virgl - checksum: da10cb29cab30c5c068e722b5da7c2e5 - - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace - expectations: - - device: gl-virgl - checksum: 8e40504d9f2ead8c0d02604291bff1b6 - - path: glmark2/build:use-vbo=false.trace - expectations: - - device: gl-virgl - checksum: 024fc485e1f33461313c956ab1b73bdf - - path: glmark2/build:use-vbo=true.trace - expectations: - - device: gl-virgl - checksum: 48c45d16cd410a71aea1a12a73e257d3 - - path: glmark2/ideas:speed=10000.trace - expectations: - - device: gl-virgl - checksum: db78cfb035213e31e1435b637b1a8f19 - - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace - expectations: - - device: gl-virgl - checksum: 7fee2e864e015353ace431d51d41bb22 - - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace - expectations: - - device: gl-virgl - checksum: c87127a5c3256c1fe7c79f7931b8f9df - - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace - expectations: - - device: gl-virgl - checksum: 5fec1f728bda86891db4243130546187 - - path: glmark2/pulsar:quads=5:texture=false:light=false.trace - expectations: - - device: gl-virgl - checksum: 3e0e6675fb65e00f9128138ff08c2634 - - path: glmark2/refract.trace - expectations: - - device: gl-virgl - checksum: b77f24a0651ef93e1c4253042ad9c9fa - - path: glmark2/shading:shading=blinn-phong-inf.trace - expectations: - - device: gl-virgl - checksum: 36b07dad759ca65e52f1abf1667e7ca8 - - path: glmark2/shading:shading=cel.trace - expectations: - - device: gl-virgl - checksum: cb41cf2531a06d65f6e4f442ab62ae8d - - path: glmark2/shading:shading=gouraud.trace - expectations: - - device: gl-virgl - checksum: 3e5469d5038d7cc94ef3549ce9d8c385 - - path: glmark2/shading:shading=phong.trace - expectations: - - device: gl-virgl - checksum: e40abcbb4cfbbbfb499d4b0e6d668f41 - - path: glmark2/shadow.trace - expectations: - - device: gl-virgl - checksum: 2bb7290f8559ff93305c0e29f3d671e1 - - path: glmark2/texture:texture-filter=linear.trace - expectations: - - device: gl-virgl - checksum: 8a91e4a0d3bb6c797b81ea36e7dac837 - - path: glmark2/texture:texture-filter=mipmap.trace - expectations: - - device: gl-virgl - checksum: b29190a2f339f0fafb3a20100f58e79e - - path: glmark2/texture:texture-filter=nearest.trace - expectations: - - device: gl-virgl - checksum: 1ae652bdebd1188ab912a800a4c37166 - - path: glxgears/glxgears.trace - expectations: - - device: gl-virgl - checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd -# Crash -# - path: gputest/gimark.trace -# expectations: -# - device: gl-virgl -# checksum: 2cf40180a1315795389d0dfc18aad988 - - path: gputest/pixmark-julia-fp32.trace - expectations: - - device: gl-virgl - checksum: dd78a9f15834d0def6c07be648240d85 - - path: gputest/pixmark-julia-fp64.trace - expectations: - - device: gl-virgl - checksum: 70c4219dc1e344aefa17b5a7b594e495 - - path: gputest/pixmark-volplosion.trace - expectations: - - device: gl-virgl - checksum: 592f35e418490990ea88e19c90cf1205 - - path: gputest/plot3d.trace - expectations: - - device: gl-virgl - checksum: f3c0187ab2197c57e699135b7f42b8cc -# Times out -# - path: gputest/tessmark.trace -# expectations: -# - device: gl-virgl -# checksum: 5d04b8d71517238b9bc8a527574e884b - - path: humus/AmbientAperture.trace - expectations: - - device: gl-virgl - checksum: 66db5d53d261b8cc7b0e9b7463f3911d - - path: humus/CelShading.trace - expectations: - - device: gl-virgl - checksum: 0611c1680155a831f69a57554484c914 - - path: humus/DynamicBranching3.trace - expectations: - # speckling present on the ground that isn't there on other drivers. - - device: gl-virgl - checksum: 4b7fea4ad77981b0e214299bbfe1214e - - path: humus/HDR.trace - expectations: - - device: gl-virgl - checksum: 110d70e58b9b4ec392071312e690429d - - path: humus/RaytracedShadows.trace - expectations: - - device: gl-virgl - checksum: c1fa10c98b2120dae6356ad76d237c99 - - path: humus/VolumetricFogging2.trace - expectations: - - device: gl-virgl - checksum: a6e3bc45fa4090a307d431d63036ca33 - - path: itoral-gl-terrain-demo/demo.trace - expectations: - - device: gl-virgl - checksum: 2b5b7b64b1eb8e323e76e2061e3ac364 - - path: neverball/neverball.trace - expectations: - - device: gl-virgl - checksum: 92ca4c422ca4aca917ffcc8a874a2c69 - - path: pathfinder/canvas_moire.trace - expectations: - - device: gl-virgl - checksum: c4ee0eef519f1a32ba24b7b392b31b28 - - path: pathfinder/canvas_text_v2.trace - expectations: - - device: gl-virgl - checksum: 7ec3d817091a273223158ab0f4f726b5 - - path: pathfinder/demo.trace - expectations: - - device: gl-virgl - checksum: 4c7d1c9044a58d017405200746aa7962 - - path: supertuxkart/supertuxkart-mansion-egl-gles.trace - expectations: - - device: gl-virgl - checksum: 54847eaf8a2f1b6b45cc323be67417d3 - - path: xonotic/xonotic-keybench-high.trace - expectations: - - device: gl-virgl - checksum: 10c4ee7d1a0a6e708fc7b4176a03a465 - - path: valve/counterstrike.trace - expectations: - - device: gl-virgl - checksum: 405faea80fdc58c511b939891ba478c6 -# Piglit times-out when trying to run these two -# - path: valve/counterstrike-source.trace -# expectations: -# - device: gl-virgl -# checksum: 4c19f6060ff0fe0055678c48e1e77282 -# - path: valve/half-life-2.trace -# expectations: -# - device: gl-virgl -# checksum: 323887eedf59fa9282d6c3a4c82c3192 - - path: valve/portal-2.trace - expectations: - - device: gl-virgl - checksum: ba556c810d4eb2a9efa9e44e150e7e19 -# Piglit crashes when trying to run this one -# - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -# Piglit crashes when trying to run this one -# - path: supertuxkart/supertuxkart-menu.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -# Piglit crashes when trying to run this one -# - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -# Piglit crashes when trying to run this one -# - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 - diff --git a/.gitlab-ci/expectations/virt/traces-virgl.yml b/.gitlab-ci/expectations/virt/traces-virgl.yml deleted file mode 100644 index b0cbf98..0000000 --- a/.gitlab-ci/expectations/virt/traces-virgl.yml +++ /dev/null @@ -1,276 +0,0 @@ -traces-db: - download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/" - -traces: - - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace - expectations: - - device: gl-virgl - checksum: 2fc8433c4a38b796173bda2bcfb924cc - - path: glmark2/jellyfish.trace - expectations: - - device: gl-virgl - checksum: 48a2ad1162bf92301cedbe53edf52a6b - - path: glxgears/glxgears-2.trace - expectations: - - device: gl-virgl - checksum: f8eba0fec6e3e0af9cb09844bc73bdc8 - - path: gputest/furmark.trace - expectations: - - device: gl-virgl - checksum: d5682aaa762a4849f0cae1692623bdcb - - path: gputest/pixmark-piano.trace - expectations: - - device: gl-virgl - checksum: 1bcded27a6ba04fe0f76ff997b98dbc3 - - path: gputest/triangle.trace - expectations: - - device: gl-virgl - checksum: 7812de00011a3a059892e36cea19c696 - - path: humus/Portals.trace - expectations: - - device: gl-virgl - checksum: b697edce7776f1afe294a7e80dfc013e - - path: 0ad/0ad.trace - expectations: - - device: gl-virgl - checksum: 5e5bd83446d2554bf25761576d9b1af6 - - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=false.trace - expectations: - - device: gl-virgl - checksum: 0a44720bfe9cce13c52299a3125b2aae - - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=subdata:interleave=false.trace - expectations: - - device: gl-virgl - checksum: c109416afbc0db4ba466d5a453b8a6dc - - path: glmark2/buffer:update-fraction=0.5:update-dispersion=0.9:columns=200:update-method=map:interleave=true.trace - expectations: - - device: gl-virgl - checksum: 1c0551f10a5dc9358f3fb9bb9f059883 - - path: glmark2/bump:bump-render=height.trace - expectations: - - device: gl-virgl - checksum: 4d5211dfb0fd82a1a1dbb498dc2e5b8b - - path: glmark2/bump:bump-render=high-poly.trace - expectations: - - device: gl-virgl - checksum: 4b4d4a4b7bb1341bbd0299c7eb3a6ac9 - - path: glmark2/bump:bump-render=normals.trace - expectations: - - device: gl-virgl - checksum: 832e5baf289b27dd84a665f1c85f57c2 - - path: glmark2/conditionals:vertex-steps=0:fragment-steps=0.trace - expectations: - - device: gl-virgl - checksum: b78f28d97b675fcc7649cced3930650a - - path: glmark2/conditionals:vertex-steps=0:fragment-steps=5.trace - expectations: - - device: gl-virgl - checksum: d0782a516f06a6dddac4f1e1249f41e7 - - path: glmark2/conditionals:vertex-steps=5:fragment-steps=0.trace - expectations: - - device: gl-virgl - checksum: 1ae280a9c6cae495f2d272516a52167e - - path: glmark2/desktop:windows=4:effect=shadow.trace - expectations: - - device: gl-virgl - checksum: d4b3e8338327859a029c7267c9916524 - - path: glmark2/effect2d:kernel=0,1,0;1,-4,1;0,1,0;.trace - expectations: - - device: gl-virgl - checksum: 25d3b5d18a64a86fc812872987f4f5e7 - - path: glmark2/effect2d:kernel=1,1,1,1,1;1,1,1,1,1;1,1,1,1,1;.trace - expectations: - - device: gl-virgl - checksum: b80963dae6ecf40c83bfb16943ef1011 - - path: glmark2/function:fragment-steps=5:fragment-complexity=low.trace - expectations: - - device: gl-virgl - checksum: da10cb29cab30c5c068e722b5da7c2e5 - - path: glmark2/function:fragment-steps=5:fragment-complexity=medium.trace - expectations: - - device: gl-virgl - checksum: 8e40504d9f2ead8c0d02604291bff1b6 - - path: glmark2/build:use-vbo=false.trace - expectations: - - device: gl-virgl - checksum: 024fc485e1f33461313c956ab1b73bdf - - path: glmark2/build:use-vbo=true.trace - expectations: - - device: gl-virgl - checksum: 48c45d16cd410a71aea1a12a73e257d3 - - path: glmark2/ideas:speed=10000.trace - expectations: - - device: gl-virgl - checksum: db78cfb035213e31e1435b637b1a8f19 - - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-loop=false.trace - expectations: - - device: gl-virgl - checksum: 7fee2e864e015353ace431d51d41bb22 - - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=false.trace - expectations: - - device: gl-virgl - checksum: c87127a5c3256c1fe7c79f7931b8f9df - - path: glmark2/loop:vertex-steps=5:fragment-steps=5:fragment-uniform=true.trace - expectations: - - device: gl-virgl - checksum: 5fec1f728bda86891db4243130546187 - - path: glmark2/pulsar:quads=5:texture=false:light=false.trace - expectations: - - device: gl-virgl - checksum: 3e0e6675fb65e00f9128138ff08c2634 - - path: glmark2/refract.trace - expectations: - - device: gl-virgl - checksum: b1332df324d0fc1db22b362231d3ed01 - - path: glmark2/shading:shading=blinn-phong-inf.trace - expectations: - - device: gl-virgl - checksum: 36b07dad759ca65e52f1abf1667e7ca8 - - path: glmark2/shading:shading=cel.trace - expectations: - - device: gl-virgl - checksum: cb41cf2531a06d65f6e4f442ab62ae8d - - path: glmark2/shading:shading=gouraud.trace - expectations: - - device: gl-virgl - checksum: 3e5469d5038d7cc94ef3549ce9d8c385 - - path: glmark2/shading:shading=phong.trace - expectations: - - device: gl-virgl - checksum: e40abcbb4cfbbbfb499d4b0e6d668f41 - - path: glmark2/shadow.trace - expectations: - - device: gl-virgl - checksum: 2bb7290f8559ff93305c0e29f3d671e1 - - path: glmark2/texture:texture-filter=linear.trace - expectations: - - device: gl-virgl - checksum: 914fd8dddb23751d9a187a979d881abb - - path: glmark2/texture:texture-filter=mipmap.trace - expectations: - - device: gl-virgl - checksum: ea1939f3c4e8dd9cdbc26d41f9dc891a - - path: glmark2/texture:texture-filter=nearest.trace - expectations: - - device: gl-virgl - checksum: 1ae652bdebd1188ab912a800a4c37166 - - path: glxgears/glxgears.trace - expectations: - - device: gl-virgl - checksum: 02aca9b4b4ad6fd60331df6e4f87f2cd -# Crash -# - path: gputest/gimark.trace -# expectations: -# - device: gl-virgl -# checksum: 2cf40180a1315795389d0dfc18aad988 - - path: gputest/pixmark-julia-fp32.trace - expectations: - - device: gl-virgl - checksum: 8b3584b1dd8f1d1bb63205564bd78e4e - - path: gputest/pixmark-julia-fp64.trace - expectations: - - device: gl-virgl - checksum: 73ccaff82ea764057fb0f93f0024cf84 - - path: gputest/pixmark-volplosion.trace - expectations: - - device: gl-virgl - checksum: 9bedb84d81528e1b4087522de9f70383 - - path: gputest/plot3d.trace - expectations: - - device: gl-virgl - checksum: a1af286874f7060171cb3ca2e765c448 -# Times out -# - path: gputest/tessmark.trace -# expectations: -# - device: gl-virgl -# checksum: 5d04b8d71517238b9bc8a527574e884b - - path: humus/AmbientAperture.trace - expectations: - - device: gl-virgl - checksum: b33fb8ee73b0c50b14822e170f15ab8a - - path: humus/CelShading.trace - expectations: - - device: gl-virgl - checksum: 3629cba72bde53e4275a8365175fde83 - - path: humus/DynamicBranching3.trace - expectations: - - device: gl-virgl - checksum: 0236b28aa8b26fa60172d71bb040f2e9 - - path: humus/HDR.trace - expectations: - - device: gl-virgl - checksum: eab0801aadeae87ce31aa0d4ff55e8f8 - - path: humus/RaytracedShadows.trace - expectations: - - device: gl-virgl - checksum: 298e49b697e9141294ecbc6283729d86 - - path: humus/VolumetricFogging2.trace - expectations: - - device: gl-virgl - checksum: 382891c83f2afe4fcbdd2bfd241c1339 - - path: itoral-gl-terrain-demo/demo.trace - expectations: - - device: gl-virgl - checksum: fe6124227b7f8e4e96ffbbd48c713c42 - - path: neverball/neverball.trace - expectations: - - device: gl-virgl - checksum: cc11743f008ccd76adf72695a423436a - - path: pathfinder/canvas_moire.trace - expectations: - - device: gl-virgl - checksum: 2cb5be6a6f62e417f1a89c89180e5728 - - path: pathfinder/canvas_text_v2.trace - expectations: - - device: gl-virgl - checksum: a1446d0c42a78771240fca6f3b1e10d8 - - path: pathfinder/demo.trace - expectations: - - device: gl-virgl - checksum: 0702a66c415cfc13d5bae8bec08402cf - - path: supertuxkart/supertuxkart-mansion-egl-gles.trace - expectations: - - device: gl-virgl - checksum: 156c26de2cefe1973b1593e6b22f7edb - - path: xonotic/xonotic-keybench-high.trace - expectations: - - device: gl-virgl - checksum: f3b184bf8858a6ebccd09e7ca032197e - - path: valve/counterstrike.trace - expectations: - - device: gl-virgl - checksum: 3bc0e0e39cb3c29f6d76ff07f1f02860 -# Piglit times-out when trying to run these two -# - path: valve/counterstrike-source.trace -# expectations: -# - device: gl-virgl -# checksum: 4c19f6060ff0fe0055678c48e1e77282 -# - path: valve/half-life-2.trace -# expectations: -# - device: gl-virgl -# checksum: 323887eedf59fa9282d6c3a4c82c3192 - - path: valve/portal-2.trace - expectations: - - device: gl-virgl - checksum: 9f7fecf8df89e105a4d2b4a61468b427 -# Piglit crashes when trying to run this one -# - path: supertuxkart/supertuxkart-antediluvian-abyss.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -# Piglit crashes when trying to run this one -# - path: supertuxkart/supertuxkart-menu.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -# Piglit crashes when trying to run this one -# - path: supertuxkart/supertuxkart-ravenbridge-mansion.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -# Piglit crashes when trying to run this one -# - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc -# expectations: -# - device: gl-virgl -# checksum: 0 -