Experiments with recent ideas.

abclib.dsp

@@ -729,10 +729,162 @@ SOURCE=.\src\base\test\test.c
 # Begin Group "abc2"
 
 # PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2_.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2_power.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Blifi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Blifo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Core.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Dup.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Equiv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Extract.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Flatten.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Func.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Fx.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Gia.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Insert.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Logic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Map.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Merge.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Mfs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Multi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Ntk.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Part.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Print.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Rec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Slack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Strash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Time.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Truth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Util.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Veri.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Verify.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2\abc2Vero.c
+# End Source File
 # End Group
 # Begin Group "abc2d"
 
 # PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\base\abc2d\abc2d.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2d\ast2.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2d\magic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2d\magic.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\base\abc2d\util.c
+# End Source File
 # End Group
 # End Group
 # Begin Group "bdd"
@@ -1447,6 +1599,10 @@ SOURCE=.\src\sat\bmc\bmcICheck.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\sat\bmc\bmcLilac.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\sat\bmc\bmcLoad.c
 # End Source File
 # Begin Source File

src/base/abci/abc.c

@@ -34054,7 +34054,7 @@ int Abc_CommandAbc9Test( Abc_Frame_t * pAbc, int argc, char ** argv )
 //    extern void Agi_ManTest( Gia_Man_t * pGia );
 //    extern void Gia_ManCheckFalseTest( Gia_Man_t * p, int nSlackMax );
 //    extern void Gia_ParTest( Gia_Man_t * p, int nWords, int nProcs );
-    extern void Gia_ManTulipTest( Gia_Man_t * p, int nFrames, int nTimeOut, int fVerbose );
+    extern void Gia_ManTulipTest( Gia_Man_t * p, int nFrames, int nWords, int nTimeOut, int fSim, int fVerbose );
 
     Extra_UtilGetoptReset();
     while ( ( c = Extra_UtilGetopt( argc, argv, "WPFsvh" ) ) != EOF )
@@ -34158,12 +34158,14 @@ int Abc_CommandAbc9Test( Abc_Frame_t * pAbc, int argc, char ** argv )
 //    Jf_ManTestCnf( pAbc->pGia );
 //    Gia_ManCheckFalseTest( pAbc->pGia, nFrames );
 //    Gia_ParTest( pAbc->pGia, nWords, nProcs );
-    Gia_ManTulipTest( pAbc->pGia, nFrames, 0, fVerbose );
+    Gia_ManTulipTest( pAbc->pGia, nFrames, nWords, 0, fSwitch, fVerbose );
+
     return 0;
 usage:
-    Abc_Print( -2, "usage: &test [-F num] [-svh]\n" );
+    Abc_Print( -2, "usage: &test [-FW num] [-svh]\n" );
     Abc_Print( -2, "\t        testing various procedures\n" );
     Abc_Print( -2, "\t-F num: the number of timeframes [default = %d]\n", nFrames );
+    Abc_Print( -2, "\t-W num: the number of machine words [default = %d]\n", nWords );
     Abc_Print( -2, "\t-s    : toggle enable (yes) vs. disable (no) [default = %s]\n", fSwitch? "yes": "no" );
     Abc_Print( -2, "\t-v    : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" );
     Abc_Print( -2, "\t-h    : print the command usage\n");

src/sat/bmc/bmcLilac.c

+/**CFile****************************************************************
+
+  FileName    [bmcLilac.c]
+
+  SystemName  [ABC: Logic synthesis and verification system.]
+
+  PackageName [SAT-based bounded model checking.]
+
+  Synopsis    []
+
+  Author      [Alan Mishchenko]
+  
+  Affiliation [UC Berkeley]
+
+  Date        [Ver. 1.0. Started - June 20, 2005.]
+
+  Revision    [$Id: bmcLilac.c,v 1.00 2005/06/20 00:00:00 alanmi Exp $]
+
+***********************************************************************/
+
+#include "bmc.h"
+
+ABC_NAMESPACE_IMPL_START
+
+
+////////////////////////////////////////////////////////////////////////
+///                        DECLARATIONS                              ///
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+///                     FUNCTION DEFINITIONS                         ///
+////////////////////////////////////////////////////////////////////////
+
+/**Function*************************************************************
+
+  Synopsis    []
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+void Bmc_LilacPerform( Gia_Man_t * p, Vec_Int_t * vInitA, Vec_Int_t * vInitB, int nFrames, int fVerbose )
+{
+}
+
+/**Function*************************************************************
+
+  Synopsis    []
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+void Bmc_LilacTest( Gia_Man_t * p, Vec_Int_t * vInit, int nFrames, int fVerbose )
+{
+}
+
+////////////////////////////////////////////////////////////////////////
+///                       END OF FILE                                ///
+////////////////////////////////////////////////////////////////////////
+
+
+ABC_NAMESPACE_IMPL_END
+

src/sat/bmc/module.make

@@ -9,6 +9,7 @@ SRC +=    src/sat/bmc/bmcBmc.c \
     src/sat/bmc/bmcCexTools.c \
     src/sat/bmc/bmcFault.c \
     src/sat/bmc/bmcICheck.c \
+    src/sat/bmc/bmcLilac.c \
     src/sat/bmc/bmcLoad.c \
     src/sat/bmc/bmcMulti.c \
     src/sat/bmc/bmcTulip.c \