From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 29 Aug 2019 09:49:03 +0000 (+0200)
Subject: radv: remove radv_init_llvm_target() helper
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc3d36b5ddd7202c6b65111f58fce0e53690570f;p=mesa.git

radv: remove radv_init_llvm_target() helper

RADV no longer uses specific LLVM options compared to the common code.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 82858bc906a..e907c04863a 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -859,38 +859,6 @@ static void radv_postprocess_config(const struct radv_physical_device *pdevice,
 	}
 }
 
-static void radv_init_llvm_target()
-{
-	LLVMInitializeAMDGPUTargetInfo();
-	LLVMInitializeAMDGPUTarget();
-	LLVMInitializeAMDGPUTargetMC();
-	LLVMInitializeAMDGPUAsmPrinter();
-
-	/* For inline assembly. */
-	LLVMInitializeAMDGPUAsmParser();
-
-	/* Workaround for bug in llvm 4.0 that causes image intrinsics
-	 * to disappear.
-	 * https://reviews.llvm.org/D26348
-	 *
-	 * Workaround for bug in llvm that causes the GPU to hang in presence
-	 * of nested loops because there is an exec mask issue. The proper
-	 * solution is to fix LLVM but this might require a bunch of work.
-	 * https://bugs.llvm.org/show_bug.cgi?id=37744
-	 *
-	 * "mesa" is the prefix for error messages.
-	 */
-	const char *argv[2] = { "mesa", "-simplifycfg-sink-common=false" };
-	LLVMParseCommandLineOptions(2, argv, NULL);
-}
-
-static once_flag radv_init_llvm_target_once_flag = ONCE_FLAG_INIT;
-
-static void radv_init_llvm_once(void)
-{
-	call_once(&radv_init_llvm_target_once_flag, radv_init_llvm_target);
-}
-
 struct radv_shader_variant *
 radv_shader_variant_create(struct radv_device *device,
 			   const struct radv_shader_binary *binary,
@@ -1103,7 +1071,7 @@ shader_variant_compile(struct radv_device *device,
 		tm_options |= AC_TM_NO_LOAD_STORE_OPT;
 
 	thread_compiler = !(device->instance->debug_flags & RADV_DEBUG_NOTHREADLLVM);
-	radv_init_llvm_once();
+	ac_init_llvm_once();
 	radv_init_llvm_compiler(&ac_llvm,
 				thread_compiler,
 				chip_family, tm_options,