riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some fixes in libs/minisat (thanks to Siesh1oo)

This commit is contained in:
Clifford Wolf 2014-03-12 23:28:10 +01:00
parent 8127d5e8c3
commit a4d72de91d
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/minisat/Solver.cc
View File

@ -994,11 +994,11 @@ void Solver::printStats() const
{ {
double cpu_time = cpuTime(); double cpu_time = cpuTime();
double mem_used = memUsedPeak(); double mem_used = memUsedPeak();
printf("restarts : %"PRIu64"\n", starts); printf("restarts : %" PRIu64 "\n", starts);
printf("conflicts : %-12"PRIu64" (%.0f /sec)\n", conflicts , conflicts /cpu_time); printf("conflicts : %-12" PRIu64 " (%.0f /sec)\n", conflicts , conflicts /cpu_time);
printf("decisions : %-12"PRIu64" (%4.2f %% random) (%.0f /sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions /cpu_time); printf("decisions : %-12" PRIu64 " (%4.2f %% random) (%.0f /sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions /cpu_time);
printf("propagations : %-12"PRIu64" (%.0f /sec)\n", propagations, propagations/cpu_time); printf("propagations : %-12" PRIu64 " (%.0f /sec)\n", propagations, propagations/cpu_time);
printf("conflict literals : %-12"PRIu64" (%4.2f %% deleted)\n", tot_literals, (max_literals - tot_literals)*100 / (double)max_literals); printf("conflict literals : %-12" PRIu64 " (%4.2f %% deleted)\n", tot_literals, (max_literals - tot_literals)*100 / (double)max_literals);
if (mem_used != 0) printf("Memory used : %.2f MB\n", mem_used); if (mem_used != 0) printf("Memory used : %.2f MB\n", mem_used);
printf("CPU time : %g s\n", cpu_time); printf("CPU time : %g s\n", cpu_time);
} }

6
libs/minisat/System.cc
View File

@ -79,7 +79,7 @@ double Minisat::memUsed() {
struct rusage ru; struct rusage ru;
getrusage(RUSAGE_SELF, &ru); getrusage(RUSAGE_SELF, &ru);
return (double)ru.ru_maxrss / 1024; } return (double)ru.ru_maxrss / 1024; }
double Minisat::memUsedPeak() { return memUsed(); } double Minisat::memUsedPeak(bool) { return memUsed(); }
#elif defined(__APPLE__) #elif defined(__APPLE__)
@ -89,11 +89,11 @@ double Minisat::memUsed() {
malloc_statistics_t t; malloc_statistics_t t;
malloc_zone_statistics(NULL, &t); malloc_zone_statistics(NULL, &t);
return (double)t.max_size_in_use / (1024*1024); } return (double)t.max_size_in_use / (1024*1024); }
double Minisat::memUsedPeak() { return memUsed(); } double Minisat::memUsedPeak(bool) { return memUsed(); }
#else #else
double Minisat::memUsed() { return 0; } double Minisat::memUsed() { return 0; }
double Minisat::memUsedPeak() { return 0; } double Minisat::memUsedPeak(bool) { return 0; }
#endif #endif

3
libs/minisat/UPDATE.sh
View File

@ -7,6 +7,7 @@ mv minisat_upstream/LICENSE minisat_upstream/minisat/*/*.{h,cc} .
rm -rf minisat_upstream rm -rf minisat_upstream
sed -i -e 's,^#include *"minisat/[^/]\+,#include "libs/minisat,' *.cc *.h sed -i -e 's,^#include *"minisat/[^/]\+,#include "libs/minisat,' *.cc *.h
sed -i -e 's/PRIi64/ & /' Options.h sed -i -e 's/Minisat::memUsedPeak()/Minisat::memUsedPeak(bool)/' System.cc
sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc
sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc
sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc