[llvm-commits] [llvm] r136501 - in /llvm/trunk/utils/TableGen: Record.cpp Record.h

[David Greene]

Author: greened
Date: Fri Jul 29 14:07:26 2011
New Revision: 136501

URL: http://llvm.org/viewvc/llvm-project?rev=136501&view=rev
Log:
[AVX] Make DagInits Unique

Make sure DagInits are unique and created only once.

Modified:
    llvm/trunk/utils/TableGen/Record.cpp
    llvm/trunk/utils/TableGen/Record.h

Modified: llvm/trunk/utils/TableGen/Record.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/Record.cpp?rev=136501&r1=136500&r2=136501&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/Record.cpp (original)
+++ llvm/trunk/utils/TableGen/Record.cpp Fri Jul 29 14:07:26 2011
@@ -1531,6 +1531,44 @@
   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 @@
   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 {

Modified: llvm/trunk/utils/TableGen/Record.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/Record.h?rev=136501&r1=136500&r2=136501&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/Record.h (original)
+++ llvm/trunk/utils/TableGen/Record.h Fri Jul 29 14:07:26 2011
@@ -1252,39 +1252,31 @@
 /// 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);