Merge branch 'master' of github.com:highperformancecoder/ecolab

Author: highperformancecoder

models/abc.h

@@ -101,7 +101,7 @@ namespace ecolab {
       assert(numOutputs()==1);
       std::vector<I> workspace(Abc_NtkObjNumMax(aig));
       for (unsigned i=0; i<numInputs(); ++i)
-        workspace[abc::Abc_ObjId(&input(i))]=input[i];
+        workspace[abc::Abc_ObjId(&this->input(i))]=input[i];
       AbcNodes orderedNodes(aig);
       for (auto obj: orderedNodes)
         if (obj)
@@ -113,7 +113,7 @@ namespace ecolab {
             if (abc::Abc_ObjFaninC1(obj)) v1 = ~v1;
             workspace[abc::Abc_ObjId(obj)] = v0 & v1;
           }
-      auto r=workspace[abc::Abc_ObjId(&output(0))];
+      auto r=workspace[abc::Abc_ObjFaninId0(&output(0))];
       return abc::Abc_ObjFaninC0(&output(0))? ~r: r;
     }
   };

models/starComplexity.cc

@@ -697,12 +697,12 @@ unsigned StarComplexityGen::starUpperBound(const linkRep& x) const
   return min(ub, complementUb);
 }
 
-unsigned StarComplexityGen::starUpperBoundABC(linkRep x) const
+unsigned starUpperBoundABC(linkRep x, const ElemStars& elemStars)
 {
   if (x.empty()) return 3; // intersection of 3 stars is empty.
   // Firstly remove those nodes that are full stars
   vector<unsigned> fullStars;
-  const unsigned nodes=elemStars.size();
+  unsigned nodes=elemStars.size();
   for (unsigned i=0; i<nodes; ++i)
     {
       bool fullStar=true;
@@ -719,7 +719,7 @@ unsigned StarComplexityGen::starUpperBoundABC(linkRep x) const
 
   AIG aig;
   // build the remaining edges into an AIG
-  aig.setInputs(elemStars.size());
+  aig.setInputs(nodes);
   vector<abc::Abc_Obj_t*> edges;
   for (unsigned i=0; i<nodes; ++i)
     for (unsigned j=0; j<i; ++j)
@@ -728,19 +728,40 @@ unsigned StarComplexityGen::starUpperBoundABC(linkRep x) const
   abc::Abc_Obj_t* graphRemainder=edges[0];
   for (size_t i=1; i<edges.size(); ++i)
     graphRemainder=&aig.addOr(*graphRemainder, *edges[i]);
+  assert(aig.numGates()==2*edges.size()-1);
   aig.addOutputs(*graphRemainder);
+  assert(aig.eval(elemStars)==x);
   aig.cleanup();
-  for (unsigned i=0; i<3; ++i)
+  assert(aig.eval(elemStars)==x);
+  for (unsigned i=0; i<100; ++i)
     {
+      auto prevNumGates=aig.numGates();
+      for (unsigned i=0; i<3; ++i)
+        {
+          aig.balance();
+          assert(aig.eval(elemStars)==x);
+          aig.rewrite();
+          assert(aig.eval(elemStars)==x);
+          aig.refactor();
+          assert(aig.eval(elemStars)==x);
+        }
       aig.balance();
-      aig.rewrite();
-      aig.refactor();
+      assert(aig.eval(elemStars)==x);
+      aig.rewrite(true); // final zero-cost pass
+      assert(aig.eval(elemStars)==x);
+      if (aig.numGates()==prevNumGates) break; // terminate on no improvement
     }
-  aig.balance();
-  aig.rewrite(true); // final zero-cost pass
   return fullStars.size()+aig.numGates()+1;
 }
 
+unsigned StarComplexityGen::starUpperBoundABC(const linkRep& x) const
+{
+  unsigned ub=::starUpperBoundABC(x, elemStars);
+  unsigned complementUb=::starUpperBoundABC((~x).maskOut(elemStars.size()), elemStars);
+  assert(ub>0 && complementUb>0);
+  return min(ub, complementUb);
+}
+
 GraphComplexity StarComplexityGen::randomERGraph(unsigned nodes, unsigned links)
 {
   linkRep g=0;

models/starComplexity.h

@@ -89,6 +89,16 @@ class linkRepImpl
   }
 };
 
+template <class I>
+std::ostream& operator<<(std::ostream& o, const linkRepImpl<I>& x)
+{
+  auto d=x.dataAsVector();
+  o<<"[";
+  for (auto& i:d) o<<i<<",";
+  o<<"]";
+  return o;
+}
+
 //#ifdef SYCL_LANGUAGE_VERSION
 //using linkRep=linkRepImpl<VecBitSet<unsigned,4>>;
 //#else
@@ -159,7 +169,7 @@ struct StarComplexityGen
   /// return an upper bound on the number of stars in the link representation
   unsigned starUpperBound(const linkRep&) const;
   /// star upper bound using ABC library
-  unsigned starUpperBoundABC(linkRep) const;
+  unsigned starUpperBoundABC(const linkRep&) const;
 
   /// random number generator
   ecolab::urand uni;

models/starComplexity.py

@@ -12,7 +12,7 @@
     maxStars=max(maxStars,v)
 
 print('maxStars=',maxStars)
-maxStars=10
+maxStars=9
 
 #starC.blockSize(256)
 starC.blockSize(4096)