diff options
author | David Greene <greened@obbligato.org> | 2011-07-29 19:07:26 +0000 |
---|---|---|
committer | David Greene <greened@obbligato.org> | 2011-07-29 19:07:26 +0000 |
commit | 78621a851ae84520de7d24a6d61e1dcf25749712 (patch) | |
tree | 53287ca098f7a9fc2c3b4dd6f1cdac4f883c8241 /utils/TableGen | |
parent | 65bf3ca9aa474db6c5c2a0d3ea0f4a22af514184 (diff) | |
download | llvm-78621a851ae84520de7d24a6d61e1dcf25749712.tar.gz llvm-78621a851ae84520de7d24a6d61e1dcf25749712.tar.bz2 llvm-78621a851ae84520de7d24a6d61e1dcf25749712.tar.xz |
[AVX] Make DagInits Unique
Make sure DagInits are unique and created only once.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136501 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/TableGen')
-rw-r--r-- | utils/TableGen/Record.cpp | 45 | ||||
-rw-r--r-- | utils/TableGen/Record.h | 28 |
2 files changed, 50 insertions, 23 deletions
diff --git a/utils/TableGen/Record.cpp b/utils/TableGen/Record.cpp index d4e6083975..ed271cbdce 100644 --- a/utils/TableGen/Record.cpp +++ b/utils/TableGen/Record.cpp @@ -1531,6 +1531,44 @@ const Init *FieldInit::resolveReferences(Record &R, const RecordVal *RV) const { return this; } +void ProfileDagInit(FoldingSetNodeID &ID, + const Init *V, + const std::string &VN, + ArrayRef<const Init *> ArgRange, + ArrayRef<std::string> NameRange) { + ID.AddPointer(V); + ID.AddString(VN); + + ArrayRef<const Init *>::iterator Arg = ArgRange.begin(); + ArrayRef<std::string>::iterator Name = NameRange.begin(); + while (Arg != ArgRange.end()) { + assert(Name != NameRange.end() && "Arg name underflow!"); + ID.AddPointer(*Arg++); + ID.AddString(*Name++); + } + assert(Name == NameRange.end() && "Arg name overflow!"); +} + +const DagInit * +DagInit::get(const Init *V, const std::string &VN, + ArrayRef<const Init *> ArgRange, + ArrayRef<std::string> NameRange) { + typedef FoldingSet<DagInit> Pool; + static Pool ThePool; + + FoldingSetNodeID ID; + ProfileDagInit(ID, V, VN, ArgRange, NameRange); + + void *IP = 0; + if (const DagInit *I = ThePool.FindNodeOrInsertPos(ID, IP)) + return I; + + DagInit *I = new DagInit(V, VN, ArgRange, NameRange); + ThePool.InsertNode(I, IP); + + return I; +} + const DagInit * DagInit::get(const Init *V, const std::string &VN, const std::vector<std::pair<const Init*, std::string> > &args) { @@ -1550,11 +1588,8 @@ DagInit::get(const Init *V, const std::string &VN, return DagInit::get(V, VN, Args, Names); } -const DagInit * -DagInit::get(const Init *V, const std::string &VN, - const std::vector<const Init*> &args, - const std::vector<std::string> &argNames) { - return new DagInit(V, VN, args, argNames); +void DagInit::Profile(FoldingSetNodeID &ID) const { + ProfileDagInit(ID, Val, ValName, Args, ArgNames); } const Init *DagInit::resolveReferences(Record &R, const RecordVal *RV) const { diff --git a/utils/TableGen/Record.h b/utils/TableGen/Record.h index cbde0e9bdb..351625ac4e 100644 --- a/utils/TableGen/Record.h +++ b/utils/TableGen/Record.h @@ -1252,39 +1252,31 @@ public: /// to have at least one value then a (possibly empty) list of arguments. Each /// argument can have a name associated with it. /// -class DagInit : public TypedInit { +class DagInit : public TypedInit, public FoldingSetNode { const Init *Val; std::string ValName; std::vector<const Init*> Args; std::vector<std::string> ArgNames; DagInit(const Init *V, const std::string &VN, - const std::vector<std::pair<const Init*, std::string> > &args) - : TypedInit(DagRecTy::get()), Val(V), ValName(VN) { - Args.reserve(args.size()); - ArgNames.reserve(args.size()); - for (unsigned i = 0, e = args.size(); i != e; ++i) { - Args.push_back(args[i].first); - ArgNames.push_back(args[i].second); - } - } - DagInit(const Init *V, const std::string &VN, - const std::vector<const Init*> &args, - const std::vector<std::string> &argNames) - : TypedInit(DagRecTy::get()), Val(V), ValName(VN), Args(args), - ArgNames(argNames) { } + ArrayRef<const Init *> ArgRange, + ArrayRef<std::string> NameRange) + : TypedInit(DagRecTy::get()), Val(V), ValName(VN), + Args(ArgRange.begin(), ArgRange.end()), + ArgNames(NameRange.begin(), NameRange.end()) {} DagInit(const DagInit &Other); // Do not define. DagInit &operator=(const DagInit &Other); // Do not define. public: static const DagInit *get(const Init *V, const std::string &VN, + ArrayRef<const Init *> ArgRange, + ArrayRef<std::string> NameRange); + static const DagInit *get(const Init *V, const std::string &VN, const std::vector< std::pair<const Init*, std::string> > &args); - static const DagInit *get(const Init *V, const std::string &VN, - const std::vector<const Init*> &args, - const std::vector<std::string> &argNames); + void Profile(FoldingSetNodeID &ID) const; virtual const Init *convertInitializerTo(RecTy *Ty) const { return Ty->convertValue(this); |