summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2016-07-19 20:44:02 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2016-07-19 20:44:02 -0700
commit2ba46d52f03a028034e8efd26f1a915bdaa02821 (patch)
tree4a6c198e610b2115907770706df819721a42ff58
parent190dc376006d02fe84de6ad538e5153931989fd4 (diff)
downloadabc-2ba46d52f03a028034e8efd26f1a915bdaa02821.tar.gz
abc-2ba46d52f03a028034e8efd26f1a915bdaa02821.tar.bz2
abc-2ba46d52f03a028034e8efd26f1a915bdaa02821.zip
Extension in the detection code.
-rw-r--r--src/aig/gia/giaSweep.c3
-rw-r--r--src/base/abci/abc.c14
-rw-r--r--src/base/abci/abcDetect.c2
-rw-r--r--src/base/io/ioReadBench.c2
4 files changed, 15 insertions, 6 deletions
diff --git a/src/aig/gia/giaSweep.c b/src/aig/gia/giaSweep.c
index 3bb6487b..2d8e705b 100644
--- a/src/aig/gia/giaSweep.c
+++ b/src/aig/gia/giaSweep.c
@@ -665,6 +665,8 @@ Gia_Man_t * Gia_ManSweepWithBoxesAndDomains( Gia_Man_t * p, void * pParsS, int f
continue;
// find global equivalences
pClp = Gia_ManDupCollapse( pNew, pNew->pAigExtra, NULL, 1 );
+ //Gia_DumpAiger( pClp, p->pSpec, iDom, 2 );
+ //Gia_ManPrintStats( pClp, NULL );
// compute equivalences
Gia_ManSweepComputeOneDomainEquivs( pClp, pNew->vRegClasses, iDom, pParsS, fConst, fEquiv, fVerbose );
// transfer equivalences
@@ -728,6 +730,7 @@ Gia_Man_t * Gia_ManSweepWithBoxes( Gia_Man_t * p, void * pParsC, void * pParsS,
nFlops = Vec_IntCountEntry(pNew->vRegClasses, 1);
// find global equivalences
pClp = Gia_ManDupCollapse( pNew, pNew->pAigExtra, NULL, pParsC ? 0 : 1 );
+ //Gia_DumpAiger( pClp, p->pSpec, 1, 1 );
// compute equivalences
if ( pParsC )
Gia_ManFraigSweepPerform( pClp, pParsC );
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index bc411998..ebd6c368 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -7226,15 +7226,18 @@ usage:
***********************************************************************/
int Abc_CommandDetect( Abc_Frame_t * pAbc, int argc, char ** argv )
{
- extern void Abc_NtkDetectClassesTest( Abc_Ntk_t * pNtk, int fVerbose );
+ extern void Abc_NtkDetectClassesTest( Abc_Ntk_t * pNtk, int fSeq, int fVerbose );
Abc_Ntk_t * pNtk;
- int c, fVerbose = 0;
+ int c, fSeq = 0, fVerbose = 0;
pNtk = Abc_FrameReadNtk(pAbc);
Extra_UtilGetoptReset();
- while ( ( c = Extra_UtilGetopt( argc, argv, "vh" ) ) != EOF )
+ while ( ( c = Extra_UtilGetopt( argc, argv, "svh" ) ) != EOF )
{
switch ( c )
{
+ case 's':
+ fSeq ^= 1;
+ break;
case 'v':
fVerbose ^= 1;
break;
@@ -7254,12 +7257,13 @@ int Abc_CommandDetect( Abc_Frame_t * pAbc, int argc, char ** argv )
Abc_Print( -1, "Only applicable to a logic network.\n" );
return 1;
}
- Abc_NtkDetectClassesTest( pNtk, fVerbose );
+ Abc_NtkDetectClassesTest( pNtk, fSeq, fVerbose );
return 0;
usage:
- Abc_Print( -2, "usage: detect [-vh]\n" );
+ Abc_Print( -2, "usage: detect [-svh]\n" );
Abc_Print( -2, "\t detects properties of internal nodes\n" );
+ Abc_Print( -2, "\t-s : toggle using sequential circuit information [default = %s]\n", fSeq? "yes": "no" );
Abc_Print( -2, "\t-v : toggle verbose printout [default = %s]\n", fVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n");
return 1;
diff --git a/src/base/abci/abcDetect.c b/src/base/abci/abcDetect.c
index 8fa395e8..c87169b5 100644
--- a/src/base/abci/abcDetect.c
+++ b/src/base/abci/abcDetect.c
@@ -193,7 +193,7 @@ finish:
SeeAlso []
***********************************************************************/
-void Abc_NtkDetectClassesTest( Abc_Ntk_t * pNtk, int fVerbose )
+void Abc_NtkDetectClassesTest( Abc_Ntk_t * pNtk, int fSeq, int fVerbose )
{
printf( "This procedure is currently not used.\n" );
}
diff --git a/src/base/io/ioReadBench.c b/src/base/io/ioReadBench.c
index 4fb21ad1..4d038200 100644
--- a/src/base/io/ioReadBench.c
+++ b/src/base/io/ioReadBench.c
@@ -94,6 +94,7 @@ Abc_Ntk_t * Io_ReadBenchNetwork( Extra_FileReader_t * p )
// allocate the empty network
pNtk = Abc_NtkStartRead( Extra_FileReaderGetFileName(p) );
+ pNtk->nConstrs = 0;
// go through the lines of the file
vString = Vec_StrAlloc( 100 );
@@ -140,6 +141,7 @@ Abc_Ntk_t * Io_ReadBenchNetwork( Extra_FileReader_t * p )
pTerm = Abc_NtkCreatePo( pNtk );
Abc_ObjAddFanin( pTerm, pNet );
}
+ pNtk->nConstrs++;
}
else
{