From 67c6f80a54cbf130e9fb5623f10d50d493f17c5b Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Date: Fri, 4 Jul 2025 17:50:08 +0200
Subject: [PATCH] radeonsi/tests: allow to test radv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36463>
---
 .../drivers/radeonsi/ci/radeonsi-run-tests.py | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
index 12b60f90618..4f20fa7bf3a 100755
--- a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
+++ b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
@@ -86,6 +86,9 @@ parser.add_argument(
 parser.add_argument(
     "--no-deqp", dest="deqp", help="Disable dEQP tests", action="store_false"
 )
+parser.add_argument(
+    "--no-vkcts", dest="vkcts", help="Disable VKCTS tests", action="store_false"
+)
 parser.add_argument(
     "--no-deqp-egl",
     dest="deqp_egl",
@@ -114,6 +117,7 @@ parser.set_defaults(piglit=True)
 parser.set_defaults(glcts=True)
 parser.set_defaults(escts=True)
 parser.set_defaults(deqp=True)
+parser.set_defaults(vkcts=False)
 parser.set_defaults(deqp_egl=True)
 parser.set_defaults(deqp_gles2=True)
 parser.set_defaults(deqp_gles3=True)
@@ -678,4 +682,42 @@ if args.deqp:
     if not verify_results(os.path.join(out, "failures.csv")):
         success = False
 
+# vkcts test
+if args.vkcts and is_amd:
+    out = os.path.join(output_folder, "vkcts")
+    print_yellow("Running  VKCTS tests", args.verbose > 0)
+    os.mkdir(os.path.join(output_folder, "vkcts"))
+
+    cmd = (
+        [
+            "deqp-runner",
+            "run",
+            "--tests-per-group",
+            "100",
+            "--deqp",
+            "{}/build/external/vulkancts/modules/vulkan/deqp-vk".format(glcts_path),
+            "--caselist",
+            "{}/external/vulkancts/mustpass/main/vk-default.txt".format(glcts_path),
+            "--output",
+            out,
+            "--skips",
+            skips_list,
+            "--jobs",
+            str(args.jobs),
+            "--timeout",
+            "1000",
+        ]
+        + filters_args
+        + flakes_args
+    )
+
+    if os.path.exists(baseline):
+        cmd += ["--baseline", baseline]
+    cmd += deqp_args
+
+    run_cmd(cmd, args.verbose)
+
+    if not verify_results(os.path.join(out, "failures.csv")):
+        success = False
+
 sys.exit(0 if success else 1)