From 8fa7aa16ceb46d9ba5019ccb9fa9e33a378992d8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 1 Apr 2021 14:35:23 +0200 Subject: [PATCH] radv: change RADV_FORCE_FAMILY to use family name instead of LLVM processor name gfx1030 doesn't allow us to specify e.g. dimgrey. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- docs/envvars.rst | 3 +-- src/amd/ci/gitlab-ci.yml | 6 +++--- src/amd/compiler/tests/helpers.cpp | 4 ++-- src/amd/vulkan/winsys/null/radv_null_winsys.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/envvars.rst b/docs/envvars.rst index 0ddc04b5cfe..49b1e9fbbf1 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -621,8 +621,7 @@ RADV driver environment variables initialize all memory allocated in VRAM as zero ``RADV_FORCE_FAMILY`` - create a null device to compile shaders without a AMD GPU (e.g. - gfx900) + create a null device to compile shaders without a AMD GPU (e.g. vega10) ``RADV_PERFTEST`` a comma-separated list of named flags, which do various things: diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 2eebbcfb4ba..635368eb9b5 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -58,11 +58,11 @@ radv-fossils: - export RADV_FORCE_FAMILY="polaris10" - ./install/fossilize-runner.sh # Vega10 (GFX9) - - export RADV_FORCE_FAMILY="gfx900" + - export RADV_FORCE_FAMILY="vega10" - ./install/fossilize-runner.sh # Navi10 (GFX10) - - export RADV_FORCE_FAMILY="gfx1010" + - export RADV_FORCE_FAMILY="navi10" - ./install/fossilize-runner.sh # Sienna Cichlid (GFX10) - - export RADV_FORCE_FAMILY="gfx1030" + - export RADV_FORCE_FAMILY="sienna_cichlid" - ./install/fossilize-runner.sh diff --git a/src/amd/compiler/tests/helpers.cpp b/src/amd/compiler/tests/helpers.cpp index 0a83ee66663..6eb058ba131 100644 --- a/src/amd/compiler/tests/helpers.cpp +++ b/src/amd/compiler/tests/helpers.cpp @@ -23,7 +23,7 @@ */ #include "helpers.h" #include "vulkan/vk_format.h" -#include "llvm/ac_llvm_util.h" +#include "common/amd_family.h" #include #include #include @@ -261,7 +261,7 @@ VkDevice get_vk_device(enum radeon_family family) if (device_cache[family]) return device_cache[family]; - setenv("RADV_FORCE_FAMILY", ac_get_llvm_processor_name(family), 1); + setenv("RADV_FORCE_FAMILY", ac_get_family_name(family), 1); VkApplicationInfo app_info = {}; app_info.pApplicationName = "aco_tests"; diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.c b/src/amd/vulkan/winsys/null/radv_null_winsys.c index 433e8c85155..e6cd51681c9 100644 --- a/src/amd/vulkan/winsys/null/radv_null_winsys.c +++ b/src/amd/vulkan/winsys/null/radv_null_winsys.c @@ -80,7 +80,7 @@ static void radv_null_winsys_query_info(struct radeon_winsys *rws, info->family = CHIP_UNKNOWN; for (i = CHIP_TAHITI; i < CHIP_LAST; i++) { - if (!strcmp(family, ac_get_llvm_processor_name(i))) { + if (!strcmp(family, ac_get_family_name(i))) { /* Override family and chip_class. */ info->family = i; info->name = "OVERRIDDEN";