Merge pull request #649 from sklam/misc/0.35.0rc3

Preparing 0.35.0rc3
numba · Nov 13, 2020 · 10a4928 · 10a4928
2 parents 5202760 + 9e87d1f
commit 10a4928
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/CHANGE_LOG b/CHANGE_LOG
@@ -21,6 +21,7 @@ Pull requests:
 * PR #641: fix llvmdev build number
 * PR #642: pin to correct version of llvmdev
 * PR #644: Fix refprune fanout_raise case getting stuck on large graphs
+* PR #647: Add support for general attrs on call and loop-rotate pass
 
 Authors:
 

diff --git a/ffi/passmanagers.cpp b/ffi/passmanagers.cpp
@@ -161,4 +161,10 @@ LLVMPY_AddBasicAliasAnalysisPass(LLVMPassManagerRef PM)
     LLVMAddBasicAliasAnalysisPass(PM);
 }
 
+API_EXPORT(void)
+LLVMPY_LLVMAddLoopRotatePass(LLVMPassManagerRef PM)
+{
+    LLVMAddLoopRotatePass(PM);
+}
+
 } // end extern "C"
diff --git a/llvmlite/binding/passmanagers.py b/llvmlite/binding/passmanagers.py
@@ -141,6 +141,10 @@ def add_basic_alias_analysis_pass(self):
         """See http://llvm.org/docs/AliasAnalysis.html#the-basicaa-pass."""
         ffi.lib.LLVMPY_AddBasicAliasAnalysisPass(self)
 
+    def add_loop_rotate_pass(self):
+        """http://llvm.org/docs/Passes.html#loop-rotate-rotate-loops."""
+        ffi.lib.LLVMPY_LLVMAddLoopRotatePass(self)
+
     # Non-standard LLVM passes
 
     def add_refprune_pass(self, subpasses_flags=RefPruneSubpasses.ALL,

diff --git a/llvmlite/ir/builder.py b/llvmlite/ir/builder.py
@@ -851,13 +851,15 @@ def resume(self, landingpad):
 
     # Call APIs
 
-    def call(self, fn, args, name='', cconv=None, tail=False, fastmath=()):
+    def call(self, fn, args, name='', cconv=None, tail=False, fastmath=(),
+             attrs=()):
         """
         Call function *fn* with *args*:
             name = fn(args...)
         """
         inst = instructions.CallInstr(self.block, fn, args, name=name,
-                                      cconv=cconv, tail=tail, fastmath=fastmath)
+                                      cconv=cconv, tail=tail, fastmath=fastmath,
+                                      attrs=attrs)
         self._insert(inst)
         return inst
 

diff --git a/llvmlite/ir/instructions.py b/llvmlite/ir/instructions.py
@@ -52,7 +52,8 @@ def __repr__(self):
 
 
 class CallInstrAttributes(AttributeSet):
-    _known = frozenset(['noreturn', 'nounwind', 'readonly', 'readnone'])
+    _known = frozenset(['noreturn', 'nounwind', 'readonly', 'readnone',
+                        'noinline', 'alwaysinline'])
 
 
 class FastMathFlags(AttributeSet):
@@ -62,13 +63,13 @@ class FastMathFlags(AttributeSet):
 
 class CallInstr(Instruction):
     def __init__(self, parent, func, args, name='', cconv=None, tail=False,
-                 fastmath=()):
+                 fastmath=(), attrs=()):
         self.cconv = (func.calling_convention
                       if cconv is None and isinstance(func, Function)
                       else cconv)
         self.tail = tail
         self.fastmath = FastMathFlags(fastmath)
-        self.attributes = CallInstrAttributes()
+        self.attributes = CallInstrAttributes(attrs)
 
         # Fix and validate arguments
         args = list(args)

diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py
@@ -1290,6 +1290,7 @@ def test_populate(self):
         pm.add_sroa_pass()
         pm.add_type_based_alias_analysis_pass()
         pm.add_basic_alias_analysis_pass()
+        pm.add_loop_rotate_pass()
 
 
 class TestDylib(BaseTest):

diff --git a/llvmlite/tests/test_ir.py b/llvmlite/tests/test_ir.py
@@ -1141,6 +1141,10 @@ def test_call(self):
         res_f_readonly.attributes.add('readonly')
         builder.call(f, (a, b), 'res_fast', fastmath='fast')
         builder.call(f, (a, b), 'res_nnan_ninf', fastmath=('nnan', 'ninf'))
+        builder.call(f, (a, b), 'res_noinline', attrs='noinline')
+        builder.call(f, (a, b), 'res_alwaysinline', attrs='alwaysinline')
+        builder.call(f, (a, b), 'res_noinline_ro', attrs=('noinline',
+                                                          'readonly'))
         self.check_block(block, """\
         my_block:
             %"res_f" = call float @"f"(i32 %".1", i32 %".2")
@@ -1150,7 +1154,10 @@ def test_call(self):
             %"res_f_readonly" = call float @"f"(i32 %".1", i32 %".2") readonly
             %"res_fast" = call fast float @"f"(i32 %".1", i32 %".2")
             %"res_nnan_ninf" = call ninf nnan float @"f"(i32 %".1", i32 %".2")
-        """)
+            %"res_noinline" = call float @"f"(i32 %".1", i32 %".2") noinline
+            %"res_alwaysinline" = call float @"f"(i32 %".1", i32 %".2") alwaysinline
+            %"res_noinline_ro" = call float @"f"(i32 %".1", i32 %".2") noinline readonly
+        """) # noqa E501
 
     def test_call_metadata(self):
         """