diff options
Diffstat (limited to 'src/opt')
-rw-r--r-- | src/opt/lpk/lpkCore.c | 2 | ||||
-rw-r--r-- | src/opt/nwk/ntlnwk.h | 2 | ||||
-rw-r--r-- | src/opt/nwk/nwk.h | 4 | ||||
-rw-r--r-- | src/opt/nwk/nwkMan.c | 4 | ||||
-rw-r--r-- | src/opt/nwk/nwkSpeedup.c | 4 | ||||
-rw-r--r-- | src/opt/nwk/nwkTiming.c | 10 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/opt/lpk/lpkCore.c b/src/opt/lpk/lpkCore.c index f7f3d5c5..f060db9a 100644 --- a/src/opt/lpk/lpkCore.c +++ b/src/opt/lpk/lpkCore.c @@ -519,7 +519,7 @@ int Lpk_Resynthesize( Abc_Ntk_t * pNtk, Lpk_Par_t * pPars ) // get the number of inputs if ( Abc_FrameReadLibLut() ) - pPars->nLutSize = ((If_Lib_t *)Abc_FrameReadLibLut())->LutMax; + pPars->nLutSize = ((If_LibLut_t *)Abc_FrameReadLibLut())->LutMax; else pPars->nLutSize = Abc_NtkGetFaninMax( pNtk ); if ( pPars->nLutSize > 6 ) diff --git a/src/opt/nwk/ntlnwk.h b/src/opt/nwk/ntlnwk.h index 5300e6f4..968d70f4 100644 --- a/src/opt/nwk/ntlnwk.h +++ b/src/opt/nwk/ntlnwk.h @@ -86,7 +86,7 @@ extern ABC_DLL Aig_Man_t * Ntl_ManPrepareSec( char * pFileName1, char * pFileNam extern ABC_DLL Nwk_Man_t * Ntl_ManExtractNwk( Ntl_Man_t * p, Aig_Man_t * pAig, Tim_Man_t * pManTime ); extern ABC_DLL Nwk_Man_t * Ntl_ManReadNwk( char * pFileName, Aig_Man_t * pAig, Tim_Man_t * pManTime ); -extern ABC_DLL void Nwk_ManPrintStats( Nwk_Man_t * p, If_Lib_t * pLutLib, int fSaveBest, int fDumpResult, int fPower, Ntl_Man_t * pNtl ); +extern ABC_DLL void Nwk_ManPrintStats( Nwk_Man_t * p, If_LibLut_t * pLutLib, int fSaveBest, int fDumpResult, int fPower, Ntl_Man_t * pNtl ); extern ABC_DLL void Nwk_ManPrintStatsShort( Ntl_Man_t * p, Aig_Man_t * pAig, Nwk_Man_t * pNtk ); extern ABC_DLL void Nwk_ManPrintFanioNew( Nwk_Man_t * p ); extern ABC_DLL Nwk_Man_t * Nwk_MappingIf( Aig_Man_t * p, Tim_Man_t * pManTime, If_Par_t * pPars ); diff --git a/src/opt/nwk/nwk.h b/src/opt/nwk/nwk.h index e7e43b91..8e7bc6e1 100644 --- a/src/opt/nwk/nwk.h +++ b/src/opt/nwk/nwk.h @@ -72,7 +72,7 @@ struct Nwk_Man_t_ // functionality, timing, memory, etc Hop_Man_t * pManHop; // the functionality representation Tim_Man_t * pManTime; // the timing manager - If_Lib_t * pLutLib; // the LUT library + If_LibLut_t * pLutLib; // the LUT library Aig_MmFlex_t * pMemObjs; // memory for objects Vec_Ptr_t * vTemp; // array used for incremental updates int nTravIds; // the counter of traversal IDs @@ -255,7 +255,7 @@ extern ABC_DLL Vec_Ptr_t * Nwk_ManRetimeCutBackward( Nwk_Man_t * pMan, int n extern ABC_DLL Nwk_Man_t * Nwk_ManAlloc(); extern ABC_DLL void Nwk_ManFree( Nwk_Man_t * p ); extern ABC_DLL float Nwl_ManComputeTotalSwitching( Nwk_Man_t * pNtk ); -extern ABC_DLL void Nwk_ManPrintStats( Nwk_Man_t * p, If_Lib_t * pLutLib, int fSaveBest, int fDumpResult, int fPower, Ntl_Man_t * pNtl ); +extern ABC_DLL void Nwk_ManPrintStats( Nwk_Man_t * p, If_LibLut_t * pLutLib, int fSaveBest, int fDumpResult, int fPower, Ntl_Man_t * pNtl ); /*=== nwkMap.c ============================================================*/ extern ABC_DLL Nwk_Man_t * Nwk_MappingIf( Aig_Man_t * p, Tim_Man_t * pManTime, If_Par_t * pPars ); /*=== nwkObj.c ============================================================*/ diff --git a/src/opt/nwk/nwkMan.c b/src/opt/nwk/nwkMan.c index f286dc50..31624538 100644 --- a/src/opt/nwk/nwkMan.c +++ b/src/opt/nwk/nwkMan.c @@ -94,7 +94,7 @@ void Nwk_ManFree( Nwk_Man_t * p ) SeeAlso [] ***********************************************************************/ -void Nwk_ManPrintLutSizes( Nwk_Man_t * p, If_Lib_t * pLutLib ) +void Nwk_ManPrintLutSizes( Nwk_Man_t * p, If_LibLut_t * pLutLib ) { Nwk_Obj_t * pObj; int i, Counters[256] = {0}; @@ -231,7 +231,7 @@ float Nwl_ManComputeTotalSwitching( Nwk_Man_t * pNtk ) SeeAlso [] ***********************************************************************/ -void Nwk_ManPrintStats( Nwk_Man_t * pNtk, If_Lib_t * pLutLib, int fSaveBest, int fDumpResult, int fPower, Ntl_Man_t * pNtl ) +void Nwk_ManPrintStats( Nwk_Man_t * pNtk, If_LibLut_t * pLutLib, int fSaveBest, int fDumpResult, int fPower, Ntl_Man_t * pNtl ) { // extern int Ntl_ManLatchNum( Ntl_Man_t * p ); // extern void Ntl_ManWriteBlifLogic( Nwk_Man_t * pNtk, void * pNtl, char * pFileName ); diff --git a/src/opt/nwk/nwkSpeedup.c b/src/opt/nwk/nwkSpeedup.c index c8bd675a..14840ecb 100644 --- a/src/opt/nwk/nwkSpeedup.c +++ b/src/opt/nwk/nwkSpeedup.c @@ -159,7 +159,7 @@ unsigned Nwk_ManDelayTraceTCEdges( Nwk_Man_t * pNtk, Nwk_Obj_t * pNode, float tD { int pPinPerm[32]; float pPinDelays[32]; - If_Lib_t * pLutLib = fUseLutLib? pNtk->pLutLib : NULL; + If_LibLut_t * pLutLib = fUseLutLib? pNtk->pLutLib : NULL; Nwk_Obj_t * pFanin; unsigned uResult = 0; float tRequired, * pDelays; @@ -206,7 +206,7 @@ Aig_Man_t * Nwk_ManSpeedup( Nwk_Man_t * pNtk, int fUseLutLib, int Percentage, in Vec_Ptr_t * vTimeCries, * vTimeFanins; Nwk_Obj_t * pNode, * pFanin, * pFanin2; Aig_Obj_t * pAnd; - If_Lib_t * pTempLib = pNtk->pLutLib; + If_LibLut_t * pTempLib = pNtk->pLutLib; Tim_Man_t * pTempTim = NULL; float tDelta, tArrival; int i, k, k2, Counter, CounterRes, nTimeCris; diff --git a/src/opt/nwk/nwkTiming.c b/src/opt/nwk/nwkTiming.c index d62696b1..56326aba 100644 --- a/src/opt/nwk/nwkTiming.c +++ b/src/opt/nwk/nwkTiming.c @@ -130,7 +130,7 @@ int Nwk_ManWhereIsPin( Nwk_Obj_t * pFanout, Nwk_Obj_t * pFanin, int * pPinPerm ) ***********************************************************************/ float Nwk_NodeComputeArrival( Nwk_Obj_t * pObj, int fUseSorting ) { - If_Lib_t * pLutLib = pObj->pMan->pLutLib; + If_LibLut_t * pLutLib = pObj->pMan->pLutLib; int pPinPerm[32]; float pPinDelays[32]; Nwk_Obj_t * pFanin; @@ -190,7 +190,7 @@ float Nwk_NodeComputeArrival( Nwk_Obj_t * pObj, int fUseSorting ) ***********************************************************************/ float Nwk_NodeComputeRequired( Nwk_Obj_t * pObj, int fUseSorting ) { - If_Lib_t * pLutLib = pObj->pMan->pLutLib; + If_LibLut_t * pLutLib = pObj->pMan->pLutLib; int pPinPerm[32]; float pPinDelays[32]; Nwk_Obj_t * pFanout; @@ -263,7 +263,7 @@ float Nwk_NodeComputeRequired( Nwk_Obj_t * pObj, int fUseSorting ) ***********************************************************************/ float Nwk_NodePropagateRequired( Nwk_Obj_t * pObj, int fUseSorting ) { - If_Lib_t * pLutLib = pObj->pMan->pLutLib; + If_LibLut_t * pLutLib = pObj->pMan->pLutLib; int pPinPerm[32]; float pPinDelays[32]; Nwk_Obj_t * pFanin; @@ -327,7 +327,7 @@ float Nwk_ManDelayTraceLut( Nwk_Man_t * pNtk ) { Vec_Ptr_t * vObjs; int fUseSorting = 1; - If_Lib_t * pLutLib = pNtk->pLutLib; + If_LibLut_t * pLutLib = pNtk->pLutLib; Vec_Ptr_t * vNodes; Nwk_Obj_t * pObj; float tArrival, tRequired, tSlack; @@ -458,7 +458,7 @@ int Nwk_ManVerifyTiming( Nwk_Man_t * pNtk ) ***********************************************************************/ void Nwk_ManDelayTracePrint( Nwk_Man_t * pNtk ) { - If_Lib_t * pLutLib = pNtk->pLutLib; + If_LibLut_t * pLutLib = pNtk->pLutLib; Nwk_Obj_t * pNode; int i, Nodes, * pCounters; float tArrival, tDelta, nSteps, Num; |