From af183b03e915110c3d44ed1b536dc0599a5f2949 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Mon, 6 Jan 2025 11:54:25 +0100
Subject: [PATCH] freedreno/ci: Re-enable some traces on a618 and disable
 a630-traces

These traces are no longer flaky or broken on a618, so we can re-enable
them and fully replace the a630-traces job, which we have to disable
due to the limited number of DUTs.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8337

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33082>
---
 src/freedreno/ci/gitlab-ci.yml        |  6 +++---
 src/freedreno/ci/traces-freedreno.yml | 13 ++-----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 0d149497927..1f3b7f355d5 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -357,7 +357,7 @@ a630-piglit-full:
     DEQP_SUITE: freedreno-a630-piglit-full
     TEST_PHASE_TIMEOUT_MINUTES: 55
 
-a630-traces:
+.a630-traces:
   extends:
     - .google-freedreno-test-traces
     - .a630-test
@@ -372,7 +372,7 @@ a630-traces:
 
 a630-traces-restricted:
   extends:
-    - a630-traces
+    - .a630-traces
     - .google-freedreno-rules-restricted
   variables:
     PIGLIT_TRACES_FILE: restricted-traces-freedreno.yml
@@ -381,7 +381,7 @@ a630-traces-restricted:
 
 a630-traces-performance:
   extends:
-    - a630-traces
+    - .a630-traces
     - .google-freedreno-rules-performance
   variables:
     PIGLIT_REPLAY_SUBCOMMAND: "profile"
diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index 2fedc092d06..7b6d79e0526 100644
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -47,18 +47,11 @@ traces:
     freedreno-a530:
       checksum: 102a09ce76092436173fd09a6a2bd941
     freedreno-a618:
-      label: [skip, flakes]
       checksum: e0e18dcc50ab2e23cead650d64469178
-      text: "intermittent segfault https://mesa.pages.freedesktop.org/-/mesa/-/jobs/39893593/artifacts/results/summary/results/trace@freedreno-a618@valve@portal-2-v2.trace.html"
     freedreno-a630:
       checksum: e0e18dcc50ab2e23cead650d64469178
     zink-a618:
       checksum: b589b5d9ddd3026cbde08f0abe840ea7
-      label: [skip, broken]
-      text: |
-        Multiple subsequent errors:
-          MESA: error: zink: couldn't allocate memory: heap=<heap> size=<size>
-        Resulting in a segfault
     zink-a630:
       label: [skip, flakes]
       checksum: b589b5d9ddd3026cbde08f0abe840ea7
@@ -105,15 +98,13 @@ traces:
     freedreno-a530:
       label: [unsupported]
     freedreno-a618:
-      label: [skip, flakes]
       checksum: 17c6a6dd333514b125cc18282ce24ba8
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8337
     freedreno-a630:
       checksum: 17c6a6dd333514b125cc18282ce24ba8
     zink-a618:
       label: [skip, flakes]
-      checksum: 59e37d2dca80caedd9494114d64c676c
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8337
+      checksum: 96f7f231042f892c7d11c91defd7ecc1
+      text: May time out
     zink-a630:
       label: [skip]
       checksum: be297e672aaaf2351de71686d47f59eb