From 54ae9016a8ce93e47bcf7f3ff6a82377bb2e9f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= <pavel.ondracka@gmail.com>
Date: Tue, 29 Jul 2025 17:27:49 +0200
Subject: [PATCH] r300/ci: asan testing

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36447>
---
 .gitlab-ci/build/gitlab-ci.yml            |  2 +-
 .gitlab-ci/ci-tron/gitlab-ci.yml          | 14 ++++++++++++
 src/gallium/drivers/r300/ci/gitlab-ci.yml | 27 ++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 6357c228bf0..948aba34ae4 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -58,7 +58,7 @@ debian-x86_64-asan:
     - .build-run-long
   variables:
     VULKAN_DRIVERS: "swrast,amd,intel"
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,zink"
+    GALLIUM_DRIVERS: "llvmpipe,softpipe,zink,r300"
     C_ARGS: >
       -Wno-error=stringop-truncation
       -Wno-error=deprecated-declarations
diff --git a/.gitlab-ci/ci-tron/gitlab-ci.yml b/.gitlab-ci/ci-tron/gitlab-ci.yml
index b7bdc1de0e0..804a22fd82a 100644
--- a/.gitlab-ci/ci-tron/gitlab-ci.yml
+++ b/.gitlab-ci/ci-tron/gitlab-ci.yml
@@ -133,6 +133,20 @@
     - job: debian-build-x86_64
       artifacts: false
 
+.ci-tron-x86_64-test-gl-asan-manual:
+  extends:
+    - .use-debian/x86_64_test-gl
+    - .ci-tron-x86_64-test
+  variables:
+    S3_ARTIFACT_NAME: "mesa-x86_64-asan-debugoptimized"
+    DEQP_FORCE_ASAN: 1
+  needs:
+    - job: debian/x86_64_test-gl
+      artifacts: false
+      optional: true
+    - job: debian-x86_64-asan
+      artifacts: false
+
 .ci-tron-arm64-test:
   extends:
     - .ci-tron-test
diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml
index 7f3479c8bbe..9247ad826fe 100644
--- a/src/gallium/drivers/r300/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml
@@ -3,7 +3,6 @@ include:
 
 .ondracka-generic:
   extends:
-    - .ci-tron-x86_64-test-gl-manual  # use debian-build-x86_64 rather than debian-x86_64
     - .r300-manual-rules
   variables:
     FDO_CI_CONCURRENT: 2
@@ -15,12 +14,14 @@ include:
 
 .ondracka-rv530:
   extends:
+    - .ci-tron-x86_64-test-gl-manual  # use debian-build-x86_64 rather than debian-x86_64
     - .ondracka-generic
   variables:
     CI_TRON_DUT_SETUP_TAGS: radeon:codename:RV530
 
 .ondracka-rv380:
   extends:
+    - .ci-tron-x86_64-test-gl-manual  # use debian-build-x86_64 rather than debian-x86_64
     - .ondracka-generic
   variables:
     CI_TRON_DUT_SETUP_TAGS: radeon:codename:RV380
@@ -36,6 +37,19 @@ r300-rv530-deqp-gles2:
     # see https://gitlab.freedesktop.org/mesa/mesa/-/issues/8093
     RADEON_DEBUG: nohiz
 
+r300-rv530-deqp-gles2-asan:
+  extends:
+    - .ci-tron-x86_64-test-gl-asan-manual
+    - .ondracka-generic
+  variables:
+    CI_TRON_DUT_SETUP_TAGS: radeon:codename:RV530
+    DEQP_SUITE: r300-rv530
+    GPU_VERSION: r300-rv530-nohiz
+    # Only single process can use hiz at a time, and we have some issues
+    # there in depth stencil tests, so it brings flakes,
+    # see https://gitlab.freedesktop.org/mesa/mesa/-/issues/8093
+    RADEON_DEBUG: nohiz
+
 r300-rv380-deqp-gles2:
   extends:
     - .ondracka-rv380
@@ -43,8 +57,18 @@ r300-rv380-deqp-gles2:
     DEQP_SUITE: r300-rv380
     GPU_VERSION: r300-rv380
 
+r300-rv380-deqp-gles2-asan:
+  extends:
+    - .ci-tron-x86_64-test-gl-asan-manual
+    - .ondracka-generic
+  variables:
+    CI_TRON_DUT_SETUP_TAGS: radeon:codename:RV380
+    DEQP_SUITE: r300-rv380
+    GPU_VERSION: r300-rv380
+
 r300-rv410-deqp-piglit:
   extends:
+    - .ci-tron-x86_64-test-gl-manual  # use debian-build-x86_64 rather than debian-x86_64
     - .ondracka-generic
     - .test-piglit
   variables:
@@ -55,6 +79,7 @@ r300-rv410-deqp-piglit:
 
 r300-rs740-deqp-piglit:
   extends:
+    - .ci-tron-x86_64-test-gl-manual  # use debian-build-x86_64 rather than debian-x86_64
     - .ondracka-generic
     - .test-piglit
   variables: