Isomorphism checking code.

3 files changed, 257 insertions, 8 deletions

diff --git a/src/aig/saig/saigIso.c b/src/aig/saig/saigIso.c
index ff10df82..95d0cdae 100644
--- a/src/aig/saig/saigIso.c
+++ b/src/aig/saig/saigIso.c
@@ -503,6 +503,12 @@ Aig_Man_t * Iso_ManFilterPos( Aig_Man_t * pAig, Vec_Ptr_t ** pvPosEquivs, int fV
         printf( " Unique = %d\n", nUnique );
     }
 */
+
+    // canonicize order
+    Vec_PtrForEachEntry( Vec_Int_t *, vClasses, vLevel, i )
+        Vec_IntSort( vLevel, 0 );
+     Vec_VecSortByFirstInt( (Vec_Vec_t *)vClasses, 0 );
+       
     // collect the first ones
     vRemain = Vec_IntAlloc( 100 );
     Vec_PtrForEachEntry( Vec_Int_t *, vClasses, vLevel, i )
diff --git a/src/aig/saig/saigIsoSlow.c b/src/aig/saig/saigIsoSlow.c
index 6ec74112..5decb43a 100644
--- a/src/aig/saig/saigIsoSlow.c
+++ b/src/aig/saig/saigIsoSlow.c
@@ -22,6 +22,73 @@
 
 ABC_NAMESPACE_IMPL_START
 
