diff options
Diffstat (limited to 'src/aig')
-rw-r--r-- | src/aig/gia/giaAiger.c | 6 | ||||
-rw-r--r-- | src/aig/gia/giaForce.c | 3 | ||||
-rw-r--r-- | src/aig/gia/giaSim.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaSpeedup.c | 5 | ||||
-rw-r--r-- | src/aig/gia/giaSwitch.c | 7 | ||||
-rw-r--r-- | src/aig/gia/giaTsim.c | 6 | ||||
-rw-r--r-- | src/aig/ioa/ioaReadAig.c | 4 | ||||
-rw-r--r-- | src/aig/ivy/ivyDsd.c | 3 | ||||
-rw-r--r-- | src/aig/ivy/ivyFraig.c | 2 | ||||
-rw-r--r-- | src/aig/saig/saigCexMin.c | 7 |
10 files changed, 17 insertions, 28 deletions
diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c index 53233379..abf378cb 100644 --- a/src/aig/gia/giaAiger.c +++ b/src/aig/gia/giaAiger.c @@ -354,13 +354,14 @@ Gia_Man_t * Gia_ReadAiger2( char * pFileName, int fCheck ) unsigned char * pDrivers, * pSymbols, * pCur;//, * pType; char * pContents, * pName; unsigned uLit0, uLit1, uLit; + int RetValue; // read the file into the buffer Gia_FixFileName( pFileName ); nFileSize = Gia_FileSize( pFileName ); pFile = fopen( pFileName, "rb" ); pContents = ABC_ALLOC( char, nFileSize ); - fread( pContents, nFileSize, 1, pFile ); + RetValue = fread( pContents, nFileSize, 1, pFile ); fclose( pFile ); // check if the input file format is correct @@ -1079,13 +1080,14 @@ Gia_Man_t * Gia_ReadAiger( char * pFileName, int fCheck ) Gia_Man_t * pNew; char * pName, * pContents; int nFileSize; + int RetValue; // read the file into the buffer Gia_FixFileName( pFileName ); nFileSize = Gia_FileSize( pFileName ); pFile = fopen( pFileName, "rb" ); pContents = ABC_ALLOC( char, nFileSize ); - fread( pContents, nFileSize, 1, pFile ); + RetValue = fread( pContents, nFileSize, 1, pFile ); fclose( pFile ); pNew = Gia_ReadAigerFromMemory( pContents, nFileSize, fCheck ); diff --git a/src/aig/gia/giaForce.c b/src/aig/gia/giaForce.c index 6927266b..e7abb555 100644 --- a/src/aig/gia/giaForce.c +++ b/src/aig/gia/giaForce.c @@ -1069,6 +1069,7 @@ void For_ManFileExperiment() int * pBuffer; int i, Size, Exp = 25; int clk = clock(); + int RetValue; Size = (1 << Exp); printf( "2^%d machine words (%d bytes).\n", Exp, sizeof(int) * Size ); @@ -1080,7 +1081,7 @@ ABC_PRT( "Fillup", clock() - clk ); clk = clock(); pFile = fopen( "test.txt", "rb" ); - fread( pBuffer, 1, sizeof(int) * Size, pFile ); + RetValue = fread( pBuffer, 1, sizeof(int) * Size, pFile ); fclose( pFile ); ABC_PRT( "Read ", clock() - clk ); diff --git a/src/aig/gia/giaSim.c b/src/aig/gia/giaSim.c index 817fc2e2..37406c8d 100644 --- a/src/aig/gia/giaSim.c +++ b/src/aig/gia/giaSim.c @@ -611,7 +611,7 @@ int Gia_ManSimSimulate( Gia_Man_t * pAig, Gia_ParSim_t * pPars ) Gia_ManSim_t * p; int i, clkTotal = clock(); int iOut, iPat, RetValue = 0; - int nTimeToStop = pPars->TimeLimit ? pPars->TimeLimit + time(NULL) : 0; +// int nTimeToStop = pPars->TimeLimit ? pPars->TimeLimit + time(NULL) : 0; if ( pAig->pReprs && pAig->pNexts ) return Gia_ManSimSimulateEquiv( pAig, pPars ); ABC_FREE( pAig->pCexSeq ); diff --git a/src/aig/gia/giaSpeedup.c b/src/aig/gia/giaSpeedup.c index d20fe1a4..1098771e 100644 --- a/src/aig/gia/giaSpeedup.c +++ b/src/aig/gia/giaSpeedup.c @@ -291,12 +291,7 @@ float Gia_ManDelayTraceLut( Gia_Man_t * p ) vObjs = Gia_ManOrderReverse( p ); Vec_IntForEachEntry( vObjs, iObj, i ) { - if ( i == 1137 ) - { - int s = 0; - } pObj = Gia_ManObj(p, iObj); -//printf( "%d ", Gia_ObjLevel(p, pObj) ); if ( Gia_ObjIsLut(p, iObj) ) { Gia_ObjPropagateRequired( p, iObj, fUseSorting ); diff --git a/src/aig/gia/giaSwitch.c b/src/aig/gia/giaSwitch.c index 848bd646..4e39a921 100644 --- a/src/aig/gia/giaSwitch.c +++ b/src/aig/gia/giaSwitch.c @@ -473,7 +473,7 @@ static inline int Gia_ManSwiSimInfoCountTrans( Gia_ManSwi_t * p, int iPlace ) static inline void Gia_ManSwiSimulateRound( Gia_ManSwi_t * p, int fCount ) { Gia_Obj_t * pObj; - int i, iCis = 0, iCos = 0; + int i;//, iCis = 0, iCos = 0; assert( p->pAig->nFront > 0 ); assert( Gia_ManConst0(p->pAig)->Value == 0 ); Gia_ManSwiSimInfoZero( p, Gia_SwiData(p, 0) ); @@ -568,8 +568,7 @@ Vec_Int_t * Gia_ManSwiSimulate( Gia_Man_t * pAig, Gia_ParSwi_t * pPars ) if ( pPars->fVerbose ) { printf( "Obj = %8d (%8d). F = %6d. ", - pAig->nObjs, Gia_ManCiNum(pAig) + Gia_ManAndNum(pAig), p->pAig->nFront, - 4.0*Abc_BitWordNum(2 * p->pAig->nFront)/(1<<20) ); + pAig->nObjs, Gia_ManCiNum(pAig) + Gia_ManAndNum(pAig), p->pAig->nFront ); printf( "AIG = %7.2f Mb. F-mem = %7.2f Mb. Other = %7.2f Mb. ", 12.0*Gia_ManObjNum(p->pAig)/(1<<20), 4.0*p->nWords*p->pAig->nFront/(1<<20), @@ -740,7 +739,7 @@ float Gia_ManComputeSwitching( Gia_Man_t * p, int nFrames, int nPref, int fProbO Gia_Man_t * pDfs; Gia_Obj_t * pObj, * pObjDfs; Vec_Int_t * vSwitching; - float * pSwitching, Switch, SwitchTotal = 0.0, SwitchTotal2 = 0.0; + float * pSwitching, Switch, SwitchTotal = 0.0;//, SwitchTotal2 = 0.0; int i; Gia_ParSwi_t Pars, * pPars = &Pars; ABC_FREE( p->pSwitching ); diff --git a/src/aig/gia/giaTsim.c b/src/aig/gia/giaTsim.c index c4fb7f26..c306e867 100644 --- a/src/aig/gia/giaTsim.c +++ b/src/aig/gia/giaTsim.c @@ -178,10 +178,6 @@ static inline void Gia_ManTerSimulateCi( Gia_ManTer_t * p, Gia_Obj_t * pObj, int static inline void Gia_ManTerSimulateCo( Gia_ManTer_t * p, int iCo, Gia_Obj_t * pObj ) { int Value = Gia_ManTerSimInfoGet( p->pDataSim, Gia_ObjDiff0(pObj) ); - if ( iCo == Gia_ManCoNum(p->pAig) -1 ) - { - int s = 0; - } Gia_ManTerSimInfoSet( p->pDataSimCos, iCo, Gia_XsimNotCond( Value, Gia_ObjFaninC0(pObj) ) ); } @@ -418,7 +414,7 @@ static inline void Gia_ManTerSimulateRound( Gia_ManTer_t * p ) ***********************************************************************/ int Gia_ManTerRetire2( Gia_ManTer_t * p, unsigned * pState ) { - int i, Entry, iMaxTerValue = -1, Counter = 0; + int i, Entry, iMaxTerValue = -1; // find non-retired register with this value for ( i = 0; i < Gia_ManRegNum(p->pAig); i++ ) if ( Gia_ManTerSimInfoGet( pState, i ) != GIA_UND && !p->pRetired[i] && iMaxTerValue < p->pCountX[i] ) diff --git a/src/aig/ioa/ioaReadAig.c b/src/aig/ioa/ioaReadAig.c index a1f09edf..eb253659 100644 --- a/src/aig/ioa/ioaReadAig.c +++ b/src/aig/ioa/ioaReadAig.c @@ -433,13 +433,13 @@ Aig_Man_t * Ioa_ReadAiger( char * pFileName, int fCheck ) FILE * pFile; Aig_Man_t * pNew; char * pName, * pContents; - int nFileSize; + int nFileSize, RetValue; // read the file into the buffer nFileSize = Ioa_FileSize( pFileName ); pFile = fopen( pFileName, "rb" ); pContents = ABC_ALLOC( char, nFileSize ); - fread( pContents, nFileSize, 1, pFile ); + RetValue = fread( pContents, nFileSize, 1, pFile ); fclose( pFile ); pNew = Ioa_ReadAigerFromMemory( pContents, nFileSize, fCheck ); diff --git a/src/aig/ivy/ivyDsd.c b/src/aig/ivy/ivyDsd.c index 71c4863a..5a1deb03 100644 --- a/src/aig/ivy/ivyDsd.c +++ b/src/aig/ivy/ivyDsd.c @@ -722,6 +722,8 @@ void Ivy_TruthTestOne( unsigned uTruth ) // Vec_IntFree( vTree ); } +#if 0 + /**Function************************************************************* Synopsis [] @@ -817,6 +819,7 @@ void Ivy_TruthTest5() fclose( pFile ); } +#endif //////////////////////////////////////////////////////////////////////// diff --git a/src/aig/ivy/ivyFraig.c b/src/aig/ivy/ivyFraig.c index 2b911861..180827b8 100644 --- a/src/aig/ivy/ivyFraig.c +++ b/src/aig/ivy/ivyFraig.c @@ -2076,7 +2076,7 @@ void Ivy_FraigPrintActivity( Ivy_FraigMan_t * p ) { int i; for ( i = 0; i < p->nSatVars; i++ ) - printf( "%d %.3f ", i, p->pSat->activity[i] ); + printf( "%d %.3f ", i, (double)p->pSat->activity[i] ); printf( "\n" ); } diff --git a/src/aig/saig/saigCexMin.c b/src/aig/saig/saigCexMin.c index f1826f50..2e8e9cdc 100644 --- a/src/aig/saig/saigCexMin.c +++ b/src/aig/saig/saigCexMin.c @@ -268,7 +268,6 @@ Vec_Vec_t * Saig_ManCexMinCollectPhasePriority_( Aig_Man_t * pAig, Abc_Cex_t * p nPrioOffset = (pCex->iFrame + 1) * pCex->nPis; Aig_ManConst1(pAig)->iData = Abc_Var2Lit( nPrioOffset + pCex->nRegs, 1 ); vRoots = Vec_IntAlloc( 1000 ); -//printf( "Const1 = %d Offset = %d\n", Aig_ManConst1(pAig)->iData, nPrioOffset ); for ( f = 0; f <= pCex->iFrame; f++ ) { int nPiCount = 0; @@ -284,14 +283,8 @@ Vec_Vec_t * Saig_ManCexMinCollectPhasePriority_( Aig_Man_t * pAig, Abc_Cex_t * p else if ( f == 0 ) Vec_IntPush( vFramePPsOne, Abc_Var2Lit( nPrioOffset + Saig_ObjRegId(pAig, pObj), 0 ) ); else - { - Aig_Obj_t * pObj0 = Saig_ObjLoToLi(pAig, pObj); - int Value = Saig_ObjLoToLi(pAig, pObj)->iData; Vec_IntPush( vFramePPsOne, Saig_ObjLoToLi(pAig, pObj)->iData ); - } -//printf( "%d ", Vec_IntEntryLast(vFramePPsOne) ); } -//printf( "\n" ); // compute the PP info Saig_ManCexMinDerivePhasePriority( pAig, pCex, vFrameCis, vFramePPs, f, vRoots ); } |