RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-12 06:06:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid creating a temporary string when reading the symbol table for a

Browse Source 
module.  This speeds up the bcreader 11%.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34198 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-02-12 18:53:43 +00:00
parent 042ad36871
commit dd8cec59fc
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Bytecode/BytecodeHandler.h
View File

@ -175,7 +175,7 @@ public:
virtual void handleSymbolTableValue( virtual void handleSymbolTableValue(
unsigned i, ///< The index of the value in this plane unsigned i, ///< The index of the value in this plane
unsigned slot, ///< Slot number of the named value unsigned slot, ///< Slot number of the named value
const std::string& name ///< Name of the value. const char *name, unsigned NameLen ///< Name of the value.
) {} ) {}
/// @brief Handle the end of a value symbol table /// @brief Handle the end of a value symbol table

4
lib/Bytecode/Reader/Analyzer.cpp
View File

@ -250,10 +250,10 @@ public:
} }
virtual void handleSymbolTableValue(unsigned TySlot, unsigned ValSlot, virtual void handleSymbolTableValue(unsigned TySlot, unsigned ValSlot,
const std::string& name) { const char *Name, unsigned NameLen) {
if (os) if (os)
*os << " Value " << TySlot << " Slot=" << ValSlot *os << " Value " << TySlot << " Slot=" << ValSlot
<< " Name: " << name << "\n"; << " Name: " << std::string(Name, Name+NameLen) << "\n";
if (ValSlot > bca.maxValueSlot) if (ValSlot > bca.maxValueSlot)
bca.maxValueSlot = ValSlot; bca.maxValueSlot = ValSlot;
} }

30
lib/Bytecode/Reader/Reader.cpp
View File

@ -132,6 +132,17 @@ inline std::string BytecodeReader::read_str() {
return std::string((char*)OldAt, Size); return std::string((char*)OldAt, Size);
} }
void BytecodeReader::read_str(SmallVectorImpl<char> &StrData) {
StrData.clear();
unsigned Size = read_vbr_uint();
const unsigned char *OldAt = At;
At += Size;
if (At > BlockEnd) // Size invalid?
error("Ran out of data reading a string!");
StrData.append(OldAt, At);
}
/// Read an arbitrary block of data /// Read an arbitrary block of data
inline void BytecodeReader::read_data(void *Ptr, void *End) { inline void BytecodeReader::read_data(void *Ptr, void *End) {
unsigned char *Start = (unsigned char *)Ptr; unsigned char *Start = (unsigned char *)Ptr;
@ -943,6 +954,8 @@ void BytecodeReader::ParseValueSymbolTable(Function *CurrentFunction,
E = CurrentFunction->end(); I != E; ++I) E = CurrentFunction->end(); I != E; ++I)
BBMap.push_back(I); BBMap.push_back(I);
SmallVector<char, 32> NameStr;
while (moreInBlock()) { while (moreInBlock()) {
// Symtab block header: [num entries][type id number] // Symtab block header: [num entries][type id number]
unsigned NumEntries = read_vbr_uint(); unsigned NumEntries = read_vbr_uint();
@ -951,19 +964,22 @@ void BytecodeReader::ParseValueSymbolTable(Function *CurrentFunction,
for (unsigned i = 0; i != NumEntries; ++i) { for (unsigned i = 0; i != NumEntries; ++i) {
// Symtab entry: [def slot #][name] // Symtab entry: [def slot #][name]
unsigned slot = read_vbr_uint(); unsigned slot = read_vbr_uint();
std::string Name = read_str(); read_str(NameStr);
Value *V = 0; Value *V = 0;
if (Typ == LabelTySlot) { if (Typ == LabelTySlot) {
if (slot < BBMap.size()) V = (slot < BBMap.size()) ? BBMap[slot] : 0;
V = BBMap[slot];
} else { } else {
V = getValue(Typ, slot, false); // Find mapping... V = getValue(Typ, slot, false); // Find mapping.
} }
if (Handler) Handler->handleSymbolTableValue(Typ, slot, Name); if (Handler) Handler->handleSymbolTableValue(Typ, slot,
&NameStr[0], NameStr.size());
if (V == 0) if (V == 0)
error("Failed value look-up for name '" + Name + "', type #" + error("Failed value look-up for name '" +
std::string(NameStr.begin(), NameStr.end()) + "', type #" +
utostr(Typ) + " slot #" + utostr(slot)); utostr(Typ) + " slot #" + utostr(slot));
V->setName(Name); V->setName(&NameStr[0], NameStr.size());
NameStr.clear();
} }
} }
checkPastBlockEnd("Symbol Table"); checkPastBlockEnd("Symbol Table");

1
lib/Bytecode/Reader/Reader.h
View File

@ -438,6 +438,7 @@ private:
/// @brief Read a string /// @brief Read a string
inline std::string read_str(); inline std::string read_str();
inline void read_str(SmallVectorImpl<char> &StrData);
/// @brief Read a float value /// @brief Read a float value
inline void read_float(float& FloatVal); inline void read_float(float& FloatVal);