+static int s_1kPrimes[1024] = 
+{
+    901403,984877,908741,966307,924437,965639,918787,931067,982621,917669,981473,936407,990487,926077,922897,970861,
+    942317,961747,979717,978947,940157,987821,981221,917713,983083,992231,928253,961187,991817,927643,923129,934291,
+    998071,967567,961087,988661,910031,930481,904489,974167,941351,959911,963811,921463,900161,934489,905629,930653,
+    901819,909457,939871,924083,915113,937969,928457,946291,973787,912869,994093,959279,905803,995219,949903,911011,
+    986707,995053,930583,955511,928307,930889,968729,911507,949043,939359,961679,918041,937681,909091,963913,923539,
+    929587,953347,917573,913037,995387,976483,986239,946949,922489,917887,957553,931529,929813,949567,941683,905161,
+    928819,932417,900089,935903,926587,914467,967361,944833,945881,941741,915949,903407,904157,971863,993893,963607,
+    918943,912463,980957,962963,968089,904513,963763,907363,904097,904093,991343,918347,986983,986659,935819,903569,
+    929171,913933,999749,923123,961531,935861,915053,994853,943511,969923,927191,968333,949391,950959,968311,991409,
+    911681,987101,904027,975259,907399,946223,907259,900409,957221,901063,974657,912337,979001,970147,982301,968213,
+    923959,964219,935443,950161,989251,936127,985679,958159,930077,971899,944857,956083,914293,941981,909481,909047,
+    960527,958183,970687,914827,949051,928159,933551,964423,914041,915869,929953,901367,914219,975551,912391,917809,
+    991499,904781,949153,959887,961957,970943,947741,941263,984541,951437,984301,947423,905761,964913,971357,927709,
+    916441,941933,956993,988243,921197,905453,922081,950813,946331,998561,929023,937421,956231,907651,977897,905491,
+    960173,931837,955217,911951,990643,971021,949439,988453,996781,951497,906011,944309,911293,917123,983803,928097,
+    977747,928703,949957,919189,925513,923953,904997,986351,930689,902009,912007,906757,955793,926803,906809,962743,
+    911917,909329,949021,974651,959083,945367,905137,948377,931757,945409,920279,915007,960121,920609,946163,946391,
+    928903,932951,944329,901529,959809,918469,978643,911159,982573,965411,962233,911269,953273,974437,907589,992269,
+    929399,980431,905693,968267,970481,911089,950557,913799,920407,974489,909863,918529,975277,929323,971549,969181,
+    972787,964267,939971,943763,940483,971501,921637,945341,955211,920701,978349,969041,929861,904103,908539,995369,
+    995567,917471,908879,993821,947783,954599,978463,914519,942869,947263,988343,914657,956987,903641,943343,991063,
+    985403,926327,982829,958439,942017,960353,944987,934793,948971,999331,990767,915199,912211,946459,997019,965059,
+    924907,983233,943273,945359,919613,933883,928927,942763,994087,996211,918971,924871,938491,957139,918839,914629,
+    974329,900577,952823,941641,900461,946997,983123,935149,923693,908419,995651,912871,987067,920201,913921,929209,
+    962509,974599,972001,920273,922099,951781,958549,909971,975133,937207,929941,961397,980677,923579,980081,942199,
+    940319,942979,912349,942691,986989,947711,972343,932663,937877,940369,919571,927187,981439,932353,952313,915947,
+    915851,974041,989381,921029,997013,999199,914801,918751,997327,992843,982133,932051,964861,903979,937463,916781,
+    944389,986719,958369,961451,917767,954367,949853,934939,958807,975797,949699,957097,980773,969989,934907,909281,
+    904679,909833,991741,946769,908381,932447,957889,981697,905701,919033,999023,993541,912953,911719,934603,925019,
+    989341,912269,917789,981049,959149,989909,960521,952183,922627,936253,910957,972047,945037,940399,928313,928471,
+    962459,959947,927541,917333,926899,911837,985631,955127,922729,911171,900511,926251,918209,943477,955277,959773,
+    971039,917353,955313,930301,990799,957731,917519,938507,988111,911657,999721,968917,934537,903073,921703,966227,
+    904661,998213,954307,931309,909331,933643,910099,958627,914533,902903,950149,972721,915157,969037,988219,944137,
+    976411,952873,964787,970927,968963,920741,975187,966817,982909,975281,931907,959267,980711,924617,975691,962309,
+    976307,932209,989921,907969,947927,932207,945397,948929,904903,938563,961691,977671,963173,927149,951061,966547,
+    937661,983597,948139,948041,982759,941093,993703,910097,902347,990307,978217,996763,904919,924641,902299,929549,
+    977323,975071,932917,996293,925579,925843,915487,917443,999541,943043,919109,959879,912173,986339,939193,939599,
+    927077,977183,966521,959471,991943,985951,942187,932557,904297,972337,931751,964097,942341,966221,929113,960131,
+    906427,970133,996511,925637,971651,983443,981703,933613,939749,929029,958043,961511,957241,901079,950479,975493,
+    985799,909401,945601,911077,978359,948151,950333,968879,978727,961151,957823,950393,960293,915683,971513,915659,
+    943841,902477,916837,911161,958487,963691,949607,935707,987607,901613,972557,938947,931949,919021,982217,914737,
+    913753,971279,981683,915631,907807,970421,983173,916099,984587,912049,981391,947747,966233,932101,991733,969757,
+    904283,996601,979807,974419,964693,931537,917251,967961,910093,989321,988129,997307,963427,999221,962447,991171,
+    993137,914339,964973,908617,968567,920497,980719,949649,912239,907367,995623,906779,914327,918131,983113,962993,
+    977849,914941,932681,905713,932579,923977,965507,916469,984119,931981,998423,984407,993841,901273,910799,939847,
+    997153,971429,994927,912631,931657,968377,927833,920149,978041,947449,993233,927743,939737,975017,961861,984539,
+    938857,977437,950921,963659,923917,932983,922331,982393,983579,935537,914357,973051,904531,962077,990281,989231,
+    910643,948281,961141,911839,947413,923653,982801,903883,931943,930617,928679,962119,969977,926921,999773,954181,
+    963019,973411,918139,959719,918823,941471,931883,925273,918173,949453,946993,945457,959561,968857,935603,978283,
+    978269,947389,931267,902599,961189,947621,920039,964049,947603,913259,997811,943843,978277,972119,929431,918257,
+    991663,954043,910883,948797,929197,985057,990023,960961,967139,923227,923371,963499,961601,971591,976501,989959,
+    908731,951331,989887,925307,909299,949159,913447,969797,959449,976957,906617,901213,922667,953731,960199,960049,
+    985447,942061,955613,965443,947417,988271,945887,976369,919823,971353,962537,929963,920473,974177,903649,955777,
+    963877,973537,929627,994013,940801,985709,995341,936319,904681,945817,996617,953191,952859,934889,949513,965407,
+    988357,946801,970391,953521,905413,976187,968419,940669,908591,976439,915731,945473,948517,939181,935183,978067,
+    907663,967511,968111,981599,913907,933761,994933,980557,952073,906557,935621,914351,967903,949129,957917,971821,
+    925937,926179,955729,966871,960737,968521,949997,956999,961273,962683,990377,908851,932231,929749,932149,966971,
+    922079,978149,938453,958313,995381,906259,969503,922321,918947,972443,916411,935021,944429,928643,952199,918157,
+    917783,998497,944777,917771,936731,999953,975157,908471,989557,914189,933787,933157,938953,922931,986569,964363,
+    906473,963419,941467,946079,973561,957431,952429,965267,978473,924109,979529,991901,988583,918259,961991,978037,
+    938033,949967,986071,986333,974143,986131,963163,940553,950933,936587,923407,950357,926741,959099,914891,976231,
+    949387,949441,943213,915353,983153,975739,934243,969359,926557,969863,961097,934463,957547,916501,904901,928231,
+    903673,974359,932219,916933,996019,934399,955813,938089,907693,918223,969421,940903,940703,913027,959323,940993,
+    937823,906691,930841,923701,933259,911959,915601,960251,985399,914359,930827,950251,975379,903037,905783,971237
+};
 
 ////////////////////////////////////////////////////////////////////////
 ///                        DECLARATIONS                              ///
