Mesa (master): gallivm: always enable LLVMAddInstructionCombiningPass()

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Oct 25 18:42:03 2010 +0100

gallivm: always enable LLVMAddInstructionCombiningPass()

---

 src/gallium/auxiliary/gallivm/lp_bld_init.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
index 5598ca5..0b9a6f7 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
@@ -145,13 +145,7 @@ lp_build_init(void)
          LLVMAddCFGSimplificationPass(lp_build_pass);
          LLVMAddPromoteMemoryToRegisterPass(lp_build_pass);
          LLVMAddConstantPropagationPass(lp_build_pass);
-         if(util_cpu_caps.has_sse4_1) {
-            /* FIXME: There is a bug in this pass, whereby the combination of fptosi
-             * and sitofp (necessary for trunc/floor/ceil/round implementation)
-             * somehow becomes invalid code.
-             */
-            LLVMAddInstructionCombiningPass(lp_build_pass);
-         }
+         LLVMAddInstructionCombiningPass(lp_build_pass);
          LLVMAddGVNPass(lp_build_pass);
       } else {
          /* We need at least this pass to prevent the backends to fail in