mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-07-16 20:25:43 +00:00
Code Activity

Merge pull request #194 from Silimate/sim_count_overflow_fix

Browse source 
Sim count overflow fix pow10
This commit is contained in:
Akash Levy 2026-06-25 03:41:14 -07:00 • committed by GitHub
commit 7449b008a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
passes/sat/sim.cc
View file

@ -32,6 +32,7 @@
#include <ctime>
#include <sstream>
#include <iomanip>
#include <cmath>
USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN
@ -62,14 +63,6 @@ struct scaled_time {
bool end;
};
static uint64_t pow10(int n)
{
int r = 1;
while (n--)
r *= 10;
return r;
}
static scaled_time stringToTime(std::string str)
{
if (str=="END") return {1, 0, true};
@ -1720,7 +1713,7 @@ struct SimWorker : SimShared
} else if (start_time.end)
startCount = fst->getEndTime();
else {
startCount = start_time.time * pow10(start_time.scale - fst->getScale());
startCount = (uint64_t)(start_time.time * std::pow(10.0, start_time.scale - fst->getScale()));
if (startCount > fst->getEndTime()) {
startCount = fst->getEndTime();
log_warning("Start time is after simulation file end time\n");
@ -1733,7 +1726,7 @@ struct SimWorker : SimShared
} else if (stop_time.end)
stopCount = fst->getEndTime();
else {
stopCount = stop_time.time * pow10(stop_time.scale - fst->getScale());
stopCount = (uint64_t)(stop_time.time * std::pow(10.0, stop_time.scale - fst->getScale()));
if (stopCount > fst->getEndTime()) {
stopCount = fst->getEndTime();
log_warning("Stop time is after simulation file end time\n");
@ -2421,7 +2414,7 @@ struct SimWorker : SimShared
} else if (start_time.end)
startCount = fst->getEndTime();
else {
startCount = start_time.time * pow10(start_time.scale - fst->getScale());
startCount = (uint64_t)(start_time.time * std::pow(10.0, start_time.scale - fst->getScale()));
if (startCount > fst->getEndTime()) {
startCount = fst->getEndTime();
log_warning("Start time is after simulation file end time\n");
@ -2434,7 +2427,7 @@ struct SimWorker : SimShared
} else if (stop_time.end)
stopCount = fst->getEndTime();
else {
stopCount = stop_time.time * pow10(stop_time.scale - fst->getScale());
stopCount = (uint64_t)(stop_time.time * std::pow(10.0, stop_time.scale - fst->getScale()));
if (stopCount > fst->getEndTime()) {
stopCount = fst->getEndTime();
log_warning("Stop time is after simulation file end time\n");
@ -2752,8 +2745,10 @@ struct AnnotateActivity : public OutputWriter {
}
}
// Retrieve timescale from converted VCD file
double real_timescale = pow10(worker->start_time.scale - worker->fst->getScale());
// Retrieve timescale (seconds per FST tick) from converted VCD file.
// This is 10^getScale() (e.g. -12 -> 1e-12); use std::pow to support the
// negative exponent and avoid the old int pow10() overflow.
double real_timescale = std::pow(10.0, worker->fst->getScale());
if (worker->debug) {
log_debug("Timescale %e seconds extracted from converted VCD file", real_timescale);
}