@@ -33,14 +100,14 @@ typedef struct Iso_Obj_t_ Iso_Obj_t;
 struct Iso_Obj_t_
 {
     // hashing entries (related to the parameter ISO_NUM_INTS!)
-    unsigned      Level    : 30;
-    unsigned      nFinNeg  :  2;
-    unsigned      nFoutPos : 16;
-    unsigned      nFoutNeg : 16;
-    unsigned      nFinLev0 : 16;
-    unsigned      nFinLev1 : 16;
-//    unsigned      nNodes   : 16;
-//    unsigned      nEdges   : 16;
+    unsigned      Level     : 30;
+    unsigned      nFinNeg   :  2;
+    unsigned      nFoutPos  :  8;
+    unsigned      nFoutNeg  :  8;
+    unsigned      nFinLev0  :  8;
+    unsigned      nFinLev1  :  8;
+    unsigned      FaninSig  : 16;
+    unsigned      FanoutSig : 16;
     // other data
     int           iNext;          // hash table entry
     int           iClass;         // next one in class
@@ -81,6 +148,49 @@ static inline Aig_Obj_t *  Iso_AigObj( Iso_Man_t * p, Iso_Obj_t * q )    { retur
 ///                     FUNCTION DEFINITIONS                         ///
 ////////////////////////////////////////////////////////////////////////
 
+//extern void Iso_ReadPrimes( char * pFileName );
+//Iso_ReadPrimes( "primes.txt" );
+
+/**Function*************************************************************
+
+  Synopsis    [Read primes from file.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+void Iso_ReadPrimes( char * pFileName )
+{
+    FILE * pFile;
+    int Nums[10000];
+    int i, j, Temp, nSize = 0;
+    // read the numbers
+    pFile = fopen( pFileName, "rb" );
+    while ( fscanf( pFile, "%d", Nums + nSize++ ) == 1 );
+    fclose( pFile );
+    assert( nSize >= (1<<10) );
+    // randomly permute
+    srand( 111 );
+    for ( i = 0; i < nSize; i++ )
+    {
+        j = rand() % nSize;
+        Temp = Nums[i];
+        Nums[i] = Nums[j];
+        Nums[j] = Temp;
+    }
+    // write out
+    for ( i = 0; i < 64; i++ )
+    {
+        printf( "    " );
+        for ( j = 0; j < 16; j++ )
+            printf( "%d,", Nums[i*16+j] );
+        printf( "\n" );
+    }
+}
+
 /**Function*************************************************************
 
   Synopsis    []
@@ -302,6 +412,8 @@ void Iso_ManCollectClasses( Iso_Man_t * p )
             pIso->Id = p->nObjIds++;
 }
 
+static inline int      Abc_Base2Log64( word n )             { int r; if ( n < 2 ) return (int)n; for ( r = 0, n--; n; n >>= 1, r++ ); return r; }
+
 /**Function*************************************************************
 
   Synopsis    []
@@ -315,6 +427,7 @@ void Iso_ManCollectClasses( Iso_Man_t * p )
 ***********************************************************************/
 Iso_Man_t * Iso_ManCreate( Aig_Man_t * pAig )
 {
+    int fUseSignatures = 1;
     Iso_Man_t * p;
     Iso_Obj_t * pIso;
     Aig_Obj_t * pObj;
@@ -344,6 +457,48 @@ Iso_Man_t * Iso_ManCreate( Aig_Man_t * pAig )
                 pIso->nFoutPos++;
         }
     }
+
+    // create TFI signatures
+    if ( fUseSignatures )
+    Aig_ManForEachObj( pAig, pObj, i )
+    {
+        if ( Aig_ObjIsPo(pObj) )
+            continue;
+        pIso = p->pObjs + i;
+        assert( pIso->FaninSig == 0 );
+        assert( pIso->FanoutSig == 0 );
+        pIso->FaninSig = pIso->nFoutNeg * s_1kPrimes[pObj->Level & 0x3FF];
+        if ( Aig_ObjIsNode(pObj) )
+        {
+            pIso->FaninSig += p->pObjs[Aig_ObjFaninId0(pObj)].FaninSig;
+            pIso->FaninSig += p->pObjs[Aig_ObjFaninId1(pObj)].FaninSig;
+        }
+    }
+
+    // create TFO signatures
+    if ( fUseSignatures )
+    Aig_ManForEachObjReverse( pAig, pObj, i )
+    {
+        if ( Aig_ObjIsPi(pObj) || Aig_ObjIsConst1(pObj) )
+            continue;
+        pIso = p->pObjs + i;
+//        pIso->FanoutSig += pIso->nFoutNeg * s_1kPrimes[pObj->Level & 0x3FF];
+        pIso->FanoutSig += s_1kPrimes[pObj->Level & 0x3FF];
+        if ( Aig_ObjIsNode(pObj) )
+        {
+            p->pObjs[Aig_ObjFaninId0(pObj)].FanoutSig += pIso->FanoutSig;
+            p->pObjs[Aig_ObjFaninId1(pObj)].FanoutSig += pIso->FanoutSig;
+        }
+        else if ( Aig_ObjIsPo(pObj) )
+            p->pObjs[Aig_ObjFaninId0(pObj)].FanoutSig += pIso->FanoutSig;
+    }
+
+
+//    Aig_ManForEachPi( pAig, pObj, i )
+//        printf( "%d ", Abc_Base2Log64( (p->pObjs + Aig_ObjId(pObj))->FanoutSig ) );
+//    printf( "\n" );
+
+    // create other signatures
     Aig_ManForEachObj( pAig, pObj, i )
     {
         if ( !Aig_ObjIsPi(pObj) && !Aig_ObjIsNode(pObj) )
@@ -376,6 +531,7 @@ Iso_Man_t * Iso_ManCreate( Aig_Man_t * pAig )
         // add to the hash table
         Iso_ObjHashAdd( p, pIso );
     }
+    // derive classes for the first time
     Iso_ManCollectClasses( p );
     return p;
 }
