From 8a6dd7af7fffdad5f8489cbccedbe33be633d154 Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <michael.lam.sk@gmail.com>
Date: Tue, 5 Nov 2013 16:58:20 -0600
Subject: [PATCH] fix loop-vectorize for llvm-3.3

---
 example/vector_instr.py            |  3 ++-
 llvm/passes.py                     | 32 ++++++++++++++++++++++++++----
 llvm/target.py                     |  4 ++++
 llvmpy/src/Target/TargetMachine.py |  3 +++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/example/vector_instr.py b/example/vector_instr.py
index b326ad3..e49d06a 100644
--- a/example/vector_instr.py
+++ b/example/vector_instr.py
@@ -64,7 +64,8 @@ def build_manual_vector():
 
 def build_auto_vector():
     mod = lc.Module.new('auto.vector')
-    intty = lc.Type.int(32)
+    # Loop vectorize is sensitive to the size of the index size(!?)
+    intty = lc.Type.int(tuple.__itemsize__ * 8)
     aryty = lc.Type.pointer(lc.Type.float())
     fnty = lc.Type.function(lc.Type.void(), [aryty, aryty, aryty, intty])
     fn = mod.add_function(fnty, name='vector_add')
diff --git a/llvm/passes.py b/llvm/passes.py
index 570d549..e7a8924 100644
--- a/llvm/passes.py
+++ b/llvm/passes.py
@@ -80,6 +80,15 @@ class PassManagerBuilder(llvm.Wrapper):
             self._ptr.BBVectorize = enable
 
         vectorize = bbvectorize
+
+        @property
+        def slpvectorize(self):
+            return self._ptr.SLPVectorize
+
+        @slpvectorize.setter
+        def slpvectorize(self, enable):
+            self._ptr.SLPVectorize = enable
+
     else:
         @property
         def vectorize(self):
@@ -311,8 +320,9 @@ class TargetTransformInfo(Pass):
 # Helpers
 #===----------------------------------------------------------------------===
 
-def build_pass_managers(tm, opt=2, loop_vectorize=False, vectorize=False,
-                        inline_threshold=2000, pm=True, fpm=True, mod=None):
+def build_pass_managers(tm, opt=2, loop_vectorize=False, slp_vectorize=False,
+                        vectorize=False, inline_threshold=None,
+                        pm=True, fpm=True, mod=None):
     '''
         tm --- The TargetMachine for which the passes are optimizing for.
         The TargetMachine must stay alive until the pass managers
@@ -326,6 +336,14 @@ def build_pass_managers(tm, opt=2, loop_vectorize=False, vectorize=False,
         fpm --- [boolean] Whether to build a function-level pass-manager.
         mod --- [Module] The module object for the FunctionPassManager.
         '''
+    if inline_threshold is None:
+        if opt == 1:
+            inline_threshold = 75
+        elif opt == 2:
+            inline_threshold = 25
+        else:
+            inline_threshold = 275
+
     if pm:
         pm = PassManager.new()
     if fpm:
@@ -338,20 +356,26 @@ def build_pass_managers(tm, opt=2, loop_vectorize=False, vectorize=False,
     pmb.opt_level = opt
     pmb.vectorize = vectorize
     pmb.loop_vectorize = loop_vectorize
+    if llvm.version >= (3, 3):
+        pmb.slp_vectorize = slp_vectorize
     if inline_threshold:
         pmb.use_inliner_with_threshold(inline_threshold)
     if pm:
         pm.add(tm.target_data.clone())
         pm.add(TargetLibraryInfo.new(tm.triple))
-        if llvm.version >= (3, 2):
+        if llvm.version <= (3, 2):
             pm.add(TargetTransformInfo.new(tm))
+        else:
+            tm.add_analysis_passes(pm)
         pmb.populate(pm)
 
     if fpm:
         fpm.add(tm.target_data.clone())
         fpm.add(TargetLibraryInfo.new(tm.triple))
-        if llvm.version >= (3, 2):
+        if llvm.version <= (3, 2):
             fpm.add(TargetTransformInfo.new(tm))
+        else:
+            tm.add_analysis_passes(pm)
         pmb.populate(fpm)
         fpm.initialize()
 
diff --git a/llvm/target.py b/llvm/target.py
index e70fd1b..f68b023 100644
--- a/llvm/target.py
+++ b/llvm/target.py
@@ -191,6 +191,10 @@ class TargetMachine(llvm.Wrapper):
     def target(self):
         return self._ptr.getTarget()
 
+    if llvm.version >= (3, 3):
+        def add_analysis_passes(self, pm):
+            self._ptr.addAnalysisPasses(pm._ptr)
+
     if llvm.version >= (3, 4):
         @property
         def reg_info(self):
diff --git a/llvmpy/src/Target/TargetMachine.py b/llvmpy/src/Target/TargetMachine.py
index 492d603..1b52359 100644
--- a/llvmpy/src/Target/TargetMachine.py
+++ b/llvmpy/src/Target/TargetMachine.py
@@ -53,6 +53,9 @@ class TargetMachine:
         getVectorTargetTransformInfo = Method(const(
                                           ownedptr(VectorTargetTransformInfo)))
 
+    else:
+        addAnalysisPasses = Method(Void, ref(PassManagerBase))
+
     addPassesToEmitFile = Method(cast(bool, Bool),
                                  ref(PassManagerBase),
                                  ref(formatted_raw_ostream),