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

Improving set covering using unitary cost

This commit is contained in:
aletempiac 2023-11-16 15:33:19 +01:00
parent dcc960beba
commit b32bbdfef3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/acd/ac_decomposition.hpp
View File

@ -1080,7 +1080,8 @@ private:
} }
/* improve solution with local search */ /* improve solution with local search */
covering_improve( matrix, solution ); while ( covering_improve( matrix, solution ) )
;
/* compute best bound sets */ /* compute best bound sets */
uint32_t num_luts = 1 + solution[4]; uint32_t num_luts = 1 + solution[4];
@ -1202,7 +1203,7 @@ private:
float sort_cost = 0; float sort_cost = 0;
if constexpr ( UseHeuristic ) if constexpr ( UseHeuristic )
{ {
sort_cost = ( (float) cost ) / ( __builtin_popcountl( column ) ); sort_cost = 1.0f / ( __builtin_popcountl( column ) );
} }
else else
{ {
@ -1504,7 +1505,7 @@ private:
best_cost = std::numeric_limits<float>::max(); best_cost = std::numeric_limits<float>::max();
for ( uint32_t i = iter; i < matrix.size(); ++i ) for ( uint32_t i = iter; i < matrix.size(); ++i )
{ {
float local_cost = ( (float) matrix[i].cost ) / __builtin_popcountl( matrix[i].column & ~column ); float local_cost = 1.0f / __builtin_popcountl( matrix[i].column & ~column );
if ( local_cost < best_cost ) if ( local_cost < best_cost )
{ {
best = i; best = i;
@ -1517,7 +1518,7 @@ private:
++iter; ++iter;
} }
if ( __builtin_popcountl( column ) != combinations ) if ( __builtin_popcountl( column ) == combinations )
{ {
for ( uint32_t i = 0; i < iter; ++i ) for ( uint32_t i = 0; i < iter; ++i )
{ {