[llvm-branch-commits] [llvm-branch] r85151 - in /llvm/branches/Apple/Leela/lib/CodeGen: AggressiveAntiDepBreaker.cpp AggressiveAntiDepBreaker.h CMakeLists.txt PostRASchedulerList.cpp

[Bill Wendling]

Author: void
Date: Mon Oct 26 15:34:26 2009
New Revision: 85151

URL: http://llvm.org/viewvc/llvm-project?rev=85151&view=rev
Log:
$ svn merge -c 85145 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85145 into '.':
A    lib/CodeGen/AggressiveAntiDepBreaker.cpp
U    lib/CodeGen/PostRASchedulerList.cpp
U    lib/CodeGen/CMakeLists.txt
A    lib/CodeGen/AggressiveAntiDepBreaker.h


Added:
    llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.cpp
      - copied unchanged from r85145, llvm/trunk/lib/CodeGen/AggressiveAntiDepBreaker.cpp
    llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.h
      - copied unchanged from r85145, llvm/trunk/lib/CodeGen/AggressiveAntiDepBreaker.h
Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/CMakeLists.txt
    llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/CMakeLists.txt?rev=85151&r1=85150&r2=85151&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/CMakeLists.txt (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/CMakeLists.txt Mon Oct 26 15:34:26 2009
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMCodeGen
+  AggressiveAntiDepBreaker.cpp
   BranchFolding.cpp
   CodePlacementOpt.cpp
   CriticalAntiDepBreaker.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp?rev=85151&r1=85150&r2=85151&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp Mon Oct 26 15:34:26 2009
@@ -19,6 +19,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "post-RA-sched"
+#include "AggressiveAntiDepBreaker.h"
 #include "CriticalAntiDepBreaker.h"
 #include "ExactHazardRecognizer.h"
 #include "SimpleHazardRecognizer.h"
@@ -240,9 +241,10 @@
     (ScheduleHazardRecognizer *)new ExactHazardRecognizer(InstrItins) :
     (ScheduleHazardRecognizer *)new SimpleHazardRecognizer();
   AntiDepBreaker *ADB = 
-    (AntiDepMode == TargetSubtarget::ANTIDEP_ALL) ? NULL /* FIXME */ :
-    (AntiDepMode == TargetSubtarget::ANTIDEP_CRITICAL) ? 
-    new CriticalAntiDepBreaker(Fn) : NULL;
+    ((AntiDepMode == TargetSubtarget::ANTIDEP_ALL) ?
+     (AntiDepBreaker *)new AggressiveAntiDepBreaker(Fn) :
+     ((AntiDepMode == TargetSubtarget::ANTIDEP_CRITICAL) ? 
+      (AntiDepBreaker *)new CriticalAntiDepBreaker(Fn) : NULL));
 
   SchedulePostRATDList Scheduler(Fn, MLI, MDT, HR, ADB, AA);