diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2021-05-26 23:25:08 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2021-05-26 23:25:08 -0700 |
| commit | 8889ccb18c8da84fcb36abc226ff30702e2db215 (patch) | |
| tree | 8dbe62b23fdc887b5a267d21511df9830e21bfc7 /src | |
| parent | 49078ffebf4d87165c625a0dad249e039adeb952 (diff) | |
| download | abc-8889ccb18c8da84fcb36abc226ff30702e2db215.tar.gz abc-8889ccb18c8da84fcb36abc226ff30702e2db215.tar.bz2 abc-8889ccb18c8da84fcb36abc226ff30702e2db215.zip | |
Updating LUT synthesis code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/aig/gia/giaMan.c | 2 | ||||
| -rw-r--r-- | src/aig/gia/giaMinLut.c | 8 | ||||
| -rw-r--r-- | src/bool/kit/kitGraph.c | 3 | ||||
| -rw-r--r-- | src/map/if/ifTruth.c | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 51dd4250..b5748401 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -583,7 +583,7 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars ) Gia_ManPrintMappingStats( p, pPars ? pPars->pDumpFile : NULL ); else if ( pPars && pPars->pDumpFile ) Gia_ManLogAigStats( p, pPars->pDumpFile ); - if ( pPars && pPars->fNpn && Gia_ManHasMapping(p) && Gia_ManLutSizeMax(p) <= 4 ) + if ( pPars && pPars->fNpn && Gia_ManHasMapping(p) ) Gia_ManPrintNpnClasses( p ); if ( p->vPacking ) Gia_ManPrintPackingStats( p ); diff --git a/src/aig/gia/giaMinLut.c b/src/aig/gia/giaMinLut.c index 442c6d66..8cd66253 100644 --- a/src/aig/gia/giaMinLut.c +++ b/src/aig/gia/giaMinLut.c @@ -102,9 +102,7 @@ int Vec_WrdReadText2( char * pFileName, Vec_Wrd_t ** pvSimI ) printf( "Cannot open file \"%s\" for reading.\n", pFileName ); return 0; } - fgets( pLine, 1000, pFile ); - nIns = strlen(pLine)-1; - if ( nIns < 1 ) + if ( !fgets(pLine, 1000, pFile) || (nIns = strlen(pLine)-1) < 1 ) { printf( "Cannot find the number of inputs in file \"%s\".\n", pFileName ); fclose( pFile ); @@ -464,7 +462,7 @@ Gia_Man_t * Gia_ManPerformLNetOpt( Gia_Man_t * p, char * pFileName, int nIns, in word * pTruth1 = ABC_CALLOC( word, Abc_Truth6WordNum(nIns) ); int g, k; float CareAve = 0; if ( vSimI && fVerbose ) { - int nPats = 64*Vec_WrdSize(vSimI)/Gia_ManCiNum(p); + //int nPats = 64*Vec_WrdSize(vSimI)/Gia_ManCiNum(p); printf( "Density of input patterns %8.4f.\n", (float)Abc_TtCountOnesVec(Vec_WrdArray(vSimI), Vec_WrdSize(vSimI))/(64*Vec_WrdSize(vSimI)) ); printf( "Using patterns with count %d and higher as cares.\n", Thresh ); } @@ -724,7 +722,7 @@ Abc_Ntk_t * Gia_ManPerformLNetMap( Gia_Man_t * p, int GroupSize, int fUseFixed, #else -Gia_Man_t * Gia_ManPerformLNetMap( Gia_Man_t * p, int GroupSize, int fUseFixed, int fVerbose ) +Abc_Ntk_t * Gia_ManPerformLNetMap( Gia_Man_t * p, int GroupSize, int fUseFixed, int fVerbose ) { return NULL; } diff --git a/src/bool/kit/kitGraph.c b/src/bool/kit/kitGraph.c index 9d7189a2..a81b6404 100644 --- a/src/bool/kit/kitGraph.c +++ b/src/bool/kit/kitGraph.c @@ -19,6 +19,7 @@ ***********************************************************************/ #include "kit.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_IMPL_START @@ -385,7 +386,7 @@ Kit_Graph_t * Kit_TruthToGraph2( unsigned * pTruth0, unsigned * pTruth1, int nVa Kit_Graph_t * pGraph; int RetValue; // derive SOP - RetValue = Kit_TruthIsop2( pTruth0, pTruth1, nVars, vMemory, 1, 0 ); // tried 1 and found not useful in "renode" + RetValue = Kit_TruthIsop2( pTruth0, pTruth1, nVars, vMemory, 0, 0 ); // tried 1 and found not useful in "renode" if ( RetValue == -1 ) return NULL; if ( Vec_IntSize(vMemory) > (1<<16) ) diff --git a/src/map/if/ifTruth.c b/src/map/if/ifTruth.c index 83c40952..ae4bcea4 100644 --- a/src/map/if/ifTruth.c +++ b/src/map/if/ifTruth.c @@ -20,6 +20,7 @@ #include "if.h" #include "bool/kit/kit.h" +#include "misc/extra/extra.h" ABC_NAMESPACE_IMPL_START |