Merge pull request #272 from maleadt/tb/passes

maleadt · web-flow · commit 3817c60378c4 · 2021-11-19T14:35:03.000+01:00
Add a couple of missing passes.
diff --git a/Manifest.toml b/Manifest.toml
@@ -34,9 +34,9 @@ version = "1.3.0"
 
 [[LLVMExtra_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "6a2af408fe809c4f1a54d2b3f188fdd3698549d6"
+git-tree-sha1 = "9436f02a0c9f726d914cc6539f87850701be18fc"
 uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
-version = "0.0.11+0"
+version = "0.0.12+0"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
diff --git a/Project.toml b/Project.toml
@@ -11,5 +11,5 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
 [compat]
 CEnum = "0.2, 0.3, 0.4"
-LLVMExtra_jll = "~0.0.11"
+LLVMExtra_jll = "~0.0.12"
 julia = "1.6"
diff --git a/deps/LLVMExtra/include/LLVMExtra.h b/deps/LLVMExtra/include/LLVMExtra.h
@@ -33,6 +33,9 @@ void LLVMAddLoopFusePass(LLVMPassManagerRef PM);
 void LLVMAddLoopLoadEliminationPass(LLVMPassManagerRef PM);
 void LLVMAddLoadStoreVectorizerPass(LLVMPassManagerRef PM);
 void LLVMAddVectorCombinePass(LLVMPassManagerRef PM);
+void LLVMAddSpeculativeExecutionIfHasBranchDivergencePass(LLVMPassManagerRef PM);
+void LLVMAddSimpleLoopUnrollPass(LLVMPassManagerRef PM);
+void LLVMAddInductiveRangeCheckEliminationPass(LLVMPassManagerRef PM);
 
 #if LLVM_VERSION_MAJOR < 12
 void LLVMAddInstructionSimplifyPass(LLVMPassManagerRef PM);
diff --git a/deps/LLVMExtra/lib/llvm-api.cpp b/deps/LLVMExtra/lib/llvm-api.cpp
@@ -116,6 +116,21 @@ void LLVMAddVectorCombinePass(LLVMPassManagerRef PM)
     unwrap(PM)->add(createVectorCombinePass());
 }
 
+void LLVMAddSpeculativeExecutionIfHasBranchDivergencePass(LLVMPassManagerRef PM)
+{
+    unwrap(PM)->add(createSpeculativeExecutionIfHasBranchDivergencePass());
+}
+
+void LLVMAddSimpleLoopUnrollPass(LLVMPassManagerRef PM)
+{
+    unwrap(PM)->add(createSimpleLoopUnrollPass());
+}
+
+void LLVMAddInductiveRangeCheckEliminationPass(LLVMPassManagerRef PM)
+{
+    unwrap(PM)->add(createInductiveRangeCheckEliminationPass());
+}
+
 #if LLVM_VERSION_MAJOR < 12
 void LLVMAddInstructionSimplifyPass(LLVMPassManagerRef PM)
 {
diff --git a/lib/libLLVM_extra.jl b/lib/libLLVM_extra.jl
@@ -75,6 +75,18 @@ function LLVMAddVectorCombinePass(PM)
     ccall((:LLVMAddVectorCombinePass, libLLVMExtra), Cvoid, (LLVMPassManagerRef,), PM)
 end
 
+function LLVMAddSpeculativeExecutionIfHasBranchDivergencePass(PM)
+    ccall((:LLVMAddSpeculativeExecutionIfHasBranchDivergencePass, libLLVMExtra), Cvoid, (LLVMPassManagerRef,), PM)
+end
+
+function LLVMAddSimpleLoopUnrollPass(PM)
+    ccall((:LLVMAddSimpleLoopUnrollPass, libLLVMExtra), Cvoid, (LLVMPassManagerRef,), PM)
+end
+
+function LLVMAddInductiveRangeCheckEliminationPass(PM)
+    ccall((:LLVMAddInductiveRangeCheckEliminationPass, libLLVMExtra), Cvoid, (LLVMPassManagerRef,), PM)
+end
+
 if version() < v"12"
 function LLVMAddInstructionSimplifyPass(PM)
     ccall((:LLVMAddInstructionSimplifyPass, libLLVMExtra), Cvoid, (LLVMPassManagerRef,), PM)
diff --git a/src/transform.jl b/src/transform.jl
@@ -103,7 +103,8 @@ define_transforms([
     :SimplifyLibCalls, :TailCallElimination, :ConstantPropagation, :DemoteMemoryToRegister,
     :Verifier, :CorrelatedValuePropagation, :EarlyCSE, :EarlyCSEMemSSA,
     :LowerExpectIntrinsic, :TypeBasedAliasAnalysis, :ScopedNoAliasAA, :BasicAliasAnalysis,
-    :MergeFunctions
+    :MergeFunctions, :SpeculativeExecutionIfHasBranchDivergence, :SimpleLoopUnroll,
+    :InductiveRangeCheckElimination
 ])
 
 export scalar_repl_aggregates!, scalar_repl_aggregates_ssa!, cfgsimplification!
diff --git a/test/transform.jl b/test/transform.jl
@@ -84,6 +84,9 @@ ModulePassManager() do pm
     loop_vectorize!(pm)
     slpvectorize!(pm)
     load_store_vectorizer!(pm)
+    speculative_execution_if_has_branch_divergence!(pm)
+    simple_loop_unroll!(pm)
+    inductive_range_check_elimination!(pm)
 
     argument_promotion!(pm)
     constant_merge!(pm)
