Merge pull request #214 from maleadt/vc/jlpasses

Add new Julia passes and the C-binding for dce!

Author: vchuravy

lib/libLLVM_extra.jl

@@ -168,6 +168,24 @@ function LLVMAddRemoveJuliaAddrspacesPass(PM)
 end
 end
 
+if VERSION >= v"1.6.0-DEV.1215"
+function LLVMAddDemoteFloat16Pass(PM)
+    ccall(:LLVMExtraAddDemoteFloat16Pass,Cvoid,(LLVMPassManagerRef,), PM)
+end
+end
+
+if VERSION >= v"1.6.0-DEV.1476"
+function LLVMAddRemoveNIPass(PM)
+    ccall(:LLVMExtraAddRemoveNIPass,Cvoid,(LLVMPassManagerRef,), PM)
+end
+end
+
+if VERSION >= v"1.6.0-DEV.1477"
+function LLVMAddJuliaLICMPass(PM)
+    ccall(:LLVMExtraJuliaLICMPass,Cvoid,(LLVMPassManagerRef,), PM)
+end
+end
+
 function LLVMGetValueContext(V)
     ccall(:LLVMExtraGetValueContext,LLVMContextRef,(LLVMValueRef,),V)
 end

lib/libLLVM_h.jl

@@ -4599,6 +4599,11 @@ function LLVMAddAggressiveDCEPass(PM)
     @runtime_ccall((:LLVMAddAggressiveDCEPass,libllvm[]), Cvoid, (LLVMPassManagerRef,), PM)
 end
 
+# added in LLVM10
+function LLVMAddDCEPass(PM)
+    @runtime_ccall((:LLVMAddDCEPass,libllvm[]), Cvoid, (LLVMPassManagerRef,), PM)
+end
+
 function LLVMAddBitTrackingDCEPass(PM)
     @runtime_ccall((:LLVMAddBitTrackingDCEPass,libllvm[]), Cvoid, (LLVMPassManagerRef,), PM)
 end

src/interop/passes.jl

@@ -1,6 +1,7 @@
 export alloc_opt!, barrier_noop!, gc_invariant_verifier!, lower_exc_handlers!,
        combine_mul_add!, multi_versioning!, propagate_julia_addrsp!, lower_ptls!,
-       lower_simdloop!, late_lower_gc_frame!, final_lower_gc!, remove_julia_addrspaces!
+       lower_simdloop!, late_lower_gc_frame!, final_lower_gc!, remove_julia_addrspaces!,
+       demote_float16!, remove_ni!, julia_licm!
 
 alloc_opt!(pm::PassManager) =
     API.LLVMAddAllocOptPass(pm)
@@ -44,3 +45,21 @@ if VERSION >= v"1.5.0-DEV.802"
 else
     remove_julia_addrspaces!(pm::PassManager) = nothing
 end
+
+if VERSION >= v"1.6.0-DEV.1215"
+    demote_float16!(pm::PassManager) = API.LLVMAddDemoteFloat16Pass(pm)
+else
+    demote_float16!(pm::PassManager) = nothing
+end
+
+if VERSION >= v"1.6.0-DEV.1476"
+    remove_ni!(pm::PassManager) = API.LLVMAddRemoveNIPass(pm)
+else
+    remove_ni!(pm::PassManager) = nothing # Could implement this in pure Julia if necessary
+end
+
+if VERSION >= v"1.6.0-DEV.1477"
+    julia_licm!(pm::PassManager) = API.LLVMAddJuliaLICMPass(pm)
+else
+    julia_licm!(pm::PassManager) = nothing
+end

src/transform.jl

@@ -101,14 +101,20 @@ define_transforms([
     :LowerExpectIntrinsic, :TypeBasedAliasAnalysis, :ScopedNoAliasAA, :BasicAliasAnalysis
 ])
 
-export scalar_repl_aggregates!, scalar_repl_aggregates_ssa!
+export scalar_repl_aggregates!, scalar_repl_aggregates_ssa!, dce!
 
 scalar_repl_aggregates!(pm::PassManager, threshold::Integer) =
     API.LLVMAddScalarReplAggregatesPassWithThreshold(pm, Cint(threshold))
 
 scalar_repl_aggregates_ssa!(pm::PassManager) =
     API.LLVMAddScalarReplAggregatesPassSSA(pm)
 
+if version() >= v"10.0"
+dce!(pm::PassManager) =
+    API.LLVMAddDCEPass(pm)
+else
+dce!(pm::PassManager) = nothing
+end
 
 ## vectorization transformations
 

test/interop.jl

@@ -116,6 +116,8 @@ Context() do ctx
 LLVM.Module("SomeModule", ctx) do mod
 ModulePassManager() do pm
 
+demote_float16!(pm)
+julia_licm!(pm)
 alloc_opt!(pm)
 barrier_noop!(pm)
 gc_invariant_verifier!(pm)
@@ -127,6 +129,7 @@ propagate_julia_addrsp!(pm)
 lower_ptls!(pm)
 lower_ptls!(pm, true)
 lower_simdloop!(pm)
+remove_ni!(pm)
 late_lower_gc_frame!(pm)
 final_lower_gc!(pm)
 

test/transform.jl

@@ -30,6 +30,7 @@ Context() do ctx
 LLVM.Module("SomeModule", ctx) do mod
 ModulePassManager() do pm
     aggressive_dce!(pm)
+    dce!(pm)
     bit_tracking_dce!(pm)
     alignment_from_assumptions!(pm)
     cfgsimplification!(pm)