diff options
author | Chris Lattner <sabre@nondot.org> | 2008-08-23 22:23:09 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2008-08-23 22:23:09 +0000 |
commit | 944fac71e082cc2664cc71b4d3f6c72bab7143fb (patch) | |
tree | 819eb000a7e9c8270a44f821fdee01b904b97334 /lib/Support | |
parent | ef5dc366e713f5d596f3625344d4ec6c10159ad5 (diff) | |
download | llvm-944fac71e082cc2664cc71b4d3f6c72bab7143fb.tar.gz llvm-944fac71e082cc2664cc71b4d3f6c72bab7143fb.tar.bz2 llvm-944fac71e082cc2664cc71b4d3f6c72bab7143fb.tar.xz |
Switch the asmprinter (.ll) and all the stuff it requires over to
use raw_ostream instead of std::ostream. Among other goodness,
this speeds up llvm-dis of kc++ with a release build from 0.85s
to 0.49s (88% faster).
Other interesting changes:
1) This makes Value::print be non-virtual.
2) AP[S]Int and ConstantRange can no longer print to ostream directly,
use raw_ostream instead.
3) This fixes a bug in raw_os_ostream where it didn't flush itself
when destroyed.
4) This adds a new SDNode::print method, instead of only allowing "dump".
A lot of APIs have both std::ostream and raw_ostream versions, it would
be useful to go through and systematically anihilate the std::ostream
versions.
This passes dejagnu, but there may be minor fallout, plz let me know if
so and I'll fix it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55263 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
-rw-r--r-- | lib/Support/APInt.cpp | 9 | ||||
-rw-r--r-- | lib/Support/ConstantRange.cpp | 7 | ||||
-rw-r--r-- | lib/Support/raw_ostream.cpp | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/lib/Support/APInt.cpp b/lib/Support/APInt.cpp index f415313060..8f506bc720 100644 --- a/lib/Support/APInt.cpp +++ b/lib/Support/APInt.cpp @@ -18,6 +18,7 @@ #include "llvm/ADT/SmallString.h" #include "llvm/Support/Debug.h" #include "llvm/Support/MathExtras.h" +#include "llvm/Support/raw_ostream.h" #include <cmath> #include <limits> #include <cstring> @@ -41,8 +42,7 @@ inline static uint64_t* getMemory(uint32_t numWords) { return result; } -void APInt::initSlowCase(uint32_t numBits, uint64_t val, bool isSigned) -{ +void APInt::initSlowCase(uint32_t numBits, uint64_t val, bool isSigned) { pVal = getClearedMemory(getNumWords()); pVal[0] = val; if (isSigned && int64_t(val) < 0) @@ -51,7 +51,7 @@ void APInt::initSlowCase(uint32_t numBits, uint64_t val, bool isSigned) } APInt::APInt(uint32_t numBits, uint32_t numWords, const uint64_t bigVal[]) - : BitWidth(numBits), VAL(0) { + : BitWidth(numBits), VAL(0) { assert(BitWidth && "bitwidth too small"); assert(bigVal && "Null pointer detected!"); if (isSingleWord()) @@ -1995,13 +1995,12 @@ void APInt::dump() const { fprintf(stderr, "APInt(%db, %su %ss)", BitWidth, U.c_str(), S.c_str()); } -void APInt::print(std::ostream &OS, bool isSigned) const { +void APInt::print(raw_ostream &OS, bool isSigned) const { SmallString<40> S; this->toString(S, 10, isSigned); OS << S.c_str(); } - // This implements a variety of operations on a representation of // arbitrary precision, two's-complement, bignum integer values. diff --git a/lib/Support/ConstantRange.cpp b/lib/Support/ConstantRange.cpp index 9c83b7c59d..cb8c4b013c 100644 --- a/lib/Support/ConstantRange.cpp +++ b/lib/Support/ConstantRange.cpp @@ -22,8 +22,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/ConstantRange.h" -#include "llvm/Support/Streams.h" -#include <ostream> +#include "llvm/Support/raw_ostream.h" using namespace llvm; /// Initialize a full (the default) or empty set for the specified type. @@ -462,12 +461,12 @@ ConstantRange ConstantRange::truncate(uint32_t DstTySize) const { /// print - Print out the bounds to a stream... /// -void ConstantRange::print(std::ostream &OS) const { +void ConstantRange::print(raw_ostream &OS) const { OS << "[" << Lower << "," << Upper << ")"; } /// dump - Allow printing from a debugger easily... /// void ConstantRange::dump() const { - print(cerr); + print(errs()); } diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index 432e603194..9827ca776a 100644 --- a/lib/Support/raw_ostream.cpp +++ b/lib/Support/raw_ostream.cpp @@ -99,6 +99,12 @@ raw_ostream &raw_ostream::operator<<(long long N) { return this->operator<<(static_cast<unsigned long long>(N)); } +raw_ostream &raw_ostream::operator<<(const void *P) { + // FIXME: This could be much faster if it matters. + return *this << format("%p", P); +} + + raw_ostream &raw_ostream::write(const char *Ptr, unsigned Size) { if (OutBufCur+Size > OutBufEnd) flush_impl(); @@ -250,6 +256,10 @@ raw_ostream &llvm::errs() { // raw_os_ostream //===----------------------------------------------------------------------===// +raw_os_ostream::~raw_os_ostream() { + flush(); +} + /// flush_impl - The is the piece of the class that is implemented by /// subclasses. This outputs the currently buffered data and resets the /// buffer to empty. |