Merge pull request #255 from maleadt/tb/cfg_simplification_options

Add support for CFG simplification with options.

Author: maleadt

Manifest.toml

@@ -34,9 +34,9 @@ version = "1.3.0"
 
 [[LLVMExtra_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "99200ba262364a8502e5a0cca0057cf7c60901d7"
+git-tree-sha1 = "a9b1130c4728b0e462a1c28772954650039eb847"
 uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
-version = "0.0.4+0"
+version = "0.0.7+0"
 
 [[LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]

Project.toml

@@ -11,5 +11,5 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
 [compat]
 CEnum = "0.2, 0.3, 0.4"
-LLVMExtra_jll = "~0.0.6"
+LLVMExtra_jll = "~0.0.7"
 julia = "1.6"

deps/LLVMExtra/include/LLVMExtra.h

@@ -84,6 +84,18 @@ void LLVMExtraGetNamedMetadataOperands2(LLVMNamedMDNodeRef NMD, LLVMMetadataRef
 
 void LLVMExtraAddNamedMetadataOperand2(LLVMNamedMDNodeRef NMD, LLVMMetadataRef Val);
 
+#if LLVM_VERSION_MAJOR >= 12
+void LLVMAddCFGSimplificationPass2(LLVMPassManagerRef PM,
+                                   int BonusInstThreshold,
+                                   LLVMBool ForwardSwitchCondToPhi,
+                                   LLVMBool ConvertSwitchToLookupTable,
+                                   LLVMBool NeedCanonicalLoop,
+                                   LLVMBool HoistCommonInsts,
+                                   LLVMBool SinkCommonInsts,
+                                   LLVMBool SimplifyCondBranch,
+                                   LLVMBool FoldTwoEntryPHINode);
+#endif
+
 // Bug fixes
 void LLVMExtraSetInitializer(LLVMValueRef GlobalVar, LLVMValueRef ConstantVal);
 void LLVMExtraSetPersonalityFn(LLVMValueRef Fn, LLVMValueRef PersonalityFn);

deps/LLVMExtra/lib/llvm-api.cpp

@@ -278,6 +278,29 @@ char* LLVMExtraPrintMetadataToString(LLVMMetadataRef MD) {
   return strdup(buf.c_str());
 }
 
+#if LLVM_VERSION_MAJOR >= 12
+void LLVMAddCFGSimplificationPass2(LLVMPassManagerRef PM,
+                                   int BonusInstThreshold,
+                                   LLVMBool ForwardSwitchCondToPhi,
+                                   LLVMBool ConvertSwitchToLookupTable,
+                                   LLVMBool NeedCanonicalLoop,
+                                   LLVMBool HoistCommonInsts,
+                                   LLVMBool SinkCommonInsts,
+                                   LLVMBool SimplifyCondBranch,
+                                   LLVMBool FoldTwoEntryPHINode)
+{
+    auto simplifyCFGOptions = SimplifyCFGOptions().bonusInstThreshold(BonusInstThreshold)
+                                                  .forwardSwitchCondToPhi(ForwardSwitchCondToPhi)
+                                                  .convertSwitchToLookupTable(ConvertSwitchToLookupTable)
+                                                  .needCanonicalLoops(NeedCanonicalLoop)
+                                                  .hoistCommonInsts(HoistCommonInsts)
+                                                  .sinkCommonInsts(SinkCommonInsts)
+                                                  .setSimplifyCondBranch(SimplifyCondBranch)
+                                                  .setFoldTwoEntryPHINode(FoldTwoEntryPHINode);
+    unwrap(PM)->add(createCFGSimplificationPass(simplifyCFGOptions));
+}
+#endif
+
 // versions of API without MetadataAsValue
 
 const char *LLVMExtraGetMDString2(LLVMMetadataRef MD, unsigned *Length) {

lib/libLLVM_extra.jl

@@ -140,6 +140,16 @@ function LLVMExtraDIScopeGetName(Scope, Len)
     ccall((:LLVMExtraDIScopeGetName, libLLVMExtra), Cstring, (LLVMMetadataRef, Ptr{Cuint}), Scope, Len)
 end
 
+function LLVMAddCFGSimplificationPass2(PM, BonusInstThreshold, ForwardSwitchCondToPhi,
+                                       ConvertSwitchToLookupTable, NeedCanonicalLoop,
+                                       HoistCommonInsts, SinkCommonInsts,
+                                       SimplifyCondBranch, FoldTwoEntryPHINode)
+    ccall((:LLVMAddCFGSimplificationPass2, libLLVMExtra), Cvoid,
+          (LLVMPassManagerRef, Cint, LLVMBool, LLVMBool, LLVMBool, LLVMBool, LLVMBool, LLVMBool, LLVMBool),
+          PM, BonusInstThreshold, ForwardSwitchCondToPhi, ConvertSwitchToLookupTable, NeedCanonicalLoop,
+          HoistCommonInsts, SinkCommonInsts, SimplifyCondBranch, FoldTwoEntryPHINode)
+end
+
 # bug fixes
 
 # TODO: upstream

src/transform.jl

@@ -95,7 +95,7 @@ end
 ## scalar transformations
 
 define_transforms([
-    :AggressiveDCE, :BitTrackingDCE, :AlignmentFromAssumptions, :CFGSimplification,
+    :AggressiveDCE, :BitTrackingDCE, :AlignmentFromAssumptions,
     :DeadStoreElimination, :Scalarizer, :MergedLoadStoreMotion, :GVN, :IndVarSimplify,
     :InstructionCombining, :JumpThreading, :LICM, :LoopDeletion, :LoopIdiom, :LoopRotate,
     :LoopReroll, :LoopUnroll, :LoopUnswitch, :MemCpyOpt, :PartiallyInlineLibCalls,
@@ -105,7 +105,7 @@ define_transforms([
     :LowerExpectIntrinsic, :TypeBasedAliasAnalysis, :ScopedNoAliasAA, :BasicAliasAnalysis
 ])
 
-export scalar_repl_aggregates!, scalar_repl_aggregates_ssa!
+export scalar_repl_aggregates!, scalar_repl_aggregates_ssa!, cfgsimplification!
 
 scalar_repl_aggregates!(pm::PassManager, threshold::Integer) =
     API.LLVMAddScalarReplAggregatesPassWithThreshold(pm, Cint(threshold))
@@ -118,6 +118,27 @@ define_transforms([:DivRemPairs, :LoopDistribute, :LoopFuse, :LoopLoadEliminatio
 
 define_transforms([:InstructionSimplify])
 
+if version() >= v"12"
+    cfgsimplification!(pm::PassManager;
+                       bonus_inst_threshold=1,
+                       forward_switch_cond_to_phi=false,
+                       convert_switch_to_lookup_table=false,
+                       need_canonical_loop=true,
+                       hoist_common_insts=false,
+                       sink_common_insts=false,
+                       simplify_cond_branch=true,
+                       fold_two_entry_phi_node=true) =
+        API.LLVMAddCFGSimplificationPass2(pm, bonus_inst_threshold,
+                                          forward_switch_cond_to_phi,
+                                          convert_switch_to_lookup_table,
+                                          need_canonical_loop,
+                                          hoist_common_insts,
+                                          sink_common_insts,
+                                          simplify_cond_branch,
+                                          fold_two_entry_phi_node)
+else
+    define_transforms([:CFGSimplification])
+end
 
 ## vectorization transformations
 

test/transform.jl

@@ -34,6 +34,9 @@ ModulePassManager() do pm
     bit_tracking_dce!(pm)
     alignment_from_assumptions!(pm)
     cfgsimplification!(pm)
+    if LLVM.version() >= v"12"
+        cfgsimplification!(pm; hoist_common_insts=true)
+    end
     dead_store_elimination!(pm)
     scalarizer!(pm)
     merged_load_store_motion!(pm)