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 <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9974>
This commit is contained in:
Samuel Pitoiset 2021-04-01 14:35:23 +02:00 committed by Marge Bot
parent 11c1027730
commit 8fa7aa16ce
4 changed files with 7 additions and 8 deletions

View file

@ -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:

View file

@ -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

View file

@ -23,7 +23,7 @@
*/
#include "helpers.h"
#include "vulkan/vk_format.h"
#include "llvm/ac_llvm_util.h"
#include "common/amd_family.h"
#include <stdio.h>
#include <sstream>
#include <llvm-c/Target.h>
@ -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";

View file

@ -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";