[llvm-commits] [llvm] r78003 - in /llvm/trunk: include/llvm/CodeGen/Dump.h include/llvm/CodeGen/LiveIntervalAnalysis.h include/llvm/CodeGen/MachineBasicBlock.h include/llvm/CodeGen/MachineFunction.h lib/CodeGen/Dump.cpp lib/CodeGen/LiveIntervalAnalysis.cpp lib/CodeGen/MachineBasicBlock.cpp lib/CodeGen/MachineFunction.cpp
David Greene
greened at obbligato.org
Mon Aug 3 14:55:09 PDT 2009
Author: greened
Date: Mon Aug 3 16:55:09 2009
New Revision: 78003
URL: http://llvm.org/viewvc/llvm-project?rev=78003&view=rev
Log:
Re-apply LiveInterval index dumping patch, with fixes suggested by Bill
and others.
Added:
llvm/trunk/include/llvm/CodeGen/Dump.h
llvm/trunk/lib/CodeGen/Dump.cpp
Modified:
llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
llvm/trunk/include/llvm/CodeGen/MachineFunction.h
llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp
llvm/trunk/lib/CodeGen/MachineFunction.cpp
Added: llvm/trunk/include/llvm/CodeGen/Dump.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/Dump.h?rev=78003&view=auto
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/Dump.h (added)
+++ llvm/trunk/include/llvm/CodeGen/Dump.h Mon Aug 3 16:55:09 2009
@@ -0,0 +1,60 @@
+//===- llvm/Support/Dump.h - Easy way to tailor dump output -----*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the PrefixPrinter interface to pass to MachineFunction
+// and MachineBasicBlock print methods to output additional information before
+// blocks and instructions are printed.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CODEGEN_DUMP_H
+#define LLVM_CODEGEN_DUMP_H
+
+#include <iosfwd>
+
+namespace llvm {
+
+class MachineBasicBlock;
+class MachineInstr;
+class raw_ostream;
+
+/// PrefixPrinter - Print some additional information before printing
+/// basic blocks and instructions.
+class PrefixPrinter {
+public:
+ virtual ~PrefixPrinter();
+
+ /// operator() - Print a prefix before each MachineBasicBlock
+ virtual raw_ostream &operator()(raw_ostream &out,
+ const MachineBasicBlock &) const {
+ return out;
+ }
+
+ /// operator() - Print a prefix before each MachineInstr
+ virtual raw_ostream &operator()(raw_ostream &out,
+ const MachineInstr &) const {
+ return out;
+ }
+
+ /// operator() - Print a prefix before each MachineBasicBlock
+ virtual std::ostream &operator()(std::ostream &out,
+ const MachineBasicBlock &) const {
+ return out;
+ }
+
+ /// operator() - Print a prefix before each MachineInstr
+ virtual std::ostream &operator()(std::ostream &out,
+ const MachineInstr &) const {
+ return out;
+ }
+};
+
+} // End llvm namespace
+
+#endif
Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=78003&r1=78002&r2=78003&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Mon Aug 3 16:55:09 2009
@@ -538,6 +538,37 @@
void printRegName(unsigned reg) const;
};
+ /// IntervalPrefixPrinter - Print live interval indices before each
+ /// instruction.
+ class IntervalPrefixPrinter : public PrefixPrinter {
+ private:
+ const LiveIntervals &liinfo;
+
+ public:
+ IntervalPrefixPrinter(const LiveIntervals &lii)
+ : liinfo(lii) {};
+
+ // We need null implementations of the other virtual functions to
+ // avoid warnings about hidden virtual functions.
+
+ raw_ostream &operator()(raw_ostream &out,
+ const MachineBasicBlock &instr) const {
+ return out;
+ }
+
+ raw_ostream &operator()(raw_ostream &out,
+ const MachineInstr &instr) const;
+
+ std::ostream &operator()(std::ostream &out,
+ const MachineBasicBlock &instr) const {
+ return out;
+ }
+
+ std::ostream &operator()(std::ostream &out,
+ const MachineInstr &instr) const {
+ return out;
+ }
+ };
} // End llvm namespace
#endif
Modified: llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h?rev=78003&r1=78002&r2=78003&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h Mon Aug 3 16:55:09 2009
@@ -16,6 +16,7 @@
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/ADT/GraphTraits.h"
+#include "llvm/CodeGen/Dump.h"
namespace llvm {
@@ -310,10 +311,18 @@
// Debugging methods.
void dump() const;
- void print(std::ostream &OS) const;
- void print(std::ostream *OS) const { if (OS) print(*OS); }
- void print(raw_ostream &OS) const;
- void print(raw_ostream *OS) const { if (OS) print(*OS); }
+ void print(std::ostream &OS,
+ const PrefixPrinter &prefix = PrefixPrinter()) const;
+ void print(std::ostream *OS,
+ const PrefixPrinter &prefix = PrefixPrinter()) const {
+ if (OS) print(*OS, prefix);
+ }
+ void print(raw_ostream &OS,
+ const PrefixPrinter &prefix = PrefixPrinter()) const;
+ void print(raw_ostream *OS,
+ const PrefixPrinter &prefix = PrefixPrinter()) const {
+ if (OS) print(*OS, prefix);
+ }
/// getNumber - MachineBasicBlocks are uniquely numbered at the function
/// level, unless they're not in a MachineFunction yet, in which case this
Modified: llvm/trunk/include/llvm/CodeGen/MachineFunction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineFunction.h?rev=78003&r1=78002&r2=78003&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineFunction.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineFunction.h Mon Aug 3 16:55:09 2009
@@ -20,6 +20,7 @@
#include "llvm/ADT/ilist.h"
#include "llvm/Support/DebugLoc.h"
+#include "llvm/CodeGen/Dump.h"
#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/Recycler.h"
@@ -206,8 +207,12 @@
/// print - Print out the MachineFunction in a format suitable for debugging
/// to the specified stream.
///
- void print(std::ostream &OS) const;
- void print(std::ostream *OS) const { if (OS) print(*OS); }
+ void print(std::ostream &OS,
+ const PrefixPrinter &prefix = PrefixPrinter()) const;
+ void print(std::ostream *OS,
+ const PrefixPrinter &prefix = PrefixPrinter()) const {
+ if (OS) print(*OS, prefix);
+ }
/// viewCFG - This function is meant for use from the debugger. You can just
/// say 'call F->viewCFG()' and a ghostview window should pop up from the
Added: llvm/trunk/lib/CodeGen/Dump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/Dump.cpp?rev=78003&view=auto
==============================================================================
--- llvm/trunk/lib/CodeGen/Dump.cpp (added)
+++ llvm/trunk/lib/CodeGen/Dump.cpp Mon Aug 3 16:55:09 2009
@@ -0,0 +1,18 @@
+//===- lib/Support/Dump.h - Virtual function homes --------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the PrefixPrinter virtual function homes.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/CodeGen/Dump.h"
+
+using namespace llvm;
+
+PrefixPrinter::~PrefixPrinter() {}
Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=78003&r1=78002&r2=78003&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Mon Aug 3 16:55:09 2009
@@ -2501,3 +2501,9 @@
return LR;
}
+
+raw_ostream &
+IntervalPrefixPrinter::operator()(raw_ostream &out,
+ const MachineInstr &instr) const {
+ return out << liinfo.getInstructionIndex(&instr);
+}
Modified: llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp?rev=78003&r1=78002&r2=78003&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp Mon Aug 3 16:55:09 2009
@@ -153,12 +153,14 @@
os << " %reg" << RegNo;
}
-void MachineBasicBlock::print(std::ostream &OS) const {
+void MachineBasicBlock::print(std::ostream &OS,
+ const PrefixPrinter &prefix) const {
raw_os_ostream RawOS(OS);
- print(RawOS);
+ print(RawOS, prefix);
}
-void MachineBasicBlock::print(raw_ostream &OS) const {
+void MachineBasicBlock::print(raw_ostream &OS,
+ const PrefixPrinter &prefix) const {
const MachineFunction *MF = getParent();
if(!MF) {
OS << "Can't print out MachineBasicBlock because parent MachineFunction"
@@ -191,7 +193,7 @@
}
for (const_iterator I = begin(); I != end(); ++I) {
- OS << "\t";
+ prefix(OS, *I) << "\t";
I->print(OS, &getParent()->getTarget());
}
Modified: llvm/trunk/lib/CodeGen/MachineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineFunction.cpp?rev=78003&r1=78002&r2=78003&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineFunction.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineFunction.cpp Mon Aug 3 16:55:09 2009
@@ -218,7 +218,8 @@
print(*cerr.stream());
}
-void MachineFunction::print(std::ostream &OS) const {
+void MachineFunction::print(std::ostream &OS,
+ const PrefixPrinter &prefix) const {
OS << "# Machine code for " << Fn->getNameStr () << "():\n";
// Print Frame Information
@@ -260,8 +261,10 @@
OS << "\n";
}
- for (const_iterator BB = begin(); BB != end(); ++BB)
- BB->print(OS);
+ for (const_iterator BB = begin(); BB != end(); ++BB) {
+ prefix(OS, *BB);
+ BB->print(OS, prefix);
+ }
OS << "\n# End machine code for " << Fn->getNameStr () << "().\n\n";
}
More information about the llvm-commits
mailing list