Re: [Mesa-dev] [PATCH] radv: drop the amdgpu-skip-threshold=1 workaround for LLVM 8

2018-12-20 Thread Bas Nieuwenhuizen
Reviewed-by: Bas Nieuwenhuizen 

On Wed, Dec 19, 2018, 6:13 PM Samuel Pitoiset  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 
> ---
>  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 2eb5164ac97..5c72890aa8e 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;
> --
> 2.20.1
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] radv: drop the amdgpu-skip-threshold=1 workaround for LLVM 8

2018-12-19 Thread Samuel Pitoiset
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 
---
 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 2eb5164ac97..5c72890aa8e 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;
-- 
2.20.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev