From e3f87e189c880251c579b9fd22c04ca70b80f63d Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Thu, 19 Feb 2015 12:57:05 -0800 Subject: Propagating changes after updating flag of 'sop'. --- src/base/abci/abc.c | 6 +++++- src/base/abci/abcDebug.c | 2 +- src/base/abci/abcEspresso.c | 2 +- src/base/abci/abcFxu.c | 2 +- src/base/abci/abcIvy.c | 4 ++-- src/base/abci/abcMap.c | 2 +- src/base/abci/abcMffc.c | 4 ++-- src/base/abci/abcMfs.c | 6 +++--- src/base/abci/abcPrint.c | 2 +- src/base/abci/abcUnreach.c | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) (limited to 'src/base/abci') diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index acaee90f..66ab8f89 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -10883,6 +10883,10 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv ) // extern void Cba_PrsReadBlifTest(); // Cba_PrsReadBlifTest(); } + { + extern void Tab_DecomposeTest(); + Tab_DecomposeTest(); + } return 0; usage: Abc_Print( -2, "usage: test [-CKDNM] [-aovwh] \n" ); @@ -17240,7 +17244,7 @@ int Abc_CommandRetime( Abc_Frame_t * pAbc, int argc, char ** argv ) } // get the network in the SOP form - if ( !Abc_NtkToSop(pNtk, 0, ABC_INFINITY) ) + if ( !Abc_NtkToSop(pNtk, -1, ABC_INFINITY) ) { Abc_Print( -1, "Converting to SOPs has failed.\n" ); return 0; diff --git a/src/base/abci/abcDebug.c b/src/base/abci/abcDebug.c index b3618cfc..9faf08c9 100644 --- a/src/base/abci/abcDebug.c +++ b/src/base/abci/abcDebug.c @@ -199,7 +199,7 @@ Abc_Ntk_t * Abc_NtkAutoDebugModify( Abc_Ntk_t * pNtkInit, int Step, int fConst1 Abc_NtkSweep( pNtk, 0 ); Abc_NtkCleanupSeq( pNtk, 0, 0, 0 ); - Abc_NtkToSop( pNtk, 0, ABC_INFINITY ); + Abc_NtkToSop( pNtk, -1, ABC_INFINITY ); Abc_NtkCycleInitStateSop( pNtk, 50, 0 ); return pNtk; } diff --git a/src/base/abci/abcEspresso.c b/src/base/abci/abcEspresso.c index 42ed2806..2da389da 100644 --- a/src/base/abci/abcEspresso.c +++ b/src/base/abci/abcEspresso.c @@ -58,7 +58,7 @@ void Abc_NtkEspresso( Abc_Ntk_t * pNtk, int fVerbose ) Abc_NtkMapToSop(pNtk); else if ( Abc_NtkHasBdd(pNtk) ) { - if ( !Abc_NtkBddToSop(pNtk, 0, ABC_INFINITY) ) + if ( !Abc_NtkBddToSop(pNtk, -1, ABC_INFINITY) ) { printf( "Abc_NtkEspresso(): Converting to SOPs has failed.\n" ); return; diff --git a/src/base/abci/abcFxu.c b/src/base/abci/abcFxu.c index 942f8c6d..d2221f4e 100644 --- a/src/base/abci/abcFxu.c +++ b/src/base/abci/abcFxu.c @@ -91,7 +91,7 @@ int Abc_NtkFastExtract( Abc_Ntk_t * pNtk, Fxu_Data_t * p ) // Abc_NtkBddToSop(pNtk); } // get the network in the SOP form - if ( !Abc_NtkToSop(pNtk, 0, ABC_INFINITY) ) + if ( !Abc_NtkToSop(pNtk, -1, ABC_INFINITY) ) { printf( "Abc_NtkFastExtract(): Converting to SOPs has failed.\n" ); return 0; diff --git a/src/base/abci/abcIvy.c b/src/base/abci/abcIvy.c index bc1a6090..27926af4 100644 --- a/src/base/abci/abcIvy.c +++ b/src/base/abci/abcIvy.c @@ -88,7 +88,7 @@ Ivy_Man_t * Abc_NtkIvyBefore( Abc_Ntk_t * pNtk, int fSeq, int fUseDc ) assert( !Abc_NtkIsNetlist(pNtk) ); if ( Abc_NtkIsBddLogic(pNtk) ) { - if ( !Abc_NtkBddToSop(pNtk, 0, ABC_INFINITY) ) + if ( !Abc_NtkBddToSop(pNtk, -1, ABC_INFINITY) ) { printf( "Abc_NtkIvyBefore(): Converting to SOPs has failed.\n" ); return NULL; @@ -634,7 +634,7 @@ Abc_Ntk_t * Abc_NtkIvy( Abc_Ntk_t * pNtk ) assert( !Abc_NtkIsNetlist(pNtk) ); if ( Abc_NtkIsBddLogic(pNtk) ) { - if ( !Abc_NtkBddToSop(pNtk, 0, ABC_INFINITY) ) + if ( !Abc_NtkBddToSop(pNtk, -1, ABC_INFINITY) ) { Vec_IntFree( vInit ); printf( "Abc_NtkIvy(): Converting to SOPs has failed.\n" ); diff --git a/src/base/abci/abcMap.c b/src/base/abci/abcMap.c index 46c8dec1..c1c05b0e 100644 --- a/src/base/abci/abcMap.c +++ b/src/base/abci/abcMap.c @@ -561,7 +561,7 @@ Abc_Ntk_t * Abc_NtkFromMapSuperChoice( Map_Man_t * pMan, Abc_Ntk_t * pNtk ) // duplicate the network pNtkNew2 = Abc_NtkDup( pNtk ); pNtkNew = Abc_NtkMulti( pNtkNew2, 0, 20, 0, 0, 1, 0 ); - if ( !Abc_NtkBddToSop( pNtkNew, 0, ABC_INFINITY ) ) + if ( !Abc_NtkBddToSop( pNtkNew, -1, ABC_INFINITY ) ) { printf( "Abc_NtkFromMapSuperChoice(): Converting to SOPs has failed.\n" ); return NULL; diff --git a/src/base/abci/abcMffc.c b/src/base/abci/abcMffc.c index 1c53a153..1d64df5c 100644 --- a/src/base/abci/abcMffc.c +++ b/src/base/abci/abcMffc.c @@ -389,7 +389,7 @@ void Abc_NktMffcPrint( char * pFileName, Abc_Obj_t ** pNodes, int nNodes, Vec_Pt Abc_Obj_t * pObj, * pFanin; int i, k; // convert the network - Abc_NtkToSop( pNodes[0]->pNtk, 0, ABC_INFINITY ); + Abc_NtkToSop( pNodes[0]->pNtk, -1, ABC_INFINITY ); // write the file pFile = fopen( pFileName, "wb" ); fprintf( pFile, ".model %s_part\n", pNodes[0]->pNtk->pName ); @@ -430,7 +430,7 @@ void Abc_NktMffcPrintInt( char * pFileName, Abc_Ntk_t * pNtk, Vec_Int_t * vRoots Abc_Obj_t * pObj, * pFanin; int i, k; // convert the network - Abc_NtkToSop( pNtk, 0, ABC_INFINITY ); + Abc_NtkToSop( pNtk, -1, ABC_INFINITY ); // write the file pFile = fopen( pFileName, "wb" ); fprintf( pFile, ".model %s_part\n", pNtk->pName ); diff --git a/src/base/abci/abcMfs.c b/src/base/abci/abcMfs.c index d2ac549e..67ecf48d 100644 --- a/src/base/abci/abcMfs.c +++ b/src/base/abci/abcMfs.c @@ -261,7 +261,7 @@ int Abc_NtkPerformMfs( Abc_Ntk_t * pNtk, Sfm_Par_t * pPars ) return 0; } if ( !Abc_NtkHasSop(pNtk) ) - if ( !Abc_NtkToSop( pNtk, 0, ABC_INFINITY ) ) + if ( !Abc_NtkToSop( pNtk, -1, ABC_INFINITY ) ) { printf( "Conversion to SOP has failed due to low resource limit.\n" ); return 0; @@ -442,7 +442,7 @@ int Abc_NtkMfsAfterICheck( Abc_Ntk_t * p, int nFrames, int nFramesAdd, Vec_Int_t return 0; } if ( !Abc_NtkHasSop(p) ) - Abc_NtkToSop( p, 0, ABC_INFINITY ); + Abc_NtkToSop( p, -1, ABC_INFINITY ); // derive unfolded network pNtk = Abc_NtkUnrollAndDrop( p, nFrames, nFramesAdd, vFlops, &iPivot ); Io_WriteBlifLogic( pNtk, "unroll_dump.blif", 0 ); @@ -466,7 +466,7 @@ int Abc_NtkMfsAfterICheck( Abc_Ntk_t * p, int nFrames, int nFramesAdd, Vec_Int_t // perform final sweep Abc_NtkSweep( p, 0 ); if ( !Abc_NtkHasSop(p) ) - Abc_NtkToSop( p, 0, ABC_INFINITY ); + Abc_NtkToSop( p, -1, ABC_INFINITY ); return 1; } diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c index af598ed8..a6545085 100644 --- a/src/base/abci/abcPrint.c +++ b/src/base/abci/abcPrint.c @@ -1119,7 +1119,7 @@ void Abc_NtkPrintGates( Abc_Ntk_t * pNtk, int fUseLibrary ) // transform logic functions from BDD to SOP if ( (fHasBdds = Abc_NtkIsBddLogic(pNtk)) ) { - if ( !Abc_NtkBddToSop(pNtk, 0, ABC_INFINITY) ) + if ( !Abc_NtkBddToSop(pNtk, -1, ABC_INFINITY) ) { printf( "Abc_NtkPrintGates(): Converting to SOPs has failed.\n" ); return; diff --git a/src/base/abci/abcUnreach.c b/src/base/abci/abcUnreach.c index 8145c256..f7b4cfa3 100644 --- a/src/base/abci/abcUnreach.c +++ b/src/base/abci/abcUnreach.c @@ -337,7 +337,7 @@ Abc_Ntk_t * Abc_NtkConstructExdc( DdManager * dd, Abc_Ntk_t * pNtk, DdNode * bUn Abc_NtkLogicMakeSimpleCos( pNtkNew, 0 ); // transform the network to the SOP representation - if ( !Abc_NtkBddToSop( pNtkNew, 0, ABC_INFINITY ) ) + if ( !Abc_NtkBddToSop( pNtkNew, -1, ABC_INFINITY ) ) { printf( "Abc_NtkConstructExdc(): Converting to SOPs has failed.\n" ); return NULL; -- cgit v1.2.3