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

Updates to delay optimization project.

This commit is contained in:
Alan Mishchenko 2016-12-31 21:46:25 +07:00
parent 01924ca118
commit 8eb5d1896a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/opt/sbd/sbdCore.c
View File

@ -52,6 +52,7 @@ struct Sbd_Man_t_
abctime timeCnf; abctime timeCnf;
abctime timeSat; abctime timeSat;
abctime timeQbf; abctime timeQbf;
abctime timeNew;
abctime timeOther; abctime timeOther;
abctime timeTotal; abctime timeTotal;
Sbd_Sto_t * pSto; Sbd_Sto_t * pSto;
@ -440,7 +441,10 @@ int Sbd_ManWindow( Sbd_Man_t * p, int Pivot )
Gia_ObjSetTravIdCurrentId(p->pGia, 0); Gia_ObjSetTravIdCurrentId(p->pGia, 0);
Sbd_ManWindowSim_rec( p, Pivot ); Sbd_ManWindowSim_rec( p, Pivot );
if ( p->pPars->nWinSizeMax && Vec_IntSize(p->vWinObjs) > p->pPars->nWinSizeMax ) if ( p->pPars->nWinSizeMax && Vec_IntSize(p->vWinObjs) > p->pPars->nWinSizeMax )
{
p->timeWin += Abc_Clock() - clk;
return 0; return 0;
}
Sbd_ManUpdateOrder( p, Pivot ); Sbd_ManUpdateOrder( p, Pivot );
assert( Vec_IntSize(p->vDivVars) == Vec_IntSize(p->vDivValues) ); assert( Vec_IntSize(p->vDivVars) == Vec_IntSize(p->vDivValues) );
assert( Vec_IntSize(p->vDivVars) < Vec_IntSize(p->vWinObjs) ); assert( Vec_IntSize(p->vDivVars) < Vec_IntSize(p->vWinObjs) );
@ -466,7 +470,10 @@ int Sbd_ManWindow( Sbd_Man_t * p, int Pivot )
Vec_IntPush( p->vWinObjs, Abc_Lit2Var(Node) ); Vec_IntPush( p->vWinObjs, Abc_Lit2Var(Node) );
} }
if ( p->pPars->nWinSizeMax && Vec_IntSize(p->vWinObjs) > p->pPars->nWinSizeMax ) if ( p->pPars->nWinSizeMax && Vec_IntSize(p->vWinObjs) > p->pPars->nWinSizeMax )
{
p->timeWin += Abc_Clock() - clk;
return 0; return 0;
}
// compute controlability for node // compute controlability for node
if ( Vec_IntSize(p->vTfo) == 0 ) if ( Vec_IntSize(p->vTfo) == 0 )
Abc_TtFill( Sbd_ObjSim2(p, Pivot), p->pPars->nWords ); Abc_TtFill( Sbd_ObjSim2(p, Pivot), p->pPars->nWords );
@ -1855,13 +1862,16 @@ int Sbd_ManImplement2( Sbd_Man_t * p, int Pivot, int nStrs, Sbd_Str_t * pStrs )
assert( Vec_IntSize(p->vLutLevs) == iObjLast ); assert( Vec_IntSize(p->vLutLevs) == iObjLast );
for ( i = iObjLast; i < Gia_ManObjNum(p->pGia); i++ ) for ( i = iObjLast; i < Gia_ManObjNum(p->pGia); i++ )
{ {
assert( i == Vec_IntSize(p->vMirrors) );
Vec_IntPush( p->vMirrors, -1 ); Vec_IntPush( p->vMirrors, -1 );
Sbd_StoRefObj( p->pSto, i, i == Gia_ManObjNum(p->pGia)-1 ? Pivot : -1 ); Sbd_StoRefObj( p->pSto, i, i == Gia_ManObjNum(p->pGia)-1 ? Pivot : -1 );
} }
Sbd_StoDerefObj( p->pSto, Pivot ); Sbd_StoDerefObj( p->pSto, Pivot );
for ( i = iObjLast; i < Gia_ManObjNum(p->pGia); i++ ) for ( i = iObjLast; i < Gia_ManObjNum(p->pGia); i++ )
{ {
abctime clk = Abc_Clock();
int Delay = Sbd_StoComputeCutsNode( p->pSto, i ); int Delay = Sbd_StoComputeCutsNode( p->pSto, i );
p->timeCut += Abc_Clock() - clk;
assert( i == Vec_IntSize(p->vLutLevs) ); assert( i == Vec_IntSize(p->vLutLevs) );
Vec_IntPush( p->vLutLevs, Delay ); Vec_IntPush( p->vLutLevs, Delay );
Vec_IntPush( p->vObj2Var, 0 ); Vec_IntPush( p->vObj2Var, 0 );

2
src/opt/sbd/sbdWin.c
View File

@ -360,6 +360,7 @@ void Sbd_ManSolverPrint( Vec_Int_t * vSop )
} }
Cube[pInds[Abc_Lit2Var(Entry)]] = '1' - (char)Abc_LitIsCompl(Entry); Cube[pInds[Abc_Lit2Var(Entry)]] = '1' - (char)Abc_LitIsCompl(Entry);
} }
Supp = 0;
} }
void Sbd_ManSolveSelect( Gia_Man_t * p, Vec_Int_t * vMirrors, int Pivot, Vec_Int_t * vDivVars, Vec_Int_t * vDivValues, Vec_Int_t * vWinObjs, Vec_Int_t * vObj2Var, Vec_Int_t * vTfo, Vec_Int_t * vRoots ) void Sbd_ManSolveSelect( Gia_Man_t * p, Vec_Int_t * vMirrors, int Pivot, Vec_Int_t * vDivVars, Vec_Int_t * vDivValues, Vec_Int_t * vWinObjs, Vec_Int_t * vObj2Var, Vec_Int_t * vTfo, Vec_Int_t * vRoots )
{ {
@ -378,6 +379,7 @@ void Sbd_ManSolveSelect( Gia_Man_t * p, Vec_Int_t * vMirrors, int Pivot, Vec_Int
word Supp = Sbd_ManSolverSupp( vSop, pInds, &nVars ); word Supp = Sbd_ManSolverSupp( vSop, pInds, &nVars );
//Sbd_ManSolverPrint( vSop ); //Sbd_ManSolverPrint( vSop );
printf( "SAT with %d vars and %d cubes.\n", nVars, Vec_IntCountEntry(vSop, -1) ); printf( "SAT with %d vars and %d cubes.\n", nVars, Vec_IntCountEntry(vSop, -1) );
Supp = 0;
} }
Vec_IntFree( vTemp ); Vec_IntFree( vTemp );
Vec_IntFree( vSop ); Vec_IntFree( vSop );