diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2020-02-23 16:35:59 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2020-02-23 16:35:59 -0800 |
| commit | f43393107575afaf3ebb1554c063534192950294 (patch) | |
| tree | 0188b16fdc7f5720ebbaa0a9e26dca9fb25aa4b3 | |
| parent | c8894603b2f92bcc20064167cdbda4a28feeba85 (diff) | |
| download | abc-f43393107575afaf3ebb1554c063534192950294.tar.gz abc-f43393107575afaf3ebb1554c063534192950294.tar.bz2 abc-f43393107575afaf3ebb1554c063534192950294.zip | |
Adding commands to generate data for experiments.
| -rw-r--r-- | abcexe.dsp | 4 | ||||
| -rw-r--r-- | src/aig/gia/gia.h | 8 | ||||
| -rw-r--r-- | src/aig/gia/giaMan.c | 7 | ||||
| -rw-r--r-- | src/base/abci/abc.c | 2 |
4 files changed, 16 insertions, 5 deletions
@@ -88,10 +88,6 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\src\base\abci\abc.c -# End Source File -# Begin Source File - SOURCE=.\src\base\main\main.c # End Source File # End Group diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 0efc263b..0e281b7c 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -208,6 +208,7 @@ struct Gia_Man_t_ int nSimWordsMax; Vec_Wrd_t * vSims; Vec_Wrd_t * vSimsPi; + Vec_Wrd_t * vSimsPo; Vec_Int_t * vClassOld; Vec_Int_t * vClassNew; // incremental simulation @@ -231,6 +232,13 @@ struct Gia_Man_t_ Vec_Wrd_t * vSuppWords; // support information Vec_Int_t vCopiesTwo; // intermediate copies Vec_Int_t vSuppVars; // used variables + // additional info + char * pUserFile; + Gia_Man_t * pUserSpec; + Gia_Man_t * pUserAig; + Vec_Ptr_t * vUserNames; + Vec_Wec_t * vUserNodes; + Vec_Int_t * vUserArray; }; diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 8df96ee0..2c10bedf 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -88,6 +88,12 @@ void Gia_ManStop( Gia_Man_t * p ) assert( p->pManTime == NULL ); Vec_PtrFreeFree( p->vNamesIn ); Vec_PtrFreeFree( p->vNamesOut ); + ABC_FREE( p->pUserFile ); + Gia_ManStopP( &p->pUserSpec ); + Gia_ManStopP( &p->pUserAig ); + Vec_PtrFreeFree( p->vUserNames ); + Vec_WecFreeP( &p->vUserNodes ); + Vec_IntFreeP( &p->vUserArray ); Vec_IntFreeP( &p->vSwitching ); Vec_IntFreeP( &p->vSuper ); Vec_IntFreeP( &p->vStore ); @@ -95,6 +101,7 @@ void Gia_ManStop( Gia_Man_t * p ) Vec_IntFreeP( &p->vClassOld ); Vec_WrdFreeP( &p->vSims ); Vec_WrdFreeP( &p->vSimsPi ); + Vec_WrdFreeP( &p->vSimsPo ); Vec_IntFreeP( &p->vTimeStamps ); Vec_FltFreeP( &p->vTiming ); Vec_VecFreeP( &p->vClockDoms ); diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 35098ab7..da4127cd 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -7280,7 +7280,7 @@ int Abc_CommandRunTest( Abc_Frame_t * pAbc, int argc, char ** argv ) goto usage; } } - if ( argc - globalUtilOptind < 2 || argc - globalUtilOptind > 3 ) + if ( argc - globalUtilOptind < 2 || argc - globalUtilOptind > 5 ) { Abc_Print( 1, "Expecting two or three file names on the command line.\n" ); goto usage; |