summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2021-06-24 19:18:28 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2021-06-24 19:18:28 -0700
commit28ba2c52137883b4acc46b2d31edf717822e543f (patch)
tree314ff9d902ab76f7c57bc783611288d963787caf
parentb4f099c511f66dfe6624ac26194abb90e9615cfd (diff)
downloadabc-28ba2c52137883b4acc46b2d31edf717822e543f.tar.gz
abc-28ba2c52137883b4acc46b2d31edf717822e543f.tar.bz2
abc-28ba2c52137883b4acc46b2d31edf717822e543f.zip
Adding place holder file for resub experiments.
-rw-r--r--abclib.dsp4
-rw-r--r--src/aig/gia/giaMinLut2.c2
-rw-r--r--src/aig/gia/giaResub3.c54
-rw-r--r--src/aig/gia/module.make1
-rw-r--r--src/base/abci/abc.c13
5 files changed, 67 insertions, 7 deletions
diff --git a/abclib.dsp b/abclib.dsp
index e0bf8754..fcbe343b 100644
--- a/abclib.dsp
+++ b/abclib.dsp
@@ -5103,6 +5103,10 @@ SOURCE=.\src\aig\gia\giaResub2.c
# End Source File
# Begin Source File
+SOURCE=.\src\aig\gia\giaResub3.c
+# End Source File
+# Begin Source File
+
SOURCE=.\src\aig\gia\giaRetime.c
# End Source File
# Begin Source File
diff --git a/src/aig/gia/giaMinLut2.c b/src/aig/gia/giaMinLut2.c
index a53e7be5..69ed6f3b 100644
--- a/src/aig/gia/giaMinLut2.c
+++ b/src/aig/gia/giaMinLut2.c
@@ -683,6 +683,7 @@ Gia_Man_t * Gia_TryPermOpt( word * pTruths, int nIns, int nOuts, int nWords, int
Abc_TtCopy( pTruthDup, pTruths, nOuts*nWords, 0 );
if ( fVerbose )
printf( "\n" );
+ nNodesAll = 0;
}
if ( fVerbose )
printf( "Best round %3d. Best nodes %5d. ", rBest, nNodesBest );
@@ -728,7 +729,6 @@ void Abc_Tt6MinTest2( Gia_Man_t * p )
word * pTruth = ABC_ALLOC( word, 3*nWords );
word * pRes = NULL, * pTruths[3] = { pTruth, pTruth+nWords, pTruth+2*nWords };
- Gia_Man_t * pNew = NULL;
Vec_Int_t * vSupp = Vec_IntAlloc( 100 );
Vec_Wrd_t * vNodes = Vec_WrdAlloc( 100 );
Vec_Wec_t * vNodes2 = Vec_WecAlloc( 100 );
diff --git a/src/aig/gia/giaResub3.c b/src/aig/gia/giaResub3.c
new file mode 100644
index 00000000..71e182d1
--- /dev/null
+++ b/src/aig/gia/giaResub3.c
@@ -0,0 +1,54 @@
+/**CFile****************************************************************
+
+ FileName [giaResub3.c]
+
+ SystemName [ABC: Logic synthesis and verification system.]
+
+ PackageName [Scalable AIG package.]
+
+ Synopsis [Resubstitution computation.]
+
+ Author [Alan Mishchenko]
+
+ Affiliation [UC Berkeley]
+
+ Date [Ver. 1.0. Started - June 20, 2005.]
+
+ Revision [$Id: giaResub3.c,v 1.00 2005/06/20 00:00:00 alanmi Exp $]
+
+***********************************************************************/
+
+#include "gia.h"
+
+ABC_NAMESPACE_IMPL_START
+
+////////////////////////////////////////////////////////////////////////
+/// DECLARATIONS ///
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+/// FUNCTION DEFINITIONS ///
+////////////////////////////////////////////////////////////////////////
+
+/**Function*************************************************************
+
+ Synopsis []
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+Gia_Man_t * Gia_ManPerformNewResub( Gia_Man_t * p, int nWinCount, int nCutSize, int nProcs, int fVerbose )
+{
+ return NULL;
+}
+
+////////////////////////////////////////////////////////////////////////
+/// END OF FILE ///
+////////////////////////////////////////////////////////////////////////
+
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/aig/gia/module.make b/src/aig/gia/module.make
index ed6a9052..843d721b 100644
--- a/src/aig/gia/module.make
+++ b/src/aig/gia/module.make
@@ -62,6 +62,7 @@ SRC += src/aig/gia/giaAig.c \
src/aig/gia/giaQbf.c \
src/aig/gia/giaResub.c \
src/aig/gia/giaResub2.c \
+ src/aig/gia/giaResub3.c \
src/aig/gia/giaRetime.c \
src/aig/gia/giaRex.c \
src/aig/gia/giaSatEdge.c \
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 96cd2188..913a8981 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -48866,6 +48866,7 @@ usage:
***********************************************************************/
int Abc_CommandAbc9Test( Abc_Frame_t * pAbc, int argc, char ** argv )
{
+ extern Gia_Man_t * Gia_ManPerformNewResub( Gia_Man_t * p, int nWinCount, int nCutSize, int nProcs, int fVerbose );
extern void Gia_RsbEnumerateWindows( Gia_Man_t * p, int nInputsMax, int nLevelsMax );
extern int Gia_ManSumTotalOfSupportSizes( Gia_Man_t * p );
extern void Abc_Tt6MinTest2( Gia_Man_t * p );
@@ -48924,12 +48925,12 @@ int Abc_CommandAbc9Test( Abc_Frame_t * pAbc, int argc, char ** argv )
goto usage;
}
}
-// if ( pAbc->pGia == NULL )
-// {
-// Abc_Print( -1, "Abc_CommandAbc9Test(): There is no AIG.\n" );
-// return 1;
-// }
-// Abc_FrameUpdateGia( pAbc, Abc_Procedure(pAbc->pGia) );
+ if ( pAbc->pGia == NULL )
+ {
+ Abc_Print( -1, "Abc_CommandAbc9Test(): There is no AIG.\n" );
+ return 1;
+ }
+ Abc_FrameUpdateGia( pAbc, Gia_ManPerformNewResub(pAbc->pGia, 10, 8, 1, 1) );
// printf( "AIG in \"%s\" has the sum of output support sizes equal to %d.\n", pAbc->pGia->pSpec, Gia_ManSumTotalOfSupportSizes(pAbc->pGia) );
//Gia_ManExtractTest( pAbc->pGia );
//Abc_Tt6MinTest2( pAbc->pGia );