Module: Mesa Branch: main Commit: cadceac2a73d707c23d8f1fed9e63548f16b5851 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cadceac2a73d707c23d8f1fed9e63548f16b5851
Author: David Heidelberg <[email protected]> Date: Mon Feb 20 04:20:00 2023 +0100 ci/freedreno: Make traces work on LAVA caching proxy Explicitily define the caching proxy via piglit `--download-caching-proxy-url` argument. We have different URLs for caching proxy for LAVA and freedreno farms. Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22065> --- src/freedreno/ci/gitlab-ci.yml | 5 +++-- src/freedreno/ci/traces-freedreno.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index dd968b9e148..c917670579f 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -343,6 +343,7 @@ a630-traces: # missing. MESA_GLSL_VERSION_OVERRIDE: "460" MESA_GL_VERSION_OVERRIDE: "4.6" + PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri="; a630-traces-restricted: extends: @@ -350,7 +351,7 @@ a630-traces-restricted: - .freedreno-rules-restricted variables: PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml" - PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE} + PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}" allow_failure: true a630-traces-performance: @@ -359,7 +360,7 @@ a630-traces-performance: - .freedreno-rules-performance variables: PIGLIT_REPLAY_SUBCOMMAND: "profile" - PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/" + PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/" # More than this can hit OOM due to BOs leaked during the replay of the last frame PIGLIT_REPLAY_LOOP_TIMES: 150 # We don't want for more than one workload to be submitted to the GPU at a time diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml index 979e019add1..a558726cc3d 100644 --- a/src/freedreno/ci/traces-freedreno.yml +++ b/src/freedreno/ci/traces-freedreno.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: http://10.42.0.1:8888/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/ + download-url: https://s3.freedesktop.org/mesa-tracie-public/ text: |- NOTE for faster runtime, try to sort tests so the longer running traces