@@ -391,6 +547,31 @@ Iso_Man_t * Iso_ManCreate( Aig_Man_t * pAig )
   SeeAlso     []
 
 ***********************************************************************/
+void Iso_ManPrintClasseSizes( Iso_Man_t * p )
+{
+    Iso_Obj_t * pIso, * pTemp;
+    int i, Counter;
+    Vec_PtrForEachEntry( Iso_Obj_t *, p->vClasses, pIso, i )
+    {
+        Counter = 0;
+        for ( pTemp = pIso; pTemp; pTemp = Iso_ManObj(p, pTemp->iClass) )
+            Counter++;
+        printf( "%d ", Counter );
+    }
+    printf( "\n" );
+}
+
+/**Function*************************************************************
+
+  Synopsis    []
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
 void Iso_ManPrintClasses( Iso_Man_t * p, int fVerbose, int fVeryVerbose )
 {
     int fOnlyCis = 0;
@@ -761,6 +942,7 @@ Vec_Int_t * Saig_ManFindIsoPerm( Aig_Man_t * pAig, int fVerbose )
         // force refinement
         while ( p->nSingles == 0 && p->nClasses )
         {
+//            Iso_ManPrintClasseSizes( p );
             // assign IDs to the topmost level of classes
             Iso_ManBreakTies( p, fVerbose );
             // assign adjacency to classes
diff --git a/src/misc/vec/vecVec.h b/src/misc/vec/vecVec.h
index e0f18983..8bed4574 100644
--- a/src/misc/vec/vecVec.h
+++ b/src/misc/vec/vecVec.h
@@ -588,6 +588,67 @@ static inline void Vec_VecSort( Vec_Vec_t * p, int fReverse )
 
 /**Function*************************************************************
 
+  Synopsis    [Comparison procedure for two integers.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+static int Vec_VecSortCompare3( Vec_Int_t ** pp1, Vec_Int_t ** pp2 )
+{
+    if ( Vec_IntEntry(*pp1,0) < Vec_IntEntry(*pp2,0) )
+        return -1;
+    if ( Vec_IntEntry(*pp1,0) > Vec_IntEntry(*pp2,0) ) 
+        return 1;
+    return 0; 
+}
+
+/**Function*************************************************************
+
+  Synopsis    [Comparison procedure for two integers.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+static int Vec_VecSortCompare4( Vec_Int_t ** pp1, Vec_Int_t ** pp2 )
+{
+    if ( Vec_IntEntry(*pp1,0) > Vec_IntEntry(*pp2,0) )
+        return -1;
+    if ( Vec_IntEntry(*pp1,0) < Vec_IntEntry(*pp2,0) ) 
+        return 1;
+    return 0; 
+}
+
+/**Function*************************************************************
+
+  Synopsis    [Sorting the entries by their integer value.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+static inline void Vec_VecSortByFirstInt( Vec_Vec_t * p, int fReverse )
+{
+    if ( fReverse ) 
+        qsort( (void *)p->pArray, p->nSize, sizeof(void *), 
+                (int (*)(const void *, const void *)) Vec_VecSortCompare4 );
+    else
+        qsort( (void *)p->pArray, p->nSize, sizeof(void *), 
+                (int (*)(const void *, const void *)) Vec_VecSortCompare3 );
+}
+
+/**Function*************************************************************
+
   Synopsis    []
 
   Description []