From 89db355cc42e814acace276642162311bd0f8c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 11 Sep 2024 07:18:38 -0400 Subject: [PATCH] ac/llvm: use LLVM processor gfx942 for GFX940 when it's available Reviewed-by: Qiang Yu Part-of: --- src/amd/common/amd_family.c | 10 +++++++++- src/amd/common/meson.build | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/amd/common/amd_family.c b/src/amd/common/amd_family.c index 4de42c28d41..ce401119496 100644 --- a/src/amd/common/amd_family.c +++ b/src/amd/common/amd_family.c @@ -9,6 +9,10 @@ #include "util/macros.h" #include "ac_gpu_info.h" +#if AMD_LLVM_AVAILABLE +#include +#endif + const char *ac_get_family_name(enum radeon_family family) { switch (family) { @@ -208,7 +212,11 @@ const char *ac_get_llvm_processor_name(enum radeon_family family) case CHIP_MI200: return "gfx90a"; case CHIP_GFX940: - return "gfx940"; + return +#if AMD_LLVM_AVAILABLE + LLVM_VERSION_MAJOR >= 17 ? "gfx942" : +#endif + "gfx940"; case CHIP_NAVI10: return "gfx1010"; case CHIP_NAVI12: diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build index c8b17fb4341..a90b8e28bd3 100644 --- a/src/amd/common/meson.build +++ b/src/amd/common/meson.build @@ -126,7 +126,7 @@ libamd_common = static_library( include_directories : [ inc_include, inc_src, inc_amd, ], - dependencies : [ + dependencies : [dep_llvm.partial_dependency(compile_args: true, includes: true)] + [ dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind, idep_mesautil, idep_nir_headers, idep_nir ],