From 5eda8e5fe9038bf5ebf2bc203e62e4a2c54e609d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 13 Sep 2021 15:41:39 +0200 Subject: [PATCH] radv/llvm: fix using Wave32 The Wave32 pass manager has been removed a while ago. Fixes: 94a1f45e15a ("ac/llvm: set target features per function instead of per target machine") Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_llvm_helper.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_llvm_helper.cpp b/src/amd/vulkan/radv_llvm_helper.cpp index 1e0708170d5..d18a227f8d6 100644 --- a/src/amd/vulkan/radv_llvm_helper.cpp +++ b/src/amd/vulkan/radv_llvm_helper.cpp @@ -28,8 +28,7 @@ class radv_llvm_per_thread_info { public: radv_llvm_per_thread_info(enum radeon_family arg_family, enum ac_target_machine_options arg_tm_options, unsigned arg_wave_size) - : family(arg_family), tm_options(arg_tm_options), wave_size(arg_wave_size), passes(NULL), - passes_wave32(NULL) + : family(arg_family), tm_options(arg_tm_options), wave_size(arg_wave_size), passes(NULL) { } @@ -52,8 +51,7 @@ class radv_llvm_per_thread_info { bool compile_to_memory_buffer(LLVMModuleRef module, char **pelf_buffer, size_t *pelf_size) { - struct ac_compiler_passes *p = wave_size == 32 ? passes_wave32 : passes; - return ac_compile_module_to_elf(p, module, pelf_buffer, pelf_size); + return ac_compile_module_to_elf(passes, module, pelf_buffer, pelf_size); } bool is_same(enum radeon_family arg_family, enum ac_target_machine_options arg_tm_options, @@ -70,7 +68,6 @@ class radv_llvm_per_thread_info { enum ac_target_machine_options tm_options; unsigned wave_size; struct ac_compiler_passes *passes; - struct ac_compiler_passes *passes_wave32; }; /* we have to store a linked list per thread due to the possiblity of multiple gpus being required */