PORTREVISION=	1

commit 7372e3cf5f2d

Author: Dave Airlie <airlied@redhat.com>

Date:   Wed Mar 15 07:15:50 2017 +1000

    radv/ac: workaround regression in llvm 4.0 release

    LLVM 4.0 released with a pretty messy regression, that hopefully

    get fixed in the future.

    This work around was proposed by Tom, and it fixes the CTS regressions

    here at least, I'm not sure if this will cause any major side effects,

    but correctness over speed and all that.

    radeonsi should possibly consider the same workaround until an llvm

    fix can be found.

    Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

    Signed-off-by: Dave Airlie <airlied@redhat.com>

--- src/amd/common/ac_llvm_util.c.orig	2017-03-20 14:08:50 UTC

+++ src/amd/common/ac_llvm_util.c

@@ -26,7 +26,7 @@

 #include "ac_llvm_util.h"

 #include <llvm-c/Core.h>

-

+#include <llvm-c/Support.h>

 #include "c11/threads.h"

 #include <assert.h>

@@ -47,6 +47,17 @@ static void ac_init_llvm_target()

 	LLVMInitializeAMDGPUTarget();

 	LLVMInitializeAMDGPUTargetMC();

 	LLVMInitializeAMDGPUAsmPrinter();

+

+	/*

+	 * Workaround for bug in llvm 4.0 that causes image intrinsics

+	 * to disappear.

+	 * https://reviews.llvm.org/D26348

+	 */

+#if HAVE_LLVM >= 0x0400

+	const char *argv[2] = {"mesa", "-simplifycfg-sink-common=false"};

+	LLVMParseCommandLineOptions(2, argv, NULL);

+#endif

+

 #endif

 }