Run lower-switch after lower-invoke.
Only run lower-allocations and lower-select for the simple isel
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24881 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/Sparc/SparcTargetMachine.cpp b/lib/Target/Sparc/SparcTargetMachine.cpp
index 65e97aa..e0766d1 100644
--- a/lib/Target/Sparc/SparcTargetMachine.cpp
+++ b/lib/Target/Sparc/SparcTargetMachine.cpp
@@ -73,28 +73,25 @@
// FIXME: Implement efficient support for garbage collection intrinsics.
PM.add(createLowerGCPass());
- // Replace malloc and free instructions with library calls.
- PM.add(createLowerAllocationsPass());
-
- // FIXME: implement the switch instruction in the instruction selector.
- PM.add(createLowerSwitchPass());
+ // Make sure that no unreachable blocks are instruction selected.
+ PM.add(createUnreachableBlockEliminationPass());
// FIXME: implement the invoke/unwind instructions!
PM.add(createLowerInvokePass());
- // Make sure that no unreachable blocks are instruction selected.
- PM.add(createUnreachableBlockEliminationPass());
-
- // FIXME: implement the select instruction in the instruction selector.
- PM.add(createLowerSelectPass());
+ // FIXME: implement the switch instruction in the instruction selector.
+ PM.add(createLowerSwitchPass());
// Print LLVM code input to instruction selector:
if (PrintMachineCode)
PM.add(new PrintFunctionPass());
- if (DisableV8DAGDAG)
+ if (DisableV8DAGDAG) {
+ // Replace malloc and free instructions with library calls.
+ PM.add(createLowerAllocationsPass());
+ PM.add(createLowerSelectPass());
PM.add(createSparcV8SimpleInstructionSelector(*this));
- else
+ } else
PM.add(createSparcV8ISelDag(*this));
// Print machine instructions as they were initially generated.
@@ -110,6 +107,7 @@
PM.add(createMachineFunctionPrinterPass(&std::cerr));
PM.add(createSparcV8FPMoverPass(*this));
+
PM.add(createSparcV8DelaySlotFillerPass(*this));
// Print machine instructions after filling delay slots.