radv/ci: Remove duplication in dEQP skip lists.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11426>

diff --git a/src/amd/ci/deqp-radv-bonaire-aco-skips.txt b/src/amd/ci/deqp-radv-bonaire-aco-skips.txt
index 1183781..1238ee0 100644 (file)
--- a/src/amd/ci/deqp-radv-bonaire-aco-skips.txt
+++ b/src/amd/ci/deqp-radv-bonaire-aco-skips.txt
@@ -1,12 +1,2 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
 # This subset of CTS randomly hangs but it's fine when using only one thread.
 dEQP-VK.synchronization.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-fiji-aco-skips.txt b/src/amd/ci/deqp-radv-fiji-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-fiji-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-hawaii-aco-skips.txt b/src/amd/ci/deqp-radv-hawaii-aco-skips.txt
index 1183781..1238ee0 100644 (file)
--- a/src/amd/ci/deqp-radv-hawaii-aco-skips.txt
+++ b/src/amd/ci/deqp-radv-hawaii-aco-skips.txt
@@ -1,12 +1,2 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
 # This subset of CTS randomly hangs but it's fine when using only one thread.
 dEQP-VK.synchronization.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-navi10-aco-skips.txt b/src/amd/ci/deqp-radv-navi10-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-navi10-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-navi14-aco-skips.txt b/src/amd/ci/deqp-radv-navi14-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-navi14-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-oland-aco-skips.txt b/src/amd/ci/deqp-radv-oland-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-oland-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-pitcairn-aco-skips.txt b/src/amd/ci/deqp-radv-pitcairn-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-pitcairn-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-polaris10-aco-skips.txt b/src/amd/ci/deqp-radv-polaris10-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-polaris10-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-raven-aco-skips.txt b/src/amd/ci/deqp-radv-raven-aco-skips.txt
index 77f7620..cbbe39a 100644 (file)
--- a/src/amd/ci/deqp-radv-raven-aco-skips.txt
+++ b/src/amd/ci/deqp-radv-raven-aco-skips.txt
@@ -1,13 +1,3 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# This subset of CTS seems to randomly hangs on RAVEN only.
+# This subset of CTS seems to randomly hang on RAVEN and BONAIRE.
 # This needs to be investigated and fixed!
 dEQP-VK.synchronization.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-renoir-aco-skips.txt b/src/amd/ci/deqp-radv-renoir-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-renoir-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt b/src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt
deleted file mode 100644 (file)
index 521123c..0000000
--- a/src/amd/ci/deqp-radv-sienna_cichlid-aco-skips.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576

diff --git a/src/amd/ci/deqp-radv-vega10-aco-skips.txt b/src/amd/ci/deqp-radv-skips.txt
similarity index 100%
rename from src/amd/ci/deqp-radv-vega10-aco-skips.txt
rename to src/amd/ci/deqp-radv-skips.txt

diff --git a/src/amd/ci/deqp-radv-stoney-aco-skips.txt b/src/amd/ci/deqp-radv-stoney-aco-skips.txt
index 3e8b73f..ca8cbdc 100644 (file)
--- a/src/amd/ci/deqp-radv-stoney-aco-skips.txt
+++ b/src/amd/ci/deqp-radv-stoney-aco-skips.txt
@@ -1,13 +1,3 @@
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# Exclude WSI related tests.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
-
-# Exclude this test which timeout most of the time.
-dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst.1048576
-
 # These tests take too long to run on the current STONEY testing hardware, skip them.
 dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_clamp
 dEQP-VK.texture.explicit_lod.2d.sizes.128x128_linear_linear_mipmap_linear_repeat

diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 91980cd..24a6d35 100644 (file)
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -4,6 +4,7 @@
     - .radv-rules
   variables:
     VK_DRIVER: radeon
+    DRIVER_NAME: radv
     ACO_DEBUG: validateir,validatera
     MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
 
@@ -73,6 +74,7 @@ radv_stoney_vkcts:amd64:
     HWCI_KERNEL_MODULES: amdgpu
     HWCI_FREQ_MAX: "true"
     VK_DRIVER: radeon
+    DRIVER_NAME: radv
   tags:
     - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt