diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-05-06 19:27:00 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-05-06 19:27:00 -0700 |
| commit | a0cc621566d5218fde3d82647ff3b32b5f8c09aa (patch) | |
| tree | a30d25d0dd10c7b94db7b6a9c74dc61232af71b2 | |
| parent | 80d161afaa335c4289e6f7057b6657e660ed87e7 (diff) | |
| download | abc-a0cc621566d5218fde3d82647ff3b32b5f8c09aa.tar.gz abc-a0cc621566d5218fde3d82647ff3b32b5f8c09aa.tar.bz2 abc-a0cc621566d5218fde3d82647ff3b32b5f8c09aa.zip | |
Trying to fix a mysterious bug in reading the library files.
| -rw-r--r-- | src/base/abci/abcMap.c | 8 | ||||
| -rw-r--r-- | src/base/seq/seqMapCore.c | 4 | ||||
| -rw-r--r-- | src/map/mapper/mapperLib.c | 29 |
3 files changed, 20 insertions, 21 deletions
diff --git a/src/base/abci/abcMap.c b/src/base/abci/abcMap.c index 33707b15..578727cc 100644 --- a/src/base/abci/abcMap.c +++ b/src/base/abci/abcMap.c @@ -78,8 +78,8 @@ Abc_Ntk_t * Abc_NtkMap( Abc_Ntk_t * pNtk, double DelayTarget, int fRecovery, int // derive the supergate library if ( Abc_FrameReadLibSuper() == NULL && Abc_FrameReadLibGen() ) { - printf( "A simple supergate library is derived from gate library \"%s\".\n", - Mio_LibraryReadName((Mio_Library_t *)Abc_FrameReadLibGen()) ); +// printf( "A simple supergate library is derived from gate library \"%s\".\n", +// Mio_LibraryReadName((Mio_Library_t *)Abc_FrameReadLibGen()) ); Map_SuperLibDeriveFromGenlib( (Mio_Library_t *)Abc_FrameReadLibGen() ); } @@ -432,8 +432,8 @@ Abc_Ntk_t * Abc_NtkSuperChoice( Abc_Ntk_t * pNtk ) // derive the supergate library if ( Abc_FrameReadLibSuper() == NULL && Abc_FrameReadLibGen() ) { - printf( "A simple supergate library is derived from gate library \"%s\".\n", - Mio_LibraryReadName((Mio_Library_t *)Abc_FrameReadLibGen()) ); +// printf( "A simple supergate library is derived from gate library \"%s\".\n", +// Mio_LibraryReadName((Mio_Library_t *)Abc_FrameReadLibGen()) ); Map_SuperLibDeriveFromGenlib( (Mio_Library_t *)Abc_FrameReadLibGen() ); } diff --git a/src/base/seq/seqMapCore.c b/src/base/seq/seqMapCore.c index cd1db3a7..db1da0bc 100644 --- a/src/base/seq/seqMapCore.c +++ b/src/base/seq/seqMapCore.c @@ -67,8 +67,8 @@ Abc_Ntk_t * Seq_MapRetime( Abc_Ntk_t * pNtk, int nMaxIters, int fVerbose ) // derive the supergate library if ( Abc_FrameReadLibSuper() == NULL && Abc_FrameReadLibGen() ) { - printf( "A simple supergate library is derived from gate library \"%s\".\n", - Mio_LibraryReadName(Abc_FrameReadLibGen()) ); +// printf( "A simple supergate library is derived from gate library \"%s\".\n", +// Mio_LibraryReadName(Abc_FrameReadLibGen()) ); Map_SuperLibDeriveFromGenlib( Abc_FrameReadLibGen() ); } p->pSuperLib = Abc_FrameReadLibSuper(); diff --git a/src/map/mapper/mapperLib.c b/src/map/mapper/mapperLib.c index bd7f9b87..a4476bdd 100644 --- a/src/map/mapper/mapperLib.c +++ b/src/map/mapper/mapperLib.c @@ -202,7 +202,7 @@ int Map_SuperLibDeriveFromGenlib( Mio_Library_t * pLib ) pNameGeneric = Extra_FileNameGeneric( Mio_LibraryReadName(pLib) ); sprintf( FileNameSuper, "%s.super", pNameGeneric ); ABC_FREE( pNameGeneric ); - + sprintf( CommandSuper, "super -l 1 -i 5 -d 10000000 -a 10000000 -t 100 %s", FileNameGenlib ); if ( Cmd_CommandExecute( pAbc, CommandSuper ) ) { @@ -218,15 +218,17 @@ int Map_SuperLibDeriveFromGenlib( Mio_Library_t * pLib ) //#else // unlink( FileNameGenlib ); //#endif + printf( "A simple supergate library is derived from gate library \"%s\".\n", Mio_LibraryReadName(pLib) ); + fflush( stdout ); sprintf( CommandRead, "read_super %s", FileNameSuper ); if ( Cmd_CommandExecute( pAbc, CommandRead ) ) { -#ifdef WIN32 - _unlink( FileNameSuper ); -#else - unlink( FileNameSuper ); -#endif +//#ifdef WIN32 +// _unlink( FileNameSuper ); +//#else +// unlink( FileNameSuper ); +//#endif fprintf( stdout, "Cannot execute command \"%s\".\n", CommandRead ); ABC_FREE( FileNameGenlib ); ABC_FREE( FileNameSuper ); @@ -234,19 +236,16 @@ int Map_SuperLibDeriveFromGenlib( Mio_Library_t * pLib ) ABC_FREE( CommandRead ); return 0; } - -/* // don't remove the intermediate file -#ifdef WIN32 - _unlink( FileNameSuper ); -#else - unlink( FileNameSuper ); -#endif -*/ +//#ifdef WIN32 +// _unlink( FileNameSuper ); +//#else +// unlink( FileNameSuper ); +//#endif ABC_FREE( FileNameGenlib ); ABC_FREE( FileNameSuper ); ABC_FREE( CommandSuper ); ABC_FREE( CommandRead ); - return 1; + return 1; } |