From 5e46adb09a6aac616e3b469d3bb6682fa4160d2b Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Mon, 18 Jan 2016 20:36:06 +0000 Subject: [TableGen] Use FoldingSets instead of DenseMaps to unique UnOpInit, BinOpInit and TernOpInit. This remove the memory needed to store the key for the DenseMap. NFC llvm-svn: 258071 --- llvm/lib/TableGen/Record.cpp | 118 +++++++++++++++++++++++++++++-------------- 1 file changed, 79 insertions(+), 39 deletions(-) (limited to 'llvm/lib') diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp index e1eb1d765ce..31f2f6aa564 100644 --- a/llvm/lib/TableGen/Record.cpp +++ b/llvm/lib/TableGen/Record.cpp @@ -609,15 +609,32 @@ Init *OpInit::getBit(unsigned Bit) const { return VarBitInit::get(const_cast(this), Bit); } -UnOpInit *UnOpInit::get(UnaryOp opc, Init *lhs, RecTy *Type) { - typedef std::pair, RecTy *> Key; - static DenseMap> ThePool; +static void +ProfileUnOpInit(FoldingSetNodeID &ID, unsigned Opcode, Init *Op, RecTy *Type) { + ID.AddInteger(Opcode); + ID.AddPointer(Op); + ID.AddPointer(Type); +} - Key TheKey(std::make_pair(std::make_pair(opc, lhs), Type)); +UnOpInit *UnOpInit::get(UnaryOp Opc, Init *LHS, RecTy *Type) { + static FoldingSet ThePool; + static std::vector> TheActualPool; - std::unique_ptr &I = ThePool[TheKey]; - if (!I) I.reset(new UnOpInit(opc, lhs, Type)); - return I.get(); + FoldingSetNodeID ID; + ProfileUnOpInit(ID, Opc, LHS, Type); + + void *IP = nullptr; + if (UnOpInit *I = ThePool.FindNodeOrInsertPos(ID, IP)) + return I; + + UnOpInit *I = new UnOpInit(Opc, LHS, Type); + ThePool.InsertNode(I, IP); + TheActualPool.push_back(std::unique_ptr(I)); + return I; +} + +void UnOpInit::Profile(FoldingSetNodeID &ID) const { + ProfileUnOpInit(ID, getOpcode(), getOperand(), getType()); } Init *UnOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const { @@ -737,21 +754,35 @@ std::string UnOpInit::getAsString() const { return Result + "(" + LHS->getAsString() + ")"; } -BinOpInit *BinOpInit::get(BinaryOp opc, Init *lhs, - Init *rhs, RecTy *Type) { - typedef std::pair< - std::pair, Init *>, - RecTy * - > Key; +static void +ProfileBinOpInit(FoldingSetNodeID &ID, unsigned Opcode, Init *LHS, Init *RHS, + RecTy *Type) { + ID.AddInteger(Opcode); + ID.AddPointer(LHS); + ID.AddPointer(RHS); + ID.AddPointer(Type); +} - static DenseMap> ThePool; +BinOpInit *BinOpInit::get(BinaryOp Opc, Init *LHS, + Init *RHS, RecTy *Type) { + static FoldingSet ThePool; + static std::vector> TheActualPool; - Key TheKey(std::make_pair(std::make_pair(std::make_pair(opc, lhs), rhs), - Type)); + FoldingSetNodeID ID; + ProfileBinOpInit(ID, Opc, LHS, RHS, Type); - std::unique_ptr &I = ThePool[TheKey]; - if (!I) I.reset(new BinOpInit(opc, lhs, rhs, Type)); - return I.get(); + void *IP = nullptr; + if (BinOpInit *I = ThePool.FindNodeOrInsertPos(ID, IP)) + return I; + + BinOpInit *I = new BinOpInit(Opc, LHS, RHS, Type); + ThePool.InsertNode(I, IP); + TheActualPool.push_back(std::unique_ptr(I)); + return I; +} + +void BinOpInit::Profile(FoldingSetNodeID &ID) const { + ProfileBinOpInit(ID, getOpcode(), getLHS(), getRHS(), getType()); } Init *BinOpInit::Fold(Record *CurRec, MultiClass *CurMultiClass) const { @@ -870,27 +901,36 @@ std::string BinOpInit::getAsString() const { return Result + "(" + LHS->getAsString() + ", " + RHS->getAsString() + ")"; } -TernOpInit *TernOpInit::get(TernaryOp opc, Init *lhs, Init *mhs, Init *rhs, +static void +ProfileTernOpInit(FoldingSetNodeID &ID, unsigned Opcode, Init *LHS, Init *MHS, + Init *RHS, RecTy *Type) { + ID.AddInteger(Opcode); + ID.AddPointer(LHS); + ID.AddPointer(MHS); + ID.AddPointer(RHS); + ID.AddPointer(Type); +} + +TernOpInit *TernOpInit::get(TernaryOp Opc, Init *LHS, Init *MHS, Init *RHS, RecTy *Type) { - typedef std::pair< - std::pair< - std::pair, Init *>, - Init * - >, - Init * - > Key; - - static DenseMap> ThePool; - - Key TheKey(std::make_pair(std::make_pair(std::make_pair(std::make_pair(opc, - Type), - lhs), - mhs), - rhs)); - - std::unique_ptr &I = ThePool[TheKey]; - if (!I) I.reset(new TernOpInit(opc, lhs, mhs, rhs, Type)); - return I.get(); + static FoldingSet ThePool; + static std::vector> TheActualPool; + + FoldingSetNodeID ID; + ProfileTernOpInit(ID, Opc, LHS, MHS, RHS, Type); + + void *IP = nullptr; + if (TernOpInit *I = ThePool.FindNodeOrInsertPos(ID, IP)) + return I; + + TernOpInit *I = new TernOpInit(Opc, LHS, MHS, RHS, Type); + ThePool.InsertNode(I, IP); + TheActualPool.push_back(std::unique_ptr(I)); + return I; +} + +void TernOpInit::Profile(FoldingSetNodeID &ID) const { + ProfileTernOpInit(ID, getOpcode(), getLHS(), getMHS(), getRHS(), getType()); } static Init *ForeachHelper(Init *LHS, Init *MHS, Init *RHS, RecTy *Type, -- cgit v1.2.3