diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2015-08-24 20:21:30 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2015-08-24 20:21:30 -0700 |
commit | 99e3e3bc7e1132d032103c7904ed6a2f75f0f5db (patch) | |
tree | 6c16f7579686f75e64e50203069417d4736970a8 | |
parent | 77d64787e07638ac9e44ee892e4d4db5b52686e1 (diff) | |
download | abc-99e3e3bc7e1132d032103c7904ed6a2f75f0f5db.tar.gz abc-99e3e3bc7e1132d032103c7904ed6a2f75f0f5db.tar.bz2 abc-99e3e3bc7e1132d032103c7904ed6a2f75f0f5db.zip |
Changes to be able to compile ABC without CUDD.
-rw-r--r-- | src/aig/ivy/ivyFraig.c | 4 | ||||
-rw-r--r-- | src/base/abci/abc.c | 15 | ||||
-rw-r--r-- | src/base/abci/abcDar.c | 2 | ||||
-rw-r--r-- | src/base/abci/abcNtbdd.c | 16 | ||||
-rw-r--r-- | src/base/io/ioReadEqn.c | 7 |
5 files changed, 43 insertions, 1 deletions
diff --git a/src/aig/ivy/ivyFraig.c b/src/aig/ivy/ivyFraig.c index 4a1487e7..059f4c0e 100644 --- a/src/aig/ivy/ivyFraig.c +++ b/src/aig/ivy/ivyFraig.c @@ -2659,10 +2659,13 @@ p->timeTrav += Abc_Clock() - clk; ABC_NAMESPACE_IMPL_END +#ifdef ABC_USE_CUDD #include "bdd/cudd/cuddInt.h" +#endif ABC_NAMESPACE_IMPL_START +#ifdef ABC_USE_CUDD /**Function************************************************************* @@ -2814,6 +2817,7 @@ int Ivy_FraigNodesAreEquivBdd( Ivy_Obj_t * pObj1, Ivy_Obj_t * pObj2 ) Vec_PtrFree( vFront ); return RetValue; } +#endif ABC_NAMESPACE_IMPL_END diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index ef08b09d..5d707a80 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -313,7 +313,9 @@ static int Abc_CommandBm2 ( Abc_Frame_t * pAbc, int argc, cha static int Abc_CommandSaucy ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandTestCex ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandPdr ( Abc_Frame_t * pAbc, int argc, char ** argv ); +#ifdef ABC_USE_CUDD static int Abc_CommandReconcile ( Abc_Frame_t * pAbc, int argc, char ** argv ); +#endif static int Abc_CommandCexSave ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandCexLoad ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandCexCut ( Abc_Frame_t * pAbc, int argc, char ** argv ); @@ -417,10 +419,12 @@ static int Abc_CommandAbc9Dch ( Abc_Frame_t * pAbc, int argc, cha static int Abc_CommandAbc9Rpm ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9BackReach ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9Posplit ( Abc_Frame_t * pAbc, int argc, char ** argv ); +#ifdef ABC_USE_CUDD static int Abc_CommandAbc9ReachM ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9ReachP ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9ReachN ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9ReachY ( Abc_Frame_t * pAbc, int argc, char ** argv ); +#endif static int Abc_CommandAbc9Undo ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9Iso ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandAbc9IsoNpn ( Abc_Frame_t * pAbc, int argc, char ** argv ); @@ -926,7 +930,9 @@ void Abc_Init( Abc_Frame_t * pAbc ) Cmd_CommandAdd( pAbc, "Verification", "saucy3", Abc_CommandSaucy, 1 ); Cmd_CommandAdd( pAbc, "Verification", "testcex", Abc_CommandTestCex, 0 ); Cmd_CommandAdd( pAbc, "Verification", "pdr", Abc_CommandPdr, 0 ); +#ifdef ABC_USE_CUDD Cmd_CommandAdd( pAbc, "Verification", "reconcile", Abc_CommandReconcile, 1 ); +#endif Cmd_CommandAdd( pAbc, "Verification", "cexsave", Abc_CommandCexSave, 0 ); Cmd_CommandAdd( pAbc, "Verification", "cexload", Abc_CommandCexLoad, 0 ); Cmd_CommandAdd( pAbc, "Verification", "cexcut", Abc_CommandCexCut, 0 ); @@ -1027,10 +1033,12 @@ void Abc_Init( Abc_Frame_t * pAbc ) Cmd_CommandAdd( pAbc, "ABC9", "&rpm", Abc_CommandAbc9Rpm, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&back_reach", Abc_CommandAbc9BackReach, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&posplit", Abc_CommandAbc9Posplit, 0 ); +#ifdef ABC_USE_CUDD Cmd_CommandAdd( pAbc, "ABC9", "&reachm", Abc_CommandAbc9ReachM, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&reachp", Abc_CommandAbc9ReachP, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&reachn", Abc_CommandAbc9ReachN, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&reachy", Abc_CommandAbc9ReachY, 0 ); +#endif Cmd_CommandAdd( pAbc, "ABC9", "&undo", Abc_CommandAbc9Undo, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&iso", Abc_CommandAbc9Iso, 0 ); Cmd_CommandAdd( pAbc, "ABC9", "&isonpn", Abc_CommandAbc9IsoNpn, 0 ); @@ -24652,6 +24660,8 @@ usage: return 1; } +#ifdef ABC_USE_CUDD + /**Function************************************************************* Synopsis [] @@ -24763,6 +24773,7 @@ usage: return 1; } +#endif /**Function************************************************************* @@ -34396,6 +34407,8 @@ usage: return 1; } +#ifdef ABC_USE_CUDD + /**Function************************************************************* Synopsis [] @@ -35010,6 +35023,8 @@ usage: return 1; } +#endif + /**Function************************************************************* Synopsis [] diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c index 7a9f8b66..523d6817 100644 --- a/src/base/abci/abcDar.c +++ b/src/base/abci/abcDar.c @@ -4692,7 +4692,7 @@ Aig_ManPrintStats( pMan ); extern void Llb_BddStructAnalysis( Aig_Man_t * pMan ); extern void Llb_NonlinExperiment( Aig_Man_t * pAig, int Num ); // Llb_BddStructAnalysis( pMan ); - Llb_ManMinCutTest( pMan, Num ); +// Llb_ManMinCutTest( pMan, Num ); // Llb_NonlinExperiment( pMan, Num ); } diff --git a/src/base/abci/abcNtbdd.c b/src/base/abci/abcNtbdd.c index 508d1741..112cceb9 100644 --- a/src/base/abci/abcNtbdd.c +++ b/src/base/abci/abcNtbdd.c @@ -19,7 +19,11 @@ ***********************************************************************/ #include "base/abc/abc.h" +#include "aig/saig/saig.h" + +#ifdef ABC_USE_CUDD #include "misc/extra/extraBdd.h" +#endif ABC_NAMESPACE_IMPL_START @@ -28,6 +32,8 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// +#ifdef ABC_USE_CUDD + static void Abc_NtkBddToMuxesPerform( Abc_Ntk_t * pNtk, Abc_Ntk_t * pNtkNew ); static Abc_Obj_t * Abc_NodeBddToMuxes( Abc_Obj_t * pNodeOld, Abc_Ntk_t * pNtkNew ); static Abc_Obj_t * Abc_NodeBddToMuxes_rec( DdManager * dd, DdNode * bFunc, Abc_Ntk_t * pNtkNew, st__table * tBdd2Node ); @@ -596,6 +602,16 @@ ABC_PRT( "Time", Abc_Clock() - clk ); Cudd_Quit( dd ); } +#else + +double Abc_NtkSpacePercentage( Abc_Obj_t * pNode ) { return 0.0; } +Abc_Ntk_t * Abc_NtkBddToMuxes( Abc_Ntk_t * pNtk ) { return NULL; } + +int Aig_ManVerifyUsingBdds( Aig_Man_t * pInit, Saig_ParBbr_t * pPars ) { return 0; } +void Bbr_ManSetDefaultParams( Saig_ParBbr_t * p ) {} + +#endif + //////////////////////////////////////////////////////////////////////// /// END OF FILE /// //////////////////////////////////////////////////////////////////////// diff --git a/src/base/io/ioReadEqn.c b/src/base/io/ioReadEqn.c index 1e4f5d46..999834d6 100644 --- a/src/base/io/ioReadEqn.c +++ b/src/base/io/ioReadEqn.c @@ -27,6 +27,8 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// +#ifdef ABC_USE_CUDD + static Abc_Ntk_t * Io_ReadEqnNetwork( Extra_FileReader_t * p ); static void Io_ReadEqnStrCompact( char * pStr ); static int Io_ReadEqnStrFind( Vec_Ptr_t * vTokens, char * pName ); @@ -233,6 +235,11 @@ void Io_ReadEqnStrCutAt( char * pStr, char * pStop, int fUniqueOnly, Vec_Ptr_t * Vec_PtrPush( vTokens, pToken ); } +#else + +Abc_Ntk_t * Io_ReadEqn( char * pFileName, int fCheck ) { return NULL; } + +#endif //////////////////////////////////////////////////////////////////////// /// END OF FILE /// |