[llvm-branch-commits] [llvm-branch] r85417 - in /llvm/branches/Apple/Leela: include/llvm/CodeGen/AntiDepBreaker.h lib/CodeGen/AggressiveAntiDepBreaker.h lib/CodeGen/AntiDepBreaker.h lib/CodeGen/CriticalAntiDepBreaker.h lib/CodeGen/PostRASchedulerList.cpp

[Bill Wendling]

Author: void
Date: Wed Oct 28 13:44:17 2009
New Revision: 85417

URL: http://llvm.org/viewvc/llvm-project?rev=85417&view=rev
Log:
$ svn merge -c 85412 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85412 into '.':
D    include/llvm/CodeGen/AntiDepBreaker.h
U    lib/CodeGen/CriticalAntiDepBreaker.h
U    lib/CodeGen/PostRASchedulerList.cpp
A    lib/CodeGen/AntiDepBreaker.h
U    lib/CodeGen/AggressiveAntiDepBreaker.h


Added:
    llvm/branches/Apple/Leela/lib/CodeGen/AntiDepBreaker.h
      - copied unchanged from r85412, llvm/trunk/lib/CodeGen/AntiDepBreaker.h
Removed:
    llvm/branches/Apple/Leela/include/llvm/CodeGen/AntiDepBreaker.h
Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.h
    llvm/branches/Apple/Leela/lib/CodeGen/CriticalAntiDepBreaker.h
    llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp

Removed: llvm/branches/Apple/Leela/include/llvm/CodeGen/AntiDepBreaker.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/CodeGen/AntiDepBreaker.h?rev=85416&view=auto

==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/CodeGen/AntiDepBreaker.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/CodeGen/AntiDepBreaker.h (removed)
@@ -1,62 +0,0 @@
-//=- llvm/CodeGen/AntiDepBreaker.h - Anti-Dependence Breaking -*- C++ -*-=//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the AntiDepBreaker class, which implements
-// anti-dependence breaking heuristics for post-register-allocation scheduling.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_ANTIDEPBREAKER_H
-#define LLVM_CODEGEN_ANTIDEPBREAKER_H
-
-#include "llvm/CodeGen/MachineBasicBlock.h"
-#include "llvm/CodeGen/MachineFrameInfo.h"
-#include "llvm/CodeGen/MachineFunction.h"
-#include "llvm/CodeGen/MachineRegisterInfo.h"
-#include "llvm/CodeGen/ScheduleDAG.h"
-#include "llvm/Target/TargetRegisterInfo.h"
-
-namespace llvm {
-
-/// AntiDepBreaker - This class works into conjunction with the
-/// post-RA scheduler to rename registers to break register
-/// anti-dependencies.
-class AntiDepBreaker {
-public:
-  virtual ~AntiDepBreaker();
-
-  /// GetMaxTrials - Return the maximum number of anti-dependence
-  /// breaking attempts that will be made for a block.
-  virtual unsigned GetMaxTrials() =0;
-
-  /// Start - Initialize anti-dep breaking for a new basic block.
-  virtual void StartBlock(MachineBasicBlock *BB) =0;
-
-  /// BreakAntiDependencies - Identifiy anti-dependencies within a
-  /// basic-block region and break them by renaming registers. Return
-  /// the number of anti-dependencies broken.
-  ///
-  virtual unsigned BreakAntiDependencies(std::vector<SUnit>& SUnits,
-                                         MachineBasicBlock::iterator& Begin,
-                                         MachineBasicBlock::iterator& End,
-                                         unsigned InsertPosIndex) =0;
-  
-  /// Observe - Update liveness information to account for the current
-  /// instruction, which will not be scheduled.
-  ///
-  virtual void Observe(MachineInstr *MI, unsigned Count,
-                       unsigned InsertPosIndex) =0;
-  
-  /// Finish - Finish anti-dep breaking for a basic block.
-  virtual void FinishBlock() =0;
-};
-
-}
-
-#endif

Modified: llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.h?rev=85417&r1=85416&r2=85417&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.h (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AggressiveAntiDepBreaker.h Wed Oct 28 13:44:17 2009
@@ -17,7 +17,7 @@
 #ifndef LLVM_CODEGEN_AGGRESSIVEANTIDEPBREAKER_H
 #define LLVM_CODEGEN_AGGRESSIVEANTIDEPBREAKER_H
 
-#include "llvm/CodeGen/AntiDepBreaker.h"
+#include "AntiDepBreaker.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"

Modified: llvm/branches/Apple/Leela/lib/CodeGen/CriticalAntiDepBreaker.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/CriticalAntiDepBreaker.h?rev=85417&r1=85416&r2=85417&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/CriticalAntiDepBreaker.h (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/CriticalAntiDepBreaker.h Wed Oct 28 13:44:17 2009
@@ -16,7 +16,7 @@
 #ifndef LLVM_CODEGEN_CRITICALANTIDEPBREAKER_H
 #define LLVM_CODEGEN_CRITICALANTIDEPBREAKER_H
 
-#include "llvm/CodeGen/AntiDepBreaker.h"
+#include "AntiDepBreaker.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"

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=85417&r1=85416&r2=85417&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/PostRASchedulerList.cpp Wed Oct 28 13:44:17 2009
@@ -19,12 +19,12 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "post-RA-sched"
+#include "AntiDepBreaker.h"
 #include "AggressiveAntiDepBreaker.h"
 #include "CriticalAntiDepBreaker.h"
 #include "ExactHazardRecognizer.h"
 #include "SimpleHazardRecognizer.h"
 #include "ScheduleDAGInstrs.h"
-#include "llvm/CodeGen/AntiDepBreaker.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/LatencyPriorityQueue.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"