luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #287 from gadfort/correct-prefix 

ensure initial library writing also honors prefix
This commit is contained in:
alanminko 2024-04-16 06:22:46 -07:00 committed by GitHub
parent bc725b85de de060a26ad
commit 8a174ee865
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/scl/sclLibScl.c
View File

@ -570,7 +570,7 @@ int Abc_SclCountValidCells( SC_Lib * p )
n_valid_cells++; n_valid_cells++;
return n_valid_cells; return n_valid_cells;
} }
static void Abc_SclWriteLibrary( Vec_Str_t * vOut, SC_Lib * p, int nExtra ) static void Abc_SclWriteLibrary( Vec_Str_t * vOut, SC_Lib * p, int nExtra, int fUsePrefix )
{ {
SC_WireLoad * pWL; SC_WireLoad * pWL;
SC_WireLoadSel * pWLS; SC_WireLoadSel * pWLS;
@ -624,13 +624,13 @@ static void Abc_SclWriteLibrary( Vec_Str_t * vOut, SC_Lib * p, int nExtra )
// Write 'cells' vector: // Write 'cells' vector:
n_valid_cells = Abc_SclCountValidCells( p ); n_valid_cells = Abc_SclCountValidCells( p );
Vec_StrPutI( vOut, n_valid_cells + nExtra ); Vec_StrPutI( vOut, n_valid_cells + nExtra );
Abc_SclWriteLibraryCellsOnly( vOut, p, (int)(nExtra > 0) ); Abc_SclWriteLibraryCellsOnly( vOut, p, fUsePrefix ? 1 : 0 );
} }
void Abc_SclWriteScl( char * pFileName, SC_Lib * p ) void Abc_SclWriteScl( char * pFileName, SC_Lib * p )
{ {
Vec_Str_t * vOut; Vec_Str_t * vOut;
vOut = Vec_StrAlloc( 10000 ); vOut = Vec_StrAlloc( 10000 );
Abc_SclWriteLibrary( vOut, p, 0 ); Abc_SclWriteLibrary( vOut, p, 0, 0 );
if ( Vec_StrSize(vOut) > 0 ) if ( Vec_StrSize(vOut) > 0 )
{ {
FILE * pFile = fopen( pFileName, "wb" ); FILE * pFile = fopen( pFileName, "wb" );
@ -870,7 +870,7 @@ SC_Lib * Abc_SclMergeLibraries( SC_Lib * pLib1, SC_Lib * pLib2, int fUsePrefix )
{ {
Vec_Str_t * vOut = Vec_StrAlloc( 10000 ); Vec_Str_t * vOut = Vec_StrAlloc( 10000 );
int n_valid_cells2 = Abc_SclCountValidCells( pLib2 ); int n_valid_cells2 = Abc_SclCountValidCells( pLib2 );
Abc_SclWriteLibrary( vOut, pLib1, n_valid_cells2 ); Abc_SclWriteLibrary( vOut, pLib1, n_valid_cells2, fUsePrefix );
Abc_SclWriteLibraryCellsOnly( vOut, pLib2, fUsePrefix ? 2 : 0 ); Abc_SclWriteLibraryCellsOnly( vOut, pLib2, fUsePrefix ? 2 : 0 );
SC_Lib * p = Abc_SclReadFromStr( vOut ); SC_Lib * p = Abc_SclReadFromStr( vOut );
p->pFileName = Abc_UtilStrsav( pLib1->pFileName ); p->pFileName = Abc_UtilStrsav( pLib1->pFileName );