[llvm-commits] [llvm] r122073 - in /llvm/trunk: include/llvm/CodeGen/MachineLoopRanges.h lib/CodeGen/MachineLoopRanges.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Fri Dec 17 12:13:52 2010
New Revision: 122073

URL: http://llvm.org/viewvc/llvm-project?rev=122073&view=rev
Log:
Add MachineLoopRange comparators for sorting loop lists by number and by area.

Modified:
    llvm/trunk/include/llvm/CodeGen/MachineLoopRanges.h
    llvm/trunk/lib/CodeGen/MachineLoopRanges.cpp

Modified: llvm/trunk/include/llvm/CodeGen/MachineLoopRanges.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineLoopRanges.h?rev=122073&r1=122072&r2=122073&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineLoopRanges.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineLoopRanges.h Fri Dec 17 12:13:52 2010
@@ -42,6 +42,9 @@
   /// Bit 0 = inside loop block.
   Map Intervals;
 
+  /// Loop area as measured by SlotIndex::distance.
+  unsigned Area;
+
   /// Create a MachineLoopRange, only accessible to MachineLoopRanges.
   MachineLoopRange(const MachineLoop*, Allocator&, SlotIndexes&);
 
@@ -50,11 +53,27 @@
   /// inteructions.
   bool overlaps(SlotIndex Start, SlotIndex Stop);
 
+  /// getNumber - Return the loop number. This is the same as the number of the
+  /// header block.
+  unsigned getNumber() const;
+
+  /// getArea - Return the loop area. This number is approximately proportional
+  /// to the number of instructions in the loop.
+  unsigned getArea() const { return Area; }
+
   /// getMap - Allow public read-only access for IntervalMapOverlaps.
   const Map &getMap() { return Intervals; }
 
   /// print - Print loop ranges on OS.
   void print(raw_ostream&) const;
+
+  /// byNumber - Comparator for array_pod_sort that sorts a list of
+  /// MachineLoopRange pointers by number.
+  static int byNumber(const void*, const void*);
+
+  /// byAreaDesc - Comparator for array_pod_sort that sorts a list of
+  /// MachineLoopRange pointers by descending area, then by number.
+  static int byAreaDesc(const void*, const void*);
 };
 
 raw_ostream &operator<<(raw_ostream&, const MachineLoopRange&);

Modified: llvm/trunk/lib/CodeGen/MachineLoopRanges.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineLoopRanges.cpp?rev=122073&r1=122072&r2=122073&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineLoopRanges.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineLoopRanges.cpp Fri Dec 17 12:13:52 2010
@@ -57,12 +57,13 @@
 MachineLoopRange::MachineLoopRange(const MachineLoop *loop,
                                    MachineLoopRange::Allocator &alloc,
                                    SlotIndexes &Indexes)
-  : Loop(loop), Intervals(alloc) {
+  : Loop(loop), Intervals(alloc), Area(0) {
   // Compute loop coverage.
   for (MachineLoop::block_iterator I = Loop->block_begin(),
          E = Loop->block_end(); I != E; ++I) {
     const std::pair<SlotIndex, SlotIndex> &Range = Indexes.getMBBRange(*I);
     Intervals.insert(Range.first, Range.second, 1u);
+    Area += Range.first.distance(Range.second);
   }
 }
 
@@ -73,8 +74,38 @@
   return I.valid() && Stop > I.start();
 }
 
+unsigned MachineLoopRange::getNumber() const {
+  return Loop->getHeader()->getNumber();
+}
+
+/// byNumber - Comparator for array_pod_sort that sorts a list of
+/// MachineLoopRange pointers by number.
+int MachineLoopRange::byNumber(const void *pa, const void *pb) {
+  const MachineLoopRange *a = *static_cast<MachineLoopRange *const *>(pa);
+  const MachineLoopRange *b = *static_cast<MachineLoopRange *const *>(pb);
+  unsigned na = a->getNumber();
+  unsigned nb = b->getNumber();
+  if (na < nb)
+    return -1;
+  if (na > nb)
+    return 1;
+  return 0;
+}
+
+/// byAreaDesc - Comparator for array_pod_sort that sorts a list of
+/// MachineLoopRange pointers by:
+/// 1. Descending area.
+/// 2. Ascending number.
+int MachineLoopRange::byAreaDesc(const void *pa, const void *pb) {
+  const MachineLoopRange *a = *static_cast<MachineLoopRange *const *>(pa);
+  const MachineLoopRange *b = *static_cast<MachineLoopRange *const *>(pb);
+  if (a->getArea() != b->getArea())
+    return a->getArea() > b->getArea() ? -1 : 1;
+  return byNumber(pa, pb);
+}
+
 void MachineLoopRange::print(raw_ostream &OS) const {
-  OS << "Loop#" << Loop->getHeader()->getNumber() << " =";
+  OS << "Loop#" << getNumber() << " =";
   for (Map::const_iterator I = Intervals.begin(); I.valid(); ++I)
     OS << " [" << I.start() << ';' << I.stop() << ')';
 }