diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/base/io/ioReadBlifMv.c | 4 | ||||
-rw-r--r-- | src/map/if/if.h | 1 | ||||
-rw-r--r-- | src/map/if/ifMap.c | 39 | ||||
-rw-r--r-- | src/map/if/ifTime.c | 24 |
4 files changed, 4 insertions, 64 deletions
diff --git a/src/base/io/ioReadBlifMv.c b/src/base/io/ioReadBlifMv.c index 23dc9138..323c8273 100644 --- a/src/base/io/ioReadBlifMv.c +++ b/src/base/io/ioReadBlifMv.c @@ -120,8 +120,6 @@ static Io_MvVar_t * Abc_NtkMvVarDup( Abc_Ntk_t * pNtk, Io_MvVar_t * pVar ); static int Io_MvCharIsSpace( char s ) { return s == ' ' || s == '\t' || s == '\r' || s == '\n'; } static int Io_MvCharIsMvSymb( char s ) { return s == '(' || s == ')' || s == '{' || s == '}' || s == '-' || s == ',' || s == '!'; } -//static Vec_Vec_t * Io_MvExtractBoxInfo( Abc_Ntk_t * pNtk ); - extern void Abc_NtkStartMvVars( Abc_Ntk_t * pNtk ); //////////////////////////////////////////////////////////////////////// @@ -252,8 +250,6 @@ Abc_Ntk_t * Io_ReadBlifMv( char * pFileName, int fBlifMv, int fCheck ) Vec_PtrForEachEntry( char *, vGlobalLtlArray, pLtlProp, i ) Vec_PtrPush( pNtk->vLtlProperties, pLtlProp ); Vec_PtrFreeP( &vGlobalLtlArray ); - -// pNtk->vRealPos = Io_MvExtractBoxInfo( pNtk ); return pNtk; } diff --git a/src/map/if/if.h b/src/map/if/if.h index 6525a4d6..5bcdb110 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -192,7 +192,6 @@ struct If_Man_t_ int fNextRound; // set to 1 after the first round int nChoices; // the number of choice nodes Vec_Int_t * vSwitching; // switching activity of each node -// Vec_Int_t ** pDriverCuts; // temporary driver cuts int pPerm[3][IF_MAX_LUTSIZE]; // permutations unsigned uSharedMask; // mask of shared variables int nShared; // the number of shared variables diff --git a/src/map/if/ifMap.c b/src/map/if/ifMap.c index 85efe18e..d7240d5c 100644 --- a/src/map/if/ifMap.c +++ b/src/map/if/ifMap.c @@ -140,10 +140,6 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep If_Set_t * pCutSet; If_Cut_t * pCut0, * pCut1, * pCut; int i, k; - -// assert( p->pPars->fSeqMap || !If_ObjIsAnd(pObj->pFanin0) || pObj->pFanin0->pCutSet->nCuts > 1 ); -// assert( p->pPars->fSeqMap || !If_ObjIsAnd(pObj->pFanin1) || pObj->pFanin1->pCutSet->nCuts > 1 ); - assert( p->pPars->fSeqMap || !If_ObjIsAnd(pObj->pFanin0) || pObj->pFanin0->pCutSet->nCuts > 0 ); assert( p->pPars->fSeqMap || !If_ObjIsAnd(pObj->pFanin1) || pObj->pFanin1->pCutSet->nCuts > 0 ); @@ -155,39 +151,6 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep else if ( Mode == 1 ) pObj->EstRefs = (float)((2.0 * pObj->EstRefs + pObj->nRefs) / 3.0); } -/* - // process special cut - if ( p->pDriverCuts && p->pDriverCuts[pObj->Id] ) - { - pCut = If_ObjCutBest(pObj); - if ( pCut->nLeaves == 0 ) - { - pCut->nLeaves = Vec_IntSize( p->pDriverCuts[pObj->Id] ); - Vec_IntForEachEntry( p->pDriverCuts[pObj->Id], k, i ) - pCut->pLeaves[i] = k; - assert( pCut->pLeaves[0] <= pCut->pLeaves[1] ); -// if ( pObj->nRefs > 0 ) -// If_CutAreaRef( p, pCut ); - } - pCut->Delay = If_CutDelaySpecial( p, pCut, pObj->fDriver ); - pCut->Area = (Mode == 2)? 1 : If_CutAreaFlow( p, pCut ); - if ( p->pPars->fEdge ) - pCut->Edge = (Mode == 2)? 3 : If_CutEdgeFlow( p, pCut ); - if ( p->pPars->fPower ) - pCut->Power = (Mode == 2)? 0 : If_CutPowerFlow( p, pCut, pObj ); - - // prepare the cutset - pCutSet = If_ManSetupNodeCutSet( p, pObj ); - // copy best cut - If_CutCopy( p, pCutSet->ppCuts[pCutSet->nCuts++], If_ObjCutBest(pObj) ); - // add the trivial cut to the set - If_ManSetupCutTriv( p, pCutSet->ppCuts[pCutSet->nCuts++], pObj->Id ); - // free the cuts - If_ManDerefNodeCutSet( p, pObj ); - assert( pCutSet->nCuts == 2 ); - return; - } -*/ // deref the selected cut if ( Mode && pObj->nRefs > 0 ) If_CutAreaDeref( p, If_ObjCutBest(pObj) ); @@ -200,8 +163,6 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep if ( pCut->nLeaves > 0 ) { // recompute the parameters of the best cut -/// if ( p->pPars->pLutStruct ) -/// pCut->Delay = If_CutDelayLutStruct( p, pCut, p->pPars->pLutStruct, p->pPars->WireDelay ); if ( p->pPars->fUserRecLib ) { assert( Abc_NtkRecIsRunning() + Abc_NtkRecIsRunning2() + Abc_NtkRecIsRunning3() == 1 ); diff --git a/src/map/if/ifTime.c b/src/map/if/ifTime.c index ff7c377d..d42a874d 100644 --- a/src/map/if/ifTime.c +++ b/src/map/if/ifTime.c @@ -651,10 +651,7 @@ float If_CutDelay( If_Man_t * p, If_Obj_t * pObj, If_Cut_t * pCut ) { If_CutForEachLeaf( p, pCut, pLeaf, i ) { -// if ( p->pDriverCuts && p->pDriverCuts[pObj->Id] && (iLeaf = Vec_IntFind(p->pDriverCuts[pObj->Id], pLeaf->Id)) >= 0 ) -// DelayCur = If_ObjCutBest(pLeaf)->Delay + s_ExtraDel[pObj->fDriver][iLeaf]; -// else - DelayCur = If_ObjCutBest(pLeaf)->Delay + pLutDelays[0]; + DelayCur = If_ObjCutBest(pLeaf)->Delay + pLutDelays[0]; Delay = IF_MAX( Delay, DelayCur ); } } @@ -685,10 +682,7 @@ float If_CutDelay( If_Man_t * p, If_Obj_t * pObj, If_Cut_t * pCut ) { If_CutForEachLeaf( p, pCut, pLeaf, i ) { -// if ( p->pDriverCuts && p->pDriverCuts[pObj->Id] && (iLeaf = Vec_IntFind(p->pDriverCuts[pObj->Id], pLeaf->Id)) >= 0 ) -// DelayCur = If_ObjCutBest(pLeaf)->Delay + ((pObj->fDriver && iLeaf == 2) ? 0.0 : 1.0); -// else - DelayCur = If_ObjCutBest(pLeaf)->Delay + 1.0; + DelayCur = If_ObjCutBest(pLeaf)->Delay + 1.0; Delay = IF_MAX( Delay, DelayCur ); } } @@ -736,12 +730,7 @@ void If_CutPropagateRequired( If_Man_t * p, If_Obj_t * pObj, If_Cut_t * pCut, fl { Required = ObjRequired; If_CutForEachLeaf( p, pCut, pLeaf, i ) - { -// if ( p->pDriverCuts && p->pDriverCuts[pObj->Id] && (iLeaf = Vec_IntFind(p->pDriverCuts[pObj->Id], pLeaf->Id)) >= 0 ) -// pLeaf->Required = IF_MIN( pLeaf->Required, Required - s_ExtraDel[pObj->fDriver][iLeaf] ); -// else - pLeaf->Required = IF_MIN( pLeaf->Required, Required - pLutDelays[0] ); - } + pLeaf->Required = IF_MIN( pLeaf->Required, Required - pLutDelays[0] ); } } else @@ -759,12 +748,7 @@ void If_CutPropagateRequired( If_Man_t * p, If_Obj_t * pObj, If_Cut_t * pCut, fl { Required = ObjRequired; If_CutForEachLeaf( p, pCut, pLeaf, i ) - { -// if ( p->pDriverCuts && p->pDriverCuts[pObj->Id] && (iLeaf = Vec_IntFind(p->pDriverCuts[pObj->Id], pLeaf->Id)) >= 0 ) -// pLeaf->Required = IF_MIN( pLeaf->Required, Required - (float)((pObj->fDriver && iLeaf == 2) ? 0.0 : 1.0) ); -// else - pLeaf->Required = IF_MIN( pLeaf->Required, Required - (float)1.0 ); - } + pLeaf->Required = IF_MIN( pLeaf->Required, Required - (float)1.0 ); } } } |