mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-25 00:29:20 +00:00
Do a topological sort of the types before writing them out.
This takes the linking of libxul on linux from 6m54.931s to 5m39.840s. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129009 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
714b34fc24
commit
f5a90561b0
@ -197,7 +197,7 @@ static void WriteTypeTable(const ValueEnumerator &VE, BitstreamWriter &Stream) {
|
|||||||
|
|
||||||
// Loop over all of the types, emitting each in turn.
|
// Loop over all of the types, emitting each in turn.
|
||||||
for (unsigned i = 0, e = TypeList.size(); i != e; ++i) {
|
for (unsigned i = 0, e = TypeList.size(); i != e; ++i) {
|
||||||
const Type *T = TypeList[i].first;
|
const Type *T = TypeList[i];
|
||||||
int AbbrevToUse = 0;
|
int AbbrevToUse = 0;
|
||||||
unsigned Code = 0;
|
unsigned Code = 0;
|
||||||
|
|
||||||
|
@ -12,6 +12,8 @@
|
|||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
#include "ValueEnumerator.h"
|
#include "ValueEnumerator.h"
|
||||||
|
#include "llvm/ADT/SmallPtrSet.h"
|
||||||
|
#include "llvm/ADT/STLExtras.h"
|
||||||
#include "llvm/Constants.h"
|
#include "llvm/Constants.h"
|
||||||
#include "llvm/DerivedTypes.h"
|
#include "llvm/DerivedTypes.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
@ -21,22 +23,10 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
static bool isSingleValueType(const std::pair<const llvm::Type*,
|
|
||||||
unsigned int> &P) {
|
|
||||||
return P.first->isSingleValueType();
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool isIntegerValue(const std::pair<const Value*, unsigned> &V) {
|
static bool isIntegerValue(const std::pair<const Value*, unsigned> &V) {
|
||||||
return V.first->getType()->isIntegerTy();
|
return V.first->getType()->isIntegerTy();
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool CompareByFrequency(const std::pair<const llvm::Type*,
|
|
||||||
unsigned int> &P1,
|
|
||||||
const std::pair<const llvm::Type*,
|
|
||||||
unsigned int> &P2) {
|
|
||||||
return P1.second > P2.second;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// ValueEnumerator - Enumerate module-level information.
|
/// ValueEnumerator - Enumerate module-level information.
|
||||||
ValueEnumerator::ValueEnumerator(const Module *M) {
|
ValueEnumerator::ValueEnumerator(const Module *M) {
|
||||||
// Enumerate the global variables.
|
// Enumerate the global variables.
|
||||||
@ -120,18 +110,72 @@ ValueEnumerator::ValueEnumerator(const Module *M) {
|
|||||||
// Optimize constant ordering.
|
// Optimize constant ordering.
|
||||||
OptimizeConstants(FirstConstant, Values.size());
|
OptimizeConstants(FirstConstant, Values.size());
|
||||||
|
|
||||||
// Sort the type table by frequency so that most commonly used types are early
|
OptimizeTypes();
|
||||||
// in the table (have low bit-width).
|
|
||||||
std::stable_sort(Types.begin(), Types.end(), CompareByFrequency);
|
|
||||||
|
|
||||||
// Partition the Type ID's so that the single-value types occur before the
|
|
||||||
// aggregate types. This allows the aggregate types to be dropped from the
|
|
||||||
// type table after parsing the global variable initializers.
|
|
||||||
std::partition(Types.begin(), Types.end(), isSingleValueType);
|
|
||||||
|
|
||||||
// Now that we rearranged the type table, rebuild TypeMap.
|
// Now that we rearranged the type table, rebuild TypeMap.
|
||||||
for (unsigned i = 0, e = Types.size(); i != e; ++i)
|
for (unsigned i = 0, e = Types.size(); i != e; ++i)
|
||||||
TypeMap[Types[i].first] = i+1;
|
TypeMap[Types[i]] = i+1;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct TypeAndDeps {
|
||||||
|
const Type *Ty;
|
||||||
|
unsigned NumDeps;
|
||||||
|
};
|
||||||
|
|
||||||
|
static int CompareByDeps(const void *a, const void *b) {
|
||||||
|
const TypeAndDeps &ta = *(const TypeAndDeps*) a;
|
||||||
|
const TypeAndDeps &tb = *(const TypeAndDeps*) b;
|
||||||
|
return ta.NumDeps - tb.NumDeps;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void VisitType(const Type *Ty, SmallPtrSet<const Type*, 16> &Visited,
|
||||||
|
std::vector<const Type*> &Out) {
|
||||||
|
if (Visited.count(Ty))
|
||||||
|
return;
|
||||||
|
|
||||||
|
Visited.insert(Ty);
|
||||||
|
|
||||||
|
for (Type::subtype_iterator I2 = Ty->subtype_begin(),
|
||||||
|
E2 = Ty->subtype_end(); I2 != E2; ++I2) {
|
||||||
|
const Type *InnerType = I2->get();
|
||||||
|
VisitType(InnerType, Visited, Out);
|
||||||
|
}
|
||||||
|
|
||||||
|
Out.push_back(Ty);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ValueEnumerator::OptimizeTypes(void) {
|
||||||
|
// If the types form a DAG, this will compute a topological sort and
|
||||||
|
// no forward references will be needed when reading them in.
|
||||||
|
// If there are cycles, this is a simple but reasonable heuristic for
|
||||||
|
// the minimum feedback arc set problem.
|
||||||
|
const unsigned NumTypes = Types.size();
|
||||||
|
std::vector<TypeAndDeps> TypeDeps;
|
||||||
|
TypeDeps.resize(NumTypes);
|
||||||
|
|
||||||
|
for (unsigned I = 0; I < NumTypes; ++I) {
|
||||||
|
const Type *Ty = Types[I];
|
||||||
|
TypeDeps[I].Ty = Ty;
|
||||||
|
TypeDeps[I].NumDeps = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (unsigned I = 0; I < NumTypes; ++I) {
|
||||||
|
const Type *Ty = TypeDeps[I].Ty;
|
||||||
|
for (Type::subtype_iterator I2 = Ty->subtype_begin(),
|
||||||
|
E2 = Ty->subtype_end(); I2 != E2; ++I2) {
|
||||||
|
const Type *InnerType = I2->get();
|
||||||
|
unsigned InnerIndex = TypeMap.lookup(InnerType) - 1;
|
||||||
|
TypeDeps[InnerIndex].NumDeps++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
array_pod_sort(TypeDeps.begin(), TypeDeps.end(), CompareByDeps);
|
||||||
|
|
||||||
|
SmallPtrSet<const Type*, 16> Visited;
|
||||||
|
Types.clear();
|
||||||
|
Types.reserve(NumTypes);
|
||||||
|
for (unsigned I = 0; I < NumTypes; ++I) {
|
||||||
|
VisitType(TypeDeps[I].Ty, Visited, Types);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned ValueEnumerator::getInstructionID(const Instruction *Inst) const {
|
unsigned ValueEnumerator::getInstructionID(const Instruction *Inst) const {
|
||||||
@ -352,14 +396,12 @@ void ValueEnumerator::EnumerateValue(const Value *V) {
|
|||||||
void ValueEnumerator::EnumerateType(const Type *Ty) {
|
void ValueEnumerator::EnumerateType(const Type *Ty) {
|
||||||
unsigned &TypeID = TypeMap[Ty];
|
unsigned &TypeID = TypeMap[Ty];
|
||||||
|
|
||||||
if (TypeID) {
|
// We've already seen this type.
|
||||||
// If we've already seen this type, just increase its occurrence count.
|
if (TypeID)
|
||||||
Types[TypeID-1].second++;
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// First time we saw this type, add it.
|
// First time we saw this type, add it.
|
||||||
Types.push_back(std::make_pair(Ty, 1U));
|
Types.push_back(Ty);
|
||||||
TypeID = Types.size();
|
TypeID = Types.size();
|
||||||
|
|
||||||
// Enumerate subtypes.
|
// Enumerate subtypes.
|
||||||
|
@ -36,8 +36,7 @@ class MDSymbolTable;
|
|||||||
|
|
||||||
class ValueEnumerator {
|
class ValueEnumerator {
|
||||||
public:
|
public:
|
||||||
// For each type, we remember its Type* and occurrence frequency.
|
typedef std::vector<const Type*> TypeList;
|
||||||
typedef std::vector<std::pair<const Type*, unsigned> > TypeList;
|
|
||||||
|
|
||||||
// For each value, we remember its Value* and occurrence frequency.
|
// For each value, we remember its Value* and occurrence frequency.
|
||||||
typedef std::vector<std::pair<const Value*, unsigned> > ValueList;
|
typedef std::vector<std::pair<const Value*, unsigned> > ValueList;
|
||||||
@ -136,6 +135,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void OptimizeConstants(unsigned CstStart, unsigned CstEnd);
|
void OptimizeConstants(unsigned CstStart, unsigned CstEnd);
|
||||||
|
void OptimizeTypes();
|
||||||
|
|
||||||
void EnumerateMDNodeOperands(const MDNode *N);
|
void EnumerateMDNodeOperands(const MDNode *N);
|
||||||
void EnumerateMetadata(const Value *MD);
|
void EnumerateMetadata(const Value *MD);
|
||||||
|
Loading…
Reference in New Issue
Block a user