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

Merge pull request #5831 from stashcroft/main 

Make sure co-simulation only uses integer arithmetic
This commit is contained in:
Emil J 2026-04-27 14:03:58 +00:00 committed by GitHub
parent 6b78731792 23a05fcf35
commit 627b691578
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/fstdata.cc
View File

@ -45,8 +45,7 @@ FstData::FstData(std::string filename) : ctx(nullptr)
ctx = (fstReaderContext *)fstReaderOpen(filename.c_str());
if (!ctx)
log_error("Error opening '%s' as FST file\n", filename);
int scale = (int)fstReaderGetTimescale(ctx);
timescale = pow(10.0, scale);
scale = (int)fstReaderGetTimescale(ctx);
timescale_str = "";
int unit = 0;
int zeros = 0;

4
kernel/fstdata.h
View File

@ -55,7 +55,7 @@ class FstData
std::string valueOf(fstHandle signal);
fstHandle getHandle(std::string name);
dict<int,fstHandle> getMemoryHandles(std::string name);
double getTimescale() { return timescale; }
int getScale() { return scale; }
const char *getTimescaleString() { return timescale_str.c_str(); }
private:
void extractVarNames();
@ -69,7 +69,7 @@ private:
uint64_t last_time;
std::map<fstHandle, std::string> past_data;
uint64_t past_time;
double timescale;
int scale; // exponent of 10, e.g. -6 = us, -9 = ns
std::string timescale_str;
uint64_t start_time;
uint64_t end_time;

56
passes/sat/sim.cc
View File

@ -53,9 +53,23 @@ static const std::map<std::string, int> g_units =
{ "zs", -21 },
};
static double stringToTime(std::string str)
struct scaled_time {
uint64_t time;
int scale; // exponent of 10, e.g. -6 = us, -9 = ns
bool end;
};
static uint64_t pow10(int n)
{
if (str=="END") return -1;
int r = 1;
while (n--)
r *= 10;
return r;
}
static scaled_time stringToTime(std::string str)
{
if (str=="END") return {1, 0, true};
char *endptr;
long value = strtol(str.c_str(), &endptr, 10);
@ -66,7 +80,7 @@ static double stringToTime(std::string str)
if (value < 0)
log_error("Time value '%s' must be positive\n", str);
return value * pow(10.0, g_units.at(endptr));
return {(unsigned long)value, g_units.at(endptr), false};
}
struct SimWorker;
@ -110,8 +124,8 @@ struct SimShared
bool hdlname = false;
int rstlen = 1;
FstData *fst = nullptr;
double start_time = 0;
double stop_time = -1;
scaled_time start_time = {0, 0, false};
scaled_time stop_time = {1, 0, true};
SimulationMode sim_mode = SimulationMode::sim;
bool cycles_set = false;
std::vector<std::unique_ptr<OutputWriter>> outputfiles;
@ -1514,27 +1528,27 @@ struct SimWorker : SimShared
uint64_t startCount = 0;
uint64_t stopCount = 0;
if (start_time==0) {
if (start_time < fst->getStartTime())
if (start_time.time == 0) {
if (start_time.time < fst->getStartTime())
log_warning("Start time is before simulation file start time\n");
startCount = fst->getStartTime();
} else if (start_time==-1)
} else if (start_time.end)
startCount = fst->getEndTime();
else {
startCount = start_time / fst->getTimescale();
startCount = start_time.time * pow10(start_time.scale - fst->getScale());
if (startCount > fst->getEndTime()) {
startCount = fst->getEndTime();
log_warning("Start time is after simulation file end time\n");
}
}
if (stop_time==0) {
if (stop_time < fst->getStartTime())
if (stop_time.time == 0) {
if (stop_time.time < fst->getStartTime())
log_warning("Stop time is before simulation file start time\n");
stopCount = fst->getStartTime();
} else if (stop_time==-1)
} else if (stop_time.end)
stopCount = fst->getEndTime();
else {
stopCount = stop_time / fst->getTimescale();
stopCount = stop_time.time * pow10(stop_time.scale - fst->getScale());
if (stopCount > fst->getEndTime()) {
stopCount = fst->getEndTime();
log_warning("Stop time is after simulation file end time\n");
@ -2174,27 +2188,27 @@ struct SimWorker : SimShared
uint64_t startCount = 0;
uint64_t stopCount = 0;
if (start_time==0) {
if (start_time < fst->getStartTime())
if (start_time.time == 0) {
if (start_time.time < fst->getStartTime())
log_warning("Start time is before simulation file start time\n");
startCount = fst->getStartTime();
} else if (start_time==-1)
} else if (start_time.end)
startCount = fst->getEndTime();
else {
startCount = start_time / fst->getTimescale();
startCount = start_time.time * pow10(start_time.scale - fst->getScale());
if (startCount > fst->getEndTime()) {
startCount = fst->getEndTime();
log_warning("Start time is after simulation file end time\n");
}
}
if (stop_time==0) {
if (stop_time < fst->getStartTime())
if (stop_time.time == 0) {
if (stop_time.time < fst->getStartTime())
log_warning("Stop time is before simulation file start time\n");
stopCount = fst->getStartTime();
} else if (stop_time==-1)
} else if (stop_time.end)
stopCount = fst->getEndTime();
else {
stopCount = stop_time / fst->getTimescale();
stopCount = stop_time.time * pow10(stop_time.scale - fst->getScale());
if (stopCount > fst->getEndTime()) {
stopCount = fst->getEndTime();
log_warning("Stop time is after simulation file end time\n");