Mesa (master): radv: drop the amdgpu-skip-threshold=1 workaround for LLVM 8

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0a7e767e58699f070df38a491c97588cd253c881
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a7e767e58699f070df38a491c97588cd253c881

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Dec 19 18:16:00 2018 +0100

radv: drop the amdgpu-skip-threshold=1 workaround for LLVM 8

This workaround has been introduced by 135e4d434f6 for fixing
DXVK GPU hangs with many games. It is no longer needed since
LLVM r345718.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_shader.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 2eb5164ac9..5c72890aa8 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -548,9 +548,15 @@ static void radv_init_llvm_target()
 	 *
 	 * "mesa" is the prefix for error messages.
 	 */
-	const char *argv[3] = { "mesa", "-simplifycfg-sink-common=false",
-				"-amdgpu-skip-threshold=1" };
-	LLVMParseCommandLineOptions(3, argv, NULL);
+	if (HAVE_LLVM >= 0x0800) {
+		const char *argv[2] = { "mesa", "-simplifycfg-sink-common=false" };
+		LLVMParseCommandLineOptions(2, argv, NULL);
+
+	} else {
+		const char *argv[3] = { "mesa", "-simplifycfg-sink-common=false",
+					"-amdgpu-skip-threshold=1" };
+		LLVMParseCommandLineOptions(3, argv, NULL);
+	}
 }
 
 static once_flag radv_init_llvm_target_once_flag = ONCE_FLAG_INIT;