[llvm-commits] [llvm] r91834 - in /llvm/trunk: include/llvm/CodeGen/SDNodeOrdering.h lib/CodeGen/SelectionDAG/SDNodeOrdering.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp

[Bill Wendling]

Author: void
Date: Mon Dec 21 13:34:59 2009
New Revision: 91834

URL: http://llvm.org/viewvc/llvm-project?rev=91834&view=rev
Log:
Place SDNodeOrdering.h in the directory it's used.

Added:
    llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeOrdering.h
      - copied unchanged from r91830, llvm/trunk/include/llvm/CodeGen/SDNodeOrdering.h
Removed:
    llvm/trunk/include/llvm/CodeGen/SDNodeOrdering.h
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Removed: llvm/trunk/include/llvm/CodeGen/SDNodeOrdering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SDNodeOrdering.h?rev=91833&view=auto

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/SDNodeOrdering.h (original)
+++ llvm/trunk/include/llvm/CodeGen/SDNodeOrdering.h (removed)
@@ -1,57 +0,0 @@
-//===-- llvm/CodeGen/SDNodeOrdering.h - SDNode Ordering ---------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the SDNodeOrdering class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_SDNODEORDERING_H
-#define LLVM_CODEGEN_SDNODEORDERING_H
-
-#include "llvm/ADT/DenseMap.h"
-
-namespace llvm {
-
-class SDNode;
-
-/// SDNodeOrdering - Maps a unique (monotonically increasing) value to each
-/// SDNode that roughly corresponds to the ordering of the original LLVM
-/// instruction. This is used for turning off scheduling, because we'll forgo
-/// the normal scheduling algorithms and output the instructions according to
-/// this ordering.
-class SDNodeOrdering {
-  DenseMap<const SDNode*, unsigned> OrderMap;
-
-  void operator=(const SDNodeOrdering&);   // Do not implement.
-  SDNodeOrdering(const SDNodeOrdering&);   // Do not implement.
-public:
-  SDNodeOrdering() {}
-
-  void add(const SDNode *Node, unsigned O) {
-    assert(O && "Invalid ordering!");
-    OrderMap[Node] = O;
-  }
-  void remove(const SDNode *Node) {
-    DenseMap<const SDNode*, unsigned>::iterator Itr = OrderMap.find(Node);
-    if (Itr != OrderMap.end())
-      OrderMap.erase(Itr);
-  }
-  void clear() {
-    OrderMap.clear();
-  }
-  unsigned getOrder(const SDNode *Node) {
-    unsigned Order = OrderMap[Node];
-    assert(Order && "Node isn't in ordering map!");
-    return Order;
-  }
-};
-
-} // end llvm namespace
-
-#endif

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=91834&r1=91833&r2=91834&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Mon Dec 21 13:34:59 2009
@@ -10,7 +10,9 @@
 // This implements the SelectionDAG class.
 //
 //===----------------------------------------------------------------------===//
+
 #include "llvm/CodeGen/SelectionDAG.h"
+#include "SDNodeOrdering.h"
 #include "llvm/Constants.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/Function.h"
@@ -25,7 +27,6 @@
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/PseudoSourceValue.h"
-#include "llvm/CodeGen/SDNodeOrdering.h"
 #include "llvm/Target/TargetRegisterInfo.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetFrameInfo.h"