diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-10 21:31:10 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-10 21:31:10 -0700 |
commit | 93d89eaaeb6f87d972d4ef29d7c858d2cceabe57 (patch) | |
tree | d2c75f745a00ebde565ae65090a3ba9f1b1c8ce2 /src/aig | |
parent | 9c8db2830f16b6deb50541c5693ed14a2240c659 (diff) | |
download | abc-93d89eaaeb6f87d972d4ef29d7c858d2cceabe57.tar.gz abc-93d89eaaeb6f87d972d4ef29d7c858d2cceabe57.tar.bz2 abc-93d89eaaeb6f87d972d4ef29d7c858d2cceabe57.zip |
Various modifications.
Diffstat (limited to 'src/aig')
-rw-r--r-- | src/aig/gia/gia.h | 9 | ||||
-rw-r--r-- | src/aig/gia/giaMan.c | 21 | ||||
-rw-r--r-- | src/aig/gia/giaUtil.c | 28 | ||||
-rw-r--r-- | src/aig/gia/module.make | 1 |
4 files changed, 56 insertions, 3 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index d7ddb317..65eca4ff 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -197,6 +197,7 @@ struct Gps_Par_t_ int fCut; int fNpn; int fLutProf; + int fMuxXor; char * pDumpFile; }; @@ -912,10 +913,14 @@ static inline int Gia_ObjLutFanin( Gia_Man_t * p, int Id, int i ) { re for ( i = p->nObjs - 1; (i > 0) && ((pObj) = Gia_ManObj(p, i)); i-- ) #define Gia_ManForEachAnd( p, pObj, i ) \ for ( i = 0; (i < p->nObjs) && ((pObj) = Gia_ManObj(p, i)); i++ ) if ( !Gia_ObjIsAnd(pObj) ) {} else +#define Gia_ManForEachAndId( p, i ) \ + for ( i = 0; (i < p->nObjs); i++ ) if ( !Gia_ObjIsAnd(Gia_ManObj(p, i)) ) {} else #define Gia_ManForEachCand( p, pObj, i ) \ for ( i = 0; (i < p->nObjs) && ((pObj) = Gia_ManObj(p, i)); i++ ) if ( !Gia_ObjIsCand(pObj) ) {} else #define Gia_ManForEachAndReverse( p, pObj, i ) \ for ( i = p->nObjs - 1; (i > 0) && ((pObj) = Gia_ManObj(p, i)); i-- ) if ( !Gia_ObjIsAnd(pObj) ) {} else +#define Gia_ManForEachAndReverseId( p, i ) \ + for ( i = p->nObjs - 1; (i > 0); i-- ) if ( !Gia_ObjIsAnd(Gia_ManObj(p, i)) ) {} else #define Gia_ManForEachMux( p, pObj, i ) \ for ( i = 0; (i < p->nObjs) && ((pObj) = Gia_ManObj(p, i)); i++ ) if ( !Gia_ObjIsMuxId(p, i) ) {} else #define Gia_ManForEachCi( p, pObj, i ) \ @@ -928,6 +933,8 @@ static inline int Gia_ObjLutFanin( Gia_Man_t * p, int Id, int i ) { re for ( i = Vec_IntSize(p->vCos) - 1; (i >= 0) && ((pObj) = Gia_ManCo(p, i)); i-- ) #define Gia_ManForEachCoDriver( p, pObj, i ) \ for ( i = 0; (i < Vec_IntSize(p->vCos)) && ((pObj) = Gia_ObjFanin0(Gia_ManCo(p, i))); i++ ) +#define Gia_ManForEachCoDriverId( p, DriverId, i ) \ + for ( i = 0; (i < Vec_IntSize(p->vCos)) && (((DriverId) = Gia_ObjFaninId0p(p, Gia_ManCo(p, i))), 1); i++ ) #define Gia_ManForEachPi( p, pObj, i ) \ for ( i = 0; (i < Gia_ManPiNum(p)) && ((pObj) = Gia_ManCi(p, i)); i++ ) #define Gia_ManForEachPo( p, pObj, i ) \ @@ -1114,6 +1121,7 @@ extern int Gia_ManLutNum( Gia_Man_t * p ); extern int Gia_ManLutLevel( Gia_Man_t * p ); extern void Gia_ManSetRefsMapped( Gia_Man_t * p ); extern void Gia_ManSetIfParsDefault( void * pIfPars ); +extern void Gia_ManMappingVerify( Gia_Man_t * p ); extern Gia_Man_t * Gia_ManPerformMapping( Gia_Man_t * p, void * pIfPars, int fNormalized ); /*=== giaJf.c ===========================================================*/ extern void Jf_ManSetDefaultPars( Jf_Par_t * pPars ); @@ -1269,6 +1277,7 @@ extern Vec_Int_t * Gia_ManRequiredLevel( Gia_Man_t * p ); extern void Gia_ManCreateValueRefs( Gia_Man_t * p ); extern void Gia_ManCreateRefs( Gia_Man_t * p ); extern int * Gia_ManCreateMuxRefs( Gia_Man_t * p ); +extern void Gia_ManCountMuxXor( Gia_Man_t * p, int * pnMuxes, int * pnXors ); extern int Gia_ManCrossCut( Gia_Man_t * p, int fReverse ); extern int Gia_ManIsNormalized( Gia_Man_t * p ); extern Vec_Int_t * Gia_ManCollectPoIds( Gia_Man_t * p ); diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 6d5a8e92..3b9e6d3b 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -423,9 +423,24 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars ) Abc_Print( 1, " ch =%5d", Gia_ManEquivCountClasses(p) ); if ( p->pMuxes ) { - Abc_Print( 1, " and =%5d", Gia_ManAndNum(p)-Gia_ManXorNum(p)-Gia_ManMuxNum(p) ); - Abc_Print( 1, " xor =%5d", Gia_ManXorNum(p) ); - Abc_Print( 1, " mux =%5d", Gia_ManMuxNum(p) ); + int nAnds = Gia_ManAndNum(p)-Gia_ManXorNum(p)-Gia_ManMuxNum(p); + int nXors = Gia_ManXorNum(p); + int nMuxes = Gia_ManMuxNum(p); + int nTotal = nAnds + 3*nXors + 3*nMuxes; + Abc_Print( 1, "\nXOR/MUX stats:" ); + Abc_Print( 1, " xor =%8d (%6.2f %%) ", nXors, 300.0*nXors/nTotal ); + Abc_Print( 1, " mux =%8d (%6.2f %%) ", nMuxes, 300.0*nMuxes/nTotal ); + Abc_Print( 1, " and =%8d (%6.2f %%) ", nAnds, 100.0*nAnds/nTotal ); + } + else if ( pPars->fMuxXor ) + { + int nAnds, nMuxes, nXors, nTotal = Gia_ManAndNum(p); + Gia_ManCountMuxXor( p, &nMuxes, &nXors ); + nAnds = Gia_ManAndNum(p)-3*nMuxes-3*nXors; + Abc_Print( 1, "\nXOR/MUX stats:" ); + Abc_Print( 1, " xor =%8d (%6.2f %%) ", nXors, 300.0*nXors/nTotal ); + Abc_Print( 1, " mux =%8d (%6.2f %%) ", nMuxes, 300.0*nMuxes/nTotal ); + Abc_Print( 1, " and =%8d (%6.2f %%) ", nAnds, 100.0*nAnds/nTotal ); } if ( pPars && pPars->fSwitch ) { diff --git a/src/aig/gia/giaUtil.c b/src/aig/gia/giaUtil.c index e16ee44f..365a8539 100644 --- a/src/aig/gia/giaUtil.c +++ b/src/aig/gia/giaUtil.c @@ -746,6 +746,34 @@ int * Gia_ManCreateMuxRefs( Gia_Man_t * p ) /**Function************************************************************* + Synopsis [Assigns references.] + + Description [] + + SideEffects [] + + SeeAlso [] + +***********************************************************************/ +void Gia_ManCountMuxXor( Gia_Man_t * p, int * pnMuxes, int * pnXors ) +{ + Gia_Obj_t * pObj, * pFan0, * pFan1; + int i; + *pnMuxes = 0; + *pnXors = 0; + Gia_ManForEachAnd( p, pObj, i ) + { + if ( !Gia_ObjIsMuxType(pObj) ) + continue; + if ( Gia_ObjRecognizeExor(pObj, &pFan0, &pFan1) ) + (*pnXors)++; + else + (*pnMuxes)++; + } +} + +/**Function************************************************************* + Synopsis [Computes the maximum frontier size.] Description [] diff --git a/src/aig/gia/module.make b/src/aig/gia/module.make index 366c4423..2f04b372 100644 --- a/src/aig/gia/module.make +++ b/src/aig/gia/module.make @@ -33,6 +33,7 @@ SRC += src/aig/gia/giaAig.c \ src/aig/gia/giaIso3.c \ src/aig/gia/giaJf.c \ src/aig/gia/giaKf.c \ + src/aig/gia/giaLf.c \ src/aig/gia/giaMan.c \ src/aig/gia/giaMem.c \ src/aig/gia/giaMfs.c \ |