From 60d413b89455c991b87de3463e72bcb24642f6e7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 19 Feb 2021 09:45:29 -0800 Subject: [PATCH] ci: Move the piglit expectations lists to the per-driver CI dirs. Now changing piglit expectations won't retest everyone else's drivers. Acked-By: Mike Blumenkrantz Part-of: --- .gitlab-ci/piglit/run.sh | 2 +- .gitlab-ci/piglit/run_cl.sh | 2 +- {.gitlab-ci/piglit => src/amd/ci}/radv-polaris10-replay.txt | 0 {.gitlab-ci/piglit => src/amd/ci}/radv-raven-replay.txt | 0 {.gitlab-ci/piglit => src/broadcom/ci}/v3d-rpi4-quick_gl.txt | 0 {.gitlab-ci/piglit => src/broadcom/ci}/v3d-rpi4-shader_gl.txt | 0 {.gitlab-ci/piglit => src/broadcom/ci}/vc4-rpi3-quick_gl.txt | 0 .../piglit => src/broadcom/ci}/vc4-rpi3-quick_shader.txt | 0 .../gallium/drivers/freedreno/ci}/freedreno-a530-gl.txt | 0 .../gallium/drivers/freedreno/ci}/freedreno-a530-shader.txt | 0 .../gallium/drivers/freedreno/ci}/freedreno-a630-gl.txt | 0 .../gallium/drivers/freedreno/ci}/freedreno-a630-replay.txt | 0 .../gallium/drivers/freedreno/ci}/freedreno-a630-shader.txt | 0 .../piglit => src/gallium/drivers/llvmpipe/ci}/llvmpipe-cl.txt | 0 .../gallium/drivers/llvmpipe/ci}/llvmpipe-glslparser.txt | 0 .../gallium/drivers/llvmpipe/ci}/llvmpipe-quick_gl.txt | 0 .../gallium/drivers/llvmpipe/ci}/llvmpipe-quick_shader.txt | 0 .../gallium/drivers/llvmpipe/ci}/llvmpipe-replay.txt | 0 .../gallium/drivers/panfrost/ci}/panfrost-t760-replay.txt | 0 .../gallium/drivers/panfrost/ci}/panfrost-t860-replay.txt | 0 .../gallium/drivers/radeonsi/ci}/radeonsi-stoney-replay.txt | 0 .../gallium/drivers/softpipe/ci}/softpipe-quick.txt | 0 .../piglit => src/gallium/drivers/virgl/ci}/virgl-replay.txt | 0 .../piglit => src/gallium/drivers/zink/ci}/zink-quick_gl.txt | 0 24 files changed, 2 insertions(+), 2 deletions(-) rename {.gitlab-ci/piglit => src/amd/ci}/radv-polaris10-replay.txt (100%) rename {.gitlab-ci/piglit => src/amd/ci}/radv-raven-replay.txt (100%) rename {.gitlab-ci/piglit => src/broadcom/ci}/v3d-rpi4-quick_gl.txt (100%) rename {.gitlab-ci/piglit => src/broadcom/ci}/v3d-rpi4-shader_gl.txt (100%) rename {.gitlab-ci/piglit => src/broadcom/ci}/vc4-rpi3-quick_gl.txt (100%) rename {.gitlab-ci/piglit => src/broadcom/ci}/vc4-rpi3-quick_shader.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/freedreno/ci}/freedreno-a530-gl.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/freedreno/ci}/freedreno-a530-shader.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/freedreno/ci}/freedreno-a630-gl.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/freedreno/ci}/freedreno-a630-replay.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/freedreno/ci}/freedreno-a630-shader.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/llvmpipe/ci}/llvmpipe-cl.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/llvmpipe/ci}/llvmpipe-glslparser.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/llvmpipe/ci}/llvmpipe-quick_gl.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/llvmpipe/ci}/llvmpipe-quick_shader.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/llvmpipe/ci}/llvmpipe-replay.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/panfrost/ci}/panfrost-t760-replay.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/panfrost/ci}/panfrost-t860-replay.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/radeonsi/ci}/radeonsi-stoney-replay.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/softpipe/ci}/softpipe-quick.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/virgl/ci}/virgl-replay.txt (100%) rename {.gitlab-ci/piglit => src/gallium/drivers/zink/ci}/zink-quick_gl.txt (100%) diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index c0eea8836ad..42242e49b46 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -223,7 +223,7 @@ if [ "x$PIGLIT_PROFILES" = "xreplay" ] \ "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/junit.xml" fi -cp "$INSTALL/piglit/$PIGLIT_RESULTS.txt" \ +cp "$INSTALL/$PIGLIT_RESULTS.txt" \ ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" if diff -q ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE; then exit 0 diff --git a/.gitlab-ci/piglit/run_cl.sh b/.gitlab-ci/piglit/run_cl.sh index 57251ea7709..95d70787001 100755 --- a/.gitlab-ci/piglit/run_cl.sh +++ b/.gitlab-ci/piglit/run_cl.sh @@ -24,7 +24,7 @@ set -e PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES} mkdir -p .gitlab-ci/piglit -cp $OLDPWD/install/piglit/$PIGLIT_RESULTS.txt .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline +cp $OLDPWD/install/$PIGLIT_RESULTS.txt .gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline ./piglit summary console $OLDPWD/results | head -n -1 | grep -v ": pass" >.gitlab-ci/piglit/$PIGLIT_RESULTS.txt if diff -q .gitlab-ci/piglit/$PIGLIT_RESULTS.txt{.baseline,}; then diff --git a/.gitlab-ci/piglit/radv-polaris10-replay.txt b/src/amd/ci/radv-polaris10-replay.txt similarity index 100% rename from .gitlab-ci/piglit/radv-polaris10-replay.txt rename to src/amd/ci/radv-polaris10-replay.txt diff --git a/.gitlab-ci/piglit/radv-raven-replay.txt b/src/amd/ci/radv-raven-replay.txt similarity index 100% rename from .gitlab-ci/piglit/radv-raven-replay.txt rename to src/amd/ci/radv-raven-replay.txt diff --git a/.gitlab-ci/piglit/v3d-rpi4-quick_gl.txt b/src/broadcom/ci/v3d-rpi4-quick_gl.txt similarity index 100% rename from .gitlab-ci/piglit/v3d-rpi4-quick_gl.txt rename to src/broadcom/ci/v3d-rpi4-quick_gl.txt diff --git a/.gitlab-ci/piglit/v3d-rpi4-shader_gl.txt b/src/broadcom/ci/v3d-rpi4-shader_gl.txt similarity index 100% rename from .gitlab-ci/piglit/v3d-rpi4-shader_gl.txt rename to src/broadcom/ci/v3d-rpi4-shader_gl.txt diff --git a/.gitlab-ci/piglit/vc4-rpi3-quick_gl.txt b/src/broadcom/ci/vc4-rpi3-quick_gl.txt similarity index 100% rename from .gitlab-ci/piglit/vc4-rpi3-quick_gl.txt rename to src/broadcom/ci/vc4-rpi3-quick_gl.txt diff --git a/.gitlab-ci/piglit/vc4-rpi3-quick_shader.txt b/src/broadcom/ci/vc4-rpi3-quick_shader.txt similarity index 100% rename from .gitlab-ci/piglit/vc4-rpi3-quick_shader.txt rename to src/broadcom/ci/vc4-rpi3-quick_shader.txt diff --git a/.gitlab-ci/piglit/freedreno-a530-gl.txt b/src/gallium/drivers/freedreno/ci/freedreno-a530-gl.txt similarity index 100% rename from .gitlab-ci/piglit/freedreno-a530-gl.txt rename to src/gallium/drivers/freedreno/ci/freedreno-a530-gl.txt diff --git a/.gitlab-ci/piglit/freedreno-a530-shader.txt b/src/gallium/drivers/freedreno/ci/freedreno-a530-shader.txt similarity index 100% rename from .gitlab-ci/piglit/freedreno-a530-shader.txt rename to src/gallium/drivers/freedreno/ci/freedreno-a530-shader.txt diff --git a/.gitlab-ci/piglit/freedreno-a630-gl.txt b/src/gallium/drivers/freedreno/ci/freedreno-a630-gl.txt similarity index 100% rename from .gitlab-ci/piglit/freedreno-a630-gl.txt rename to src/gallium/drivers/freedreno/ci/freedreno-a630-gl.txt diff --git a/.gitlab-ci/piglit/freedreno-a630-replay.txt b/src/gallium/drivers/freedreno/ci/freedreno-a630-replay.txt similarity index 100% rename from .gitlab-ci/piglit/freedreno-a630-replay.txt rename to src/gallium/drivers/freedreno/ci/freedreno-a630-replay.txt diff --git a/.gitlab-ci/piglit/freedreno-a630-shader.txt b/src/gallium/drivers/freedreno/ci/freedreno-a630-shader.txt similarity index 100% rename from .gitlab-ci/piglit/freedreno-a630-shader.txt rename to src/gallium/drivers/freedreno/ci/freedreno-a630-shader.txt diff --git a/.gitlab-ci/piglit/llvmpipe-cl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt similarity index 100% rename from .gitlab-ci/piglit/llvmpipe-cl.txt rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-cl.txt diff --git a/.gitlab-ci/piglit/llvmpipe-glslparser.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-glslparser.txt similarity index 100% rename from .gitlab-ci/piglit/llvmpipe-glslparser.txt rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-glslparser.txt diff --git a/.gitlab-ci/piglit/llvmpipe-quick_gl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt similarity index 100% rename from .gitlab-ci/piglit/llvmpipe-quick_gl.txt rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt diff --git a/.gitlab-ci/piglit/llvmpipe-quick_shader.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt similarity index 100% rename from .gitlab-ci/piglit/llvmpipe-quick_shader.txt rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt diff --git a/.gitlab-ci/piglit/llvmpipe-replay.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-replay.txt similarity index 100% rename from .gitlab-ci/piglit/llvmpipe-replay.txt rename to src/gallium/drivers/llvmpipe/ci/llvmpipe-replay.txt diff --git a/.gitlab-ci/piglit/panfrost-t760-replay.txt b/src/gallium/drivers/panfrost/ci/panfrost-t760-replay.txt similarity index 100% rename from .gitlab-ci/piglit/panfrost-t760-replay.txt rename to src/gallium/drivers/panfrost/ci/panfrost-t760-replay.txt diff --git a/.gitlab-ci/piglit/panfrost-t860-replay.txt b/src/gallium/drivers/panfrost/ci/panfrost-t860-replay.txt similarity index 100% rename from .gitlab-ci/piglit/panfrost-t860-replay.txt rename to src/gallium/drivers/panfrost/ci/panfrost-t860-replay.txt diff --git a/.gitlab-ci/piglit/radeonsi-stoney-replay.txt b/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-replay.txt similarity index 100% rename from .gitlab-ci/piglit/radeonsi-stoney-replay.txt rename to src/gallium/drivers/radeonsi/ci/radeonsi-stoney-replay.txt diff --git a/.gitlab-ci/piglit/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt similarity index 100% rename from .gitlab-ci/piglit/softpipe-quick.txt rename to src/gallium/drivers/softpipe/ci/softpipe-quick.txt diff --git a/.gitlab-ci/piglit/virgl-replay.txt b/src/gallium/drivers/virgl/ci/virgl-replay.txt similarity index 100% rename from .gitlab-ci/piglit/virgl-replay.txt rename to src/gallium/drivers/virgl/ci/virgl-replay.txt diff --git a/.gitlab-ci/piglit/zink-quick_gl.txt b/src/gallium/drivers/zink/ci/zink-quick_gl.txt similarity index 100% rename from .gitlab-ci/piglit/zink-quick_gl.txt rename to src/gallium/drivers/zink/ci/zink-quick_gl.txt