Mesa (main): ac: remove LLVM 4.0 workaround

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d58105fdd4cc50a3e447a0878d28e42787aa9cda
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d58105fdd4cc50a3e447a0878d28e42787aa9cda

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Mon Mar 28 11:17:58 2022 +0200

ac: remove LLVM 4.0 workaround

This was added to fix https://bugs.freedesktop.org/show_bug.cgi?id=97988 but
has been fixed in LLVM since.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15559>

---

 src/amd/llvm/ac_llvm_util.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c
index 9e1091dd9ba..9f215d8e0aa 100644
--- a/src/amd/llvm/ac_llvm_util.c
+++ b/src/amd/llvm/ac_llvm_util.c
@@ -53,16 +53,9 @@ static void ac_init_llvm_target(void)
    /* For ACO disassembly. */
    LLVMInitializeAMDGPUDisassembler();
 
-   /* Workaround for bug in llvm 4.0 that causes image intrinsics
-    * to disappear.
-    * https://reviews.llvm.org/D26348
-    *
-    * "mesa" is the prefix for error messages.
-    *
-    */
    const char *argv[] = {
+      /* error messages prefix */
       "mesa",
-      "-simplifycfg-sink-common=false",
       "-amdgpu-atomic-optimizations=true",
 #if LLVM_VERSION_MAJOR == 11
       /* This fixes variable indexing on LLVM 11. It also breaks atomic.cmpswap on LLVM >= 12. */