luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing option 'if -G <num>' after changes.

This commit is contained in:
Alan Mishchenko 2014-07-25 08:58:20 -07:00
parent e6db0f1142
commit 9bfe2ad73a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/map/if/ifDelay.c
View File

@ -78,16 +78,16 @@ int If_CutDelaySop( If_Man_t * p, If_Cut_t * pCut )
if ( Vec_IntSize(vCover) == 0 ) if ( Vec_IntSize(vCover) == 0 )
return -1; return -1;
// mark the output as complemented // mark the output as complemented
// vAnds = If_CutDelaySopAnds( p, pCut, p->vCover, RetValue ^ pCut->fCompl ); // vAnds = If_CutDelaySopAnds( p, pCut, vCover, RetValue ^ pCut->fCompl );
if ( Vec_IntSize(p->vCover) > p->pPars->nGateSize ) if ( Vec_IntSize(vCover) > p->pPars->nGateSize )
return ABC_INFINITY; return -1;
// set the area cost // set the area cost
assert( If_CutLeaveNum(pCut) >= 0 && If_CutLeaveNum(pCut) <= 16 ); assert( If_CutLeaveNum(pCut) >= 0 && If_CutLeaveNum(pCut) <= 16 );
// compute the gate delay // compute the gate delay
nLitMax = If_CutMaxCubeSize( p->vCover, If_CutLeaveNum(pCut) ); nLitMax = If_CutMaxCubeSize( vCover, If_CutLeaveNum(pCut) );
if ( Vec_IntSize(p->vCover) < 2 ) if ( Vec_IntSize(vCover) < 2 )
{ {
pCut->Cost = Vec_IntSize(p->vCover); pCut->Cost = Vec_IntSize(vCover);
Delay = (int)(GateDelays[If_CutLeaveNum(pCut)] + 0.5); Delay = (int)(GateDelays[If_CutLeaveNum(pCut)] + 0.5);
DelayMax = 0; DelayMax = 0;
If_CutForEachLeaf( p, pCut, pLeaf, i ) If_CutForEachLeaf( p, pCut, pLeaf, i )
@ -95,7 +95,7 @@ int If_CutDelaySop( If_Man_t * p, If_Cut_t * pCut )
} }
else else
{ {
pCut->Cost = Vec_IntSize(p->vCover) + 1; pCut->Cost = Vec_IntSize(vCover) + 1;
Delay = (int)(GateDelays[If_CutLeaveNum(pCut)] + GateDelays[nLitMax] + 0.5); Delay = (int)(GateDelays[If_CutLeaveNum(pCut)] + GateDelays[nLitMax] + 0.5);
DelayMax = 0; DelayMax = 0;
If_CutForEachLeaf( p, pCut, pLeaf, i ) If_CutForEachLeaf( p, pCut, pLeaf, i )

4
src/map/if/ifMan.c
View File

@ -70,7 +70,7 @@ If_Man_t * If_ManStart( If_Par_t * pPars )
p->vTtMem[v] = Vec_MemAllocForTT( v, pPars->fUseTtPerm ); p->vTtMem[v] = Vec_MemAllocForTT( v, pPars->fUseTtPerm );
for ( v = 0; v < 6; v++ ) for ( v = 0; v < 6; v++ )
p->vTtMem[v] = p->vTtMem[6]; p->vTtMem[v] = p->vTtMem[6];
if ( p->pPars->fDelayOpt ) if ( p->pPars->fDelayOpt || pPars->nGateSize > 0 )
{ {
for ( v = 6; v <= Abc_MaxInt(6,p->pPars->nLutSize); v++ ) for ( v = 6; v <= Abc_MaxInt(6,p->pPars->nLutSize); v++ )
p->vTtIsops[v] = Vec_WecAlloc( 1000 ); p->vTtIsops[v] = Vec_WecAlloc( 1000 );
@ -79,7 +79,7 @@ If_Man_t * If_ManStart( If_Par_t * pPars )
for ( v = 0; v < 6; v++ ) for ( v = 0; v < 6; v++ )
p->vTtIsops[v] = p->vTtIsops[6]; p->vTtIsops[v] = p->vTtIsops[6];
} }
if ( p->pPars->fDelayOpt || p->pPars->fDsdBalance ); if ( p->pPars->fDelayOpt || pPars->nGateSize > 0 || p->pPars->fDsdBalance );
{ {
p->vCover = Vec_IntAlloc( 0 ); p->vCover = Vec_IntAlloc( 0 );
p->vArray = Vec_IntAlloc( 1000 ); p->vArray = Vec_IntAlloc( 1000 );