diff --git a/src/amd/ci/angle-radv-stoney-aco-fails.txt b/src/amd/ci/angle-radv-stoney-fails.txt similarity index 100% rename from src/amd/ci/angle-radv-stoney-aco-fails.txt rename to src/amd/ci/angle-radv-stoney-fails.txt diff --git a/src/amd/ci/angle-radv-stoney-aco-flakes.txt b/src/amd/ci/angle-radv-stoney-flakes.txt similarity index 100% rename from src/amd/ci/angle-radv-stoney-aco-flakes.txt rename to src/amd/ci/angle-radv-stoney-flakes.txt diff --git a/src/amd/ci/angle-radv-stoney-aco-skips.txt b/src/amd/ci/angle-radv-stoney-skips.txt similarity index 100% rename from src/amd/ci/angle-radv-stoney-aco-skips.txt rename to src/amd/ci/angle-radv-stoney-skips.txt diff --git a/src/amd/ci/external/radv-bonaire-aco-fails.txt b/src/amd/ci/external/radv-bonaire-fails.txt similarity index 100% rename from src/amd/ci/external/radv-bonaire-aco-fails.txt rename to src/amd/ci/external/radv-bonaire-fails.txt diff --git a/src/amd/ci/external/radv-bonaire-aco-skips.txt b/src/amd/ci/external/radv-bonaire-skips.txt similarity index 100% rename from src/amd/ci/external/radv-bonaire-aco-skips.txt rename to src/amd/ci/external/radv-bonaire-skips.txt diff --git a/src/amd/ci/external/radv-fiji-aco-fails.txt b/src/amd/ci/external/radv-fiji-fails.txt similarity index 100% rename from src/amd/ci/external/radv-fiji-aco-fails.txt rename to src/amd/ci/external/radv-fiji-fails.txt diff --git a/src/amd/ci/external/radv-kabini-aco-fails.txt b/src/amd/ci/external/radv-kabini-fails.txt similarity index 100% rename from src/amd/ci/external/radv-kabini-aco-fails.txt rename to src/amd/ci/external/radv-kabini-fails.txt diff --git a/src/amd/ci/external/radv-kabini-aco-flakes.txt b/src/amd/ci/external/radv-kabini-flakes.txt similarity index 100% rename from src/amd/ci/external/radv-kabini-aco-flakes.txt rename to src/amd/ci/external/radv-kabini-flakes.txt diff --git a/src/amd/ci/external/radv-kabini-aco-skips.txt b/src/amd/ci/external/radv-kabini-skips.txt similarity index 100% rename from src/amd/ci/external/radv-kabini-aco-skips.txt rename to src/amd/ci/external/radv-kabini-skips.txt diff --git a/src/amd/ci/external/radv-navi14-aco-fails.txt b/src/amd/ci/external/radv-navi14-fails.txt similarity index 100% rename from src/amd/ci/external/radv-navi14-aco-fails.txt rename to src/amd/ci/external/radv-navi14-fails.txt diff --git a/src/amd/ci/external/radv-navi22-aco-fails.txt b/src/amd/ci/external/radv-navi22-fails.txt similarity index 100% rename from src/amd/ci/external/radv-navi22-aco-fails.txt rename to src/amd/ci/external/radv-navi22-fails.txt diff --git a/src/amd/ci/external/radv-navi22-aco-flakes.txt b/src/amd/ci/external/radv-navi22-flakes.txt similarity index 100% rename from src/amd/ci/external/radv-navi22-aco-flakes.txt rename to src/amd/ci/external/radv-navi22-flakes.txt diff --git a/src/amd/ci/external/radv-pitcairn-aco-fails.txt b/src/amd/ci/external/radv-pitcairn-fails.txt similarity index 100% rename from src/amd/ci/external/radv-pitcairn-aco-fails.txt rename to src/amd/ci/external/radv-pitcairn-fails.txt diff --git a/src/amd/ci/external/radv-raven-aco-skips.txt b/src/amd/ci/external/radv-raven-aco-skips.txt deleted file mode 100644 index cbbe39a7b3d..00000000000 --- a/src/amd/ci/external/radv-raven-aco-skips.txt +++ /dev/null @@ -1,3 +0,0 @@ -# This subset of CTS seems to randomly hang on RAVEN and BONAIRE. -# This needs to be investigated and fixed! -dEQP-VK.synchronization.* diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index bd6384581db..66d542adf9d 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -259,7 +259,7 @@ - .radv-collabora-rules variables: DRIVER_NAME: radv - GPU_VERSION: radv-stoney-aco + GPU_VERSION: radv-stoney .radeonsi-raven-test:x86_64: extends: diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 7d2148c4385..754acc6cd34 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -18,7 +18,7 @@ radv-stoney-angle: - .test-angle variables: DEQP_SUITE: radv-stoney-angle - GPU_VERSION: angle-radv-stoney-aco + GPU_VERSION: angle-radv-stoney DEQP_FRACTION: 3 radv-stoney-angle-full: @@ -164,7 +164,7 @@ radeonsi-raven-vaapi-fluster: - .radv-valve-manual-rules # Make sure this job is *always* run manually timeout: 12h variables: - GPU_VERSION: radv-kabini-aco + GPU_VERSION: radv-kabini B2C_TIMEOUT_BOOT_MINUTES: 710 B2C_TIMEOUT_OVERALL_MINUTES: 710 B2C_TIMEOUT_BOOT_RETRIES: 0 @@ -180,7 +180,7 @@ radeonsi-raven-vaapi-fluster: # total) would get the runtime under 15 minutes. timeout: 4h 10m variables: - GPU_VERSION: radv-stoney-aco + GPU_VERSION: radv-stoney # Note, it only has a wee 32g disk! B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=8g' B2C_TIMEOUT_BOOT_MINUTES: 240 @@ -197,7 +197,7 @@ vkcts-tahiti-valve: - .radv-valve-manual-rules # Make sure this job is *always* run manually timeout: 1h variables: - GPU_VERSION: radv-tahiti-aco + GPU_VERSION: radv-tahiti B2C_TIMEOUT_BOOT_MINUTES: 50 B2C_TIMEOUT_OVERALL_MINUTES: 50 B2C_TIMEOUT_BOOT_RETRIES: 0 @@ -210,7 +210,7 @@ vkcts-hawaii-valve: - .radv-valve-manual-rules timeout: 1h variables: - GPU_VERSION: radv-hawaii-aco + GPU_VERSION: radv-hawaii B2C_TIMEOUT_BOOT_MINUTES: 50 B2C_TIMEOUT_OVERALL_MINUTES: 50 B2C_TIMEOUT_BOOT_RETRIES: 0 @@ -223,7 +223,7 @@ vkcts-polaris10-valve: - .radv-valve-manual-rules timeout: 1h 15m variables: - GPU_VERSION: radv-polaris10-aco + GPU_VERSION: radv-polaris10 B2C_TIMEOUT_BOOT_MINUTES: 70 B2C_TIMEOUT_OVERALL_MINUTES: 70 RADV_PERFTEST: video_decode,video_encode @@ -235,7 +235,7 @@ vkcts-vega10-valve: - .radv-valve-manual-rules timeout: 1h 15m variables: - GPU_VERSION: radv-vega10-aco + GPU_VERSION: radv-vega10 B2C_TIMEOUT_BOOT_MINUTES: 70 B2C_TIMEOUT_OVERALL_MINUTES: 70 RADV_PERFTEST: transfer_queue,video_decode,video_encode @@ -247,7 +247,7 @@ vkcts-renoir-valve: - .radv-valve-manual-rules timeout: 2h 15m variables: - GPU_VERSION: radv-renoir-aco + GPU_VERSION: radv-renoir B2C_TIMEOUT_BOOT_MINUTES: 130 B2C_TIMEOUT_OVERALL_MINUTES: 130 RADV_PERFTEST: transfer_queue,video_decode,video_encode @@ -260,7 +260,7 @@ vkcts-navi10-valve: - .navi10-test-valve-kws - .radv-valve-manual-rules variables: - GPU_VERSION: radv-navi10-aco + GPU_VERSION: radv-navi10 RADV_PERFTEST: transfer_queue,video_decode,video_encode vkcts-navi21-valve: @@ -271,7 +271,7 @@ vkcts-navi21-valve: - .navi21-test-valve - .radv-valve-rules variables: - GPU_VERSION: radv-navi21-aco + GPU_VERSION: radv-navi21 B2C_TIMEOUT_BOOT_MINUTES: 30 B2C_TIMEOUT_OVERALL_MINUTES: 30 RADV_PERFTEST: transfer_queue @@ -284,7 +284,7 @@ vkcts-vangogh-valve: - .radv-valve-manual-rules timeout: 2h 10m variables: - GPU_VERSION: radv-vangogh-aco + GPU_VERSION: radv-vangogh RADV_PERFTEST: transfer_queue .glcts-vangogh-valve-common: @@ -317,7 +317,7 @@ vkcts-raphael-valve: - .radv-valve-manual-rules timeout: 45m variables: - GPU_VERSION: radv-raphael-aco + GPU_VERSION: radv-raphael B2C_TIMEOUT_BOOT_MINUTES: 35 B2C_TIMEOUT_OVERALL_MINUTES: 40 RADV_PERFTEST: transfer_queue,video_decode,video_encode @@ -330,7 +330,7 @@ vkcts-navi31-valve: - .navi31-test-valve - .radv-valve-rules variables: - GPU_VERSION: radv-navi31-aco + GPU_VERSION: radv-navi31 RADV_DEBUG: nomeshshader # Disable mesh shaders until task shaders stop hanging RADV_PERFTEST: transfer_queue,video_decode,video_encode B2C_TIMEOUT_BOOT_MINUTES: 20 diff --git a/src/amd/ci/radv-gfx1200-aco-fails.txt b/src/amd/ci/radv-gfx1200-fails.txt similarity index 100% rename from src/amd/ci/radv-gfx1200-aco-fails.txt rename to src/amd/ci/radv-gfx1200-fails.txt diff --git a/src/amd/ci/radv-hawaii-aco-fails.txt b/src/amd/ci/radv-hawaii-fails.txt similarity index 100% rename from src/amd/ci/radv-hawaii-aco-fails.txt rename to src/amd/ci/radv-hawaii-fails.txt diff --git a/src/amd/ci/radv-hawaii-aco-flakes.txt b/src/amd/ci/radv-hawaii-flakes.txt similarity index 100% rename from src/amd/ci/radv-hawaii-aco-flakes.txt rename to src/amd/ci/radv-hawaii-flakes.txt diff --git a/src/amd/ci/external/radv-raven-aco-fails.txt b/src/amd/ci/radv-hawaii-skips.txt similarity index 100% rename from src/amd/ci/external/radv-raven-aco-fails.txt rename to src/amd/ci/radv-hawaii-skips.txt diff --git a/src/amd/ci/radv-navi10-aco-fails.txt b/src/amd/ci/radv-navi10-fails.txt similarity index 100% rename from src/amd/ci/radv-navi10-aco-fails.txt rename to src/amd/ci/radv-navi10-fails.txt diff --git a/src/amd/ci/radv-navi10-aco-flakes.txt b/src/amd/ci/radv-navi10-flakes.txt similarity index 100% rename from src/amd/ci/radv-navi10-aco-flakes.txt rename to src/amd/ci/radv-navi10-flakes.txt diff --git a/src/amd/ci/radv-navi21-aco-fails.txt b/src/amd/ci/radv-navi21-fails.txt similarity index 100% rename from src/amd/ci/radv-navi21-aco-fails.txt rename to src/amd/ci/radv-navi21-fails.txt diff --git a/src/amd/ci/radv-navi21-aco-flakes.txt b/src/amd/ci/radv-navi21-flakes.txt similarity index 100% rename from src/amd/ci/radv-navi21-aco-flakes.txt rename to src/amd/ci/radv-navi21-flakes.txt diff --git a/src/amd/ci/radv-navi31-aco-fails.txt b/src/amd/ci/radv-navi31-fails.txt similarity index 100% rename from src/amd/ci/radv-navi31-aco-fails.txt rename to src/amd/ci/radv-navi31-fails.txt diff --git a/src/amd/ci/radv-navi31-aco-flakes.txt b/src/amd/ci/radv-navi31-flakes.txt similarity index 100% rename from src/amd/ci/radv-navi31-aco-flakes.txt rename to src/amd/ci/radv-navi31-flakes.txt diff --git a/src/amd/ci/radv-navi31-aco-skips.txt b/src/amd/ci/radv-navi31-skips.txt similarity index 100% rename from src/amd/ci/radv-navi31-aco-skips.txt rename to src/amd/ci/radv-navi31-skips.txt diff --git a/src/amd/ci/radv-polaris10-aco-fails.txt b/src/amd/ci/radv-polaris10-fails.txt similarity index 100% rename from src/amd/ci/radv-polaris10-aco-fails.txt rename to src/amd/ci/radv-polaris10-fails.txt diff --git a/src/amd/ci/radv-polaris10-aco-flakes.txt b/src/amd/ci/radv-polaris10-flakes.txt similarity index 100% rename from src/amd/ci/radv-polaris10-aco-flakes.txt rename to src/amd/ci/radv-polaris10-flakes.txt diff --git a/src/amd/ci/radv-raphael-aco-fails.txt b/src/amd/ci/radv-raphael-fails.txt similarity index 100% rename from src/amd/ci/radv-raphael-aco-fails.txt rename to src/amd/ci/radv-raphael-fails.txt diff --git a/src/amd/ci/radv-hawaii-aco-skips.txt b/src/amd/ci/radv-raphael-flakes.txt similarity index 100% rename from src/amd/ci/radv-hawaii-aco-skips.txt rename to src/amd/ci/radv-raphael-flakes.txt diff --git a/src/amd/ci/radv-renoir-aco-flakes.txt b/src/amd/ci/radv-renoir-aco-flakes.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/amd/ci/radv-renoir-aco-fails.txt b/src/amd/ci/radv-renoir-fails.txt similarity index 100% rename from src/amd/ci/radv-renoir-aco-fails.txt rename to src/amd/ci/radv-renoir-fails.txt diff --git a/src/amd/ci/radv-raphael-aco-flakes.txt b/src/amd/ci/radv-renoir-flakes.txt similarity index 100% rename from src/amd/ci/radv-raphael-aco-flakes.txt rename to src/amd/ci/radv-renoir-flakes.txt diff --git a/src/amd/ci/radv-stoney-aco-fails.txt b/src/amd/ci/radv-stoney-fails.txt similarity index 100% rename from src/amd/ci/radv-stoney-aco-fails.txt rename to src/amd/ci/radv-stoney-fails.txt diff --git a/src/amd/ci/radv-stoney-aco-flakes.txt b/src/amd/ci/radv-stoney-flakes.txt similarity index 100% rename from src/amd/ci/radv-stoney-aco-flakes.txt rename to src/amd/ci/radv-stoney-flakes.txt diff --git a/src/amd/ci/radv-stoney-aco-skips.txt b/src/amd/ci/radv-stoney-skips.txt similarity index 100% rename from src/amd/ci/radv-stoney-aco-skips.txt rename to src/amd/ci/radv-stoney-skips.txt diff --git a/src/amd/ci/radv-tahiti-aco-fails.txt b/src/amd/ci/radv-tahiti-fails.txt similarity index 100% rename from src/amd/ci/radv-tahiti-aco-fails.txt rename to src/amd/ci/radv-tahiti-fails.txt diff --git a/src/amd/ci/radv-tahiti-aco-flakes.txt b/src/amd/ci/radv-tahiti-flakes.txt similarity index 100% rename from src/amd/ci/radv-tahiti-aco-flakes.txt rename to src/amd/ci/radv-tahiti-flakes.txt diff --git a/src/amd/ci/radv-vangogh-aco-fails.txt b/src/amd/ci/radv-vangogh-fails.txt similarity index 100% rename from src/amd/ci/radv-vangogh-aco-fails.txt rename to src/amd/ci/radv-vangogh-fails.txt diff --git a/src/amd/ci/radv-vangogh-aco-flakes.txt b/src/amd/ci/radv-vangogh-flakes.txt similarity index 100% rename from src/amd/ci/radv-vangogh-aco-flakes.txt rename to src/amd/ci/radv-vangogh-flakes.txt diff --git a/src/amd/ci/radv-vega10-aco-fails.txt b/src/amd/ci/radv-vega10-fails.txt similarity index 100% rename from src/amd/ci/radv-vega10-aco-fails.txt rename to src/amd/ci/radv-vega10-fails.txt diff --git a/src/amd/ci/radv-vega10-aco-flakes.txt b/src/amd/ci/radv-vega10-flakes.txt similarity index 100% rename from src/amd/ci/radv-vega10-aco-flakes.txt rename to src/amd/ci/radv-vega10-flakes.txt