mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-23 06:13:41 +00:00
Code Activity

Merge pull request #13 from alaindargelas/corrected_activ_and_duty

Browse source 
Corrected activity and duty
This commit is contained in:
Akash Levy 2024-10-23 14:54:36 -07:00 • committed by GitHub
commit 3e98069d90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 112 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

186
passes/sat/sim.cc
View file

@ -2400,9 +2400,11 @@ struct AnnotateActivity : public OutputWriter {
AnnotateActivity(SimWorker *worker) : OutputWriter(worker) {} AnnotateActivity(SimWorker *worker) : OutputWriter(worker) {}
struct SignalActivityData { struct SignalActivityData {
std::vector<uint32_t> lastValues; std::vector<uint64_t> lastValues;
std::vector<uint32_t> toggleCounts; std::vector<uint64_t> prevTimes;
std::vector<uint32_t> highTimes; std::vector<double_t> toggleCounts;
std::vector<uint64_t> highTimes;
std::vector<uint64_t> totalEventCounts;
}; };
typedef std::unordered_map<int, SignalActivityData> SignalActivityDataMap; typedef std::unordered_map<int, SignalActivityData> SignalActivityDataMap;
@ -2422,25 +2424,26 @@ struct AnnotateActivity : public OutputWriter {
SignalActivityDataMap::iterator itr = dataMap.find(sig); SignalActivityDataMap::iterator itr = dataMap.find(sig);
if (itr == dataMap.end()) { if (itr == dataMap.end()) {
Const value = data.second; Const value = data.second;
std::vector<uint32_t> vals(GetSize(value), 0); std::vector<uint64_t> vals(GetSize(value), 0);
std::vector<double_t> dvals(GetSize(value), 0);
SignalActivityData data; SignalActivityData data;
data.highTimes = vals; data.highTimes = vals;
data.prevTimes = vals;
data.lastValues = vals; data.lastValues = vals;
data.toggleCounts = vals; data.totalEventCounts = vals;
data.toggleCounts = dvals;
dataMap.emplace(sig, data); dataMap.emplace(sig, data);
} }
} }
} }
// Max simulation time // Max simulation time
int max_time = 0; int max_time = 0;
// clock pin id (highest toggling signal) // Inititalization of totalEventCounts and max_time
int clk = 0;
int highest_toggle = 0;
// Used to compute time intervals
int prev_time = 0;
// For each event (new time when a value changed)
for (auto &d : worker->output_data) { for (auto &d : worker->output_data) {
int time = d.first; int time = d.first;
if (time > max_time)
max_time = time;
// For each signal/values in that time slice // For each signal/values in that time slice
for (auto &data : d.second) { for (auto &data : d.second) {
int sig = data.first; int sig = data.first;
@ -2448,11 +2451,33 @@ struct AnnotateActivity : public OutputWriter {
continue; continue;
Const value = data.second; Const value = data.second;
SignalActivityDataMap::iterator itr = dataMap.find(sig); SignalActivityDataMap::iterator itr = dataMap.find(sig);
std::vector<uint32_t> &lastVals = itr->second.lastValues; std::vector<uint64_t> &totalEventCounts = itr->second.totalEventCounts;
std::vector<uint32_t> &toggleCounts = itr->second.toggleCounts;
std::vector<uint32_t> &highTimes = itr->second.highTimes;
for (int i = GetSize(value) - 1; i >= 0; i--) { for (int i = GetSize(value) - 1; i >= 0; i--) {
int val = '-'; totalEventCounts[i]++;
}
}
}
// clock pin id (highest toggling signal)
int clk = 0;
double_t highest_toggle = 0;
// For each event (new time when a value changed)
for (auto &d : worker->output_data) {
uint64_t time = d.first;
// For each signal/values in that time slice
for (auto &data : d.second) {
int sig = data.first;
if (!use_signal.at(sig))
continue;
Const value = data.second;
SignalActivityDataMap::iterator itr = dataMap.find(sig);
std::vector<uint64_t> &lastVals = itr->second.lastValues;
std::vector<double_t> &toggleCounts = itr->second.toggleCounts;
std::vector<uint64_t> &prevTimes = itr->second.prevTimes;
std::vector<uint64_t> &highTimes = itr->second.highTimes;
std::vector<uint64_t> &totalEventCounts = itr->second.totalEventCounts;
for (int i = GetSize(value) - 1; i >= 0; i--) {
uint64_t val = '-';
switch (value[i]) { switch (value[i]) {
case State::S0: case State::S0:
val = '0'; val = '0';
@ -2466,22 +2491,34 @@ struct AnnotateActivity : public OutputWriter {
default: default:
val = 'z'; val = 'z';
} }
if (lastVals[i] == 0) {
lastVals[i] = val;
}
if (lastVals[i] == '1') {
highTimes[i] += time - prevTimes[i];
}
prevTimes[i] = time;
// Final high time for last event of the given sig
totalEventCounts[i]--;
if (totalEventCounts[i] == 0) {
if (val == '1') {
highTimes[i] += max_time - prevTimes[i];
}
}
// If signal toggled // If signal toggled
if (val != lastVals[i]) { if (val != lastVals[i]) {
toggleCounts[i]++; if (val == 'x' || val == 'z' || lastVals[i] == 'x' || lastVals[i] == 'z')
toggleCounts[i] += 0.5;
else
toggleCounts[i] += 1.0;
if (toggleCounts[i] > highest_toggle) { if (toggleCounts[i] > highest_toggle) {
highest_toggle = toggleCounts[i]; highest_toggle = toggleCounts[i];
clk = sig; clk = sig;
} }
lastVals[i] = val; lastVals[i] = val;
} }
if (lastVals[i] == '1') {
highTimes[i] += time - prev_time;
}
} }
} }
prev_time = time;
max_time = time;
} }
// Retrieve VCD timescale // Retrieve VCD timescale
@ -2497,70 +2534,71 @@ struct AnnotateActivity : public OutputWriter {
// Compute clock period, find the highest toggling signal and compute its average period // Compute clock period, find the highest toggling signal and compute its average period
SignalActivityDataMap::iterator itr = dataMap.find(clk); SignalActivityDataMap::iterator itr = dataMap.find(clk);
std::vector<uint32_t> &clktoggleCounts = itr->second.toggleCounts; std::vector<double_t> &clktoggleCounts = itr->second.toggleCounts;
double clk_period = real_timescale * (double)max_time / (clktoggleCounts[0] / 2); double clk_period = real_timescale * (double)max_time / (clktoggleCounts[0] / 2.0);
double frequency = 1 / clk_period; double frequency = 1.0 / clk_period;
worker->top->module->set_string_attribute("$FREQUENCY", std::to_string(frequency)); worker->top->module->set_string_attribute("$FREQUENCY", std::to_string(frequency));
if (debug) { if (debug) {
std::cout << "Clock toggle count: " << clktoggleCounts[0] << "\n"; std::cout << "Clock toggle count: " << clktoggleCounts[0] << "\n";
std::cout << "Max time: " << max_time << "\n"; std::cout << "Max time: " << max_time << "\n";
std::cout << "Clock period: " << clk_period << "\n"; std::cout << "Clock period: " << clk_period << "\n";
std::cout << "Frequency: " << frequency << "\n";
} }
worker->top->write_output_header( worker->top->write_output_header(
[this, debug](IdString name) { [this, debug](IdString name) {
if (debug) if (debug)
std::cout << stringf("module %s\n", log_id(name)); std::cout << stringf("module %s\n", log_id(name));
}, },
[this, debug]() { [this, debug]() {
if (debug) if (debug)
std::cout << "endmodule\n"; std::cout << "endmodule\n";
}, },
[this, &use_signal, &dataMap, max_time, real_timescale, clk_period, debug] [this, &use_signal, &dataMap, max_time, real_timescale, clk_period, debug](const char *name, int size, Wire *w, int id,
(const char *name, int size, Wire *w, int id, bool is_reg) { bool) {
if (!use_signal.at(id) || (w == nullptr)) if (!use_signal.at(id) || (w == nullptr))
return; return;
SignalActivityDataMap::const_iterator itr = dataMap.find(id); SignalActivityDataMap::const_iterator itr = dataMap.find(id);
const std::vector<uint32_t> &toggleCounts = itr->second.toggleCounts; const std::vector<double_t> &toggleCounts = itr->second.toggleCounts;
const std::vector<uint32_t> &highTimes = itr->second.highTimes; const std::vector<uint64_t> &highTimes = itr->second.highTimes;
if (debug) { if (debug) {
std::string full_name = form_vcd_name(name, size, w); std::string full_name = form_vcd_name(name, size, w);
std::cout << full_name << ":\n"; std::cout << full_name << " " << id << ":\n";
std::cout << " TC: "; std::cout << " TC: ";
for (uint32_t i = 0; i < (uint32_t)size; i++) { for (uint32_t i = 0; i < (uint32_t)size; i++) {
std::cout << toggleCounts[i] << " "; std::cout << toggleCounts[i] << " ";
} }
std::cout << "\n"; std::cout << "\n";
std::cout << " HT: "; std::cout << " HT: ";
for (uint32_t i = 0; i < (uint32_t)size; i++) { for (uint32_t i = 0; i < (uint32_t)size; i++) {
std::cout << highTimes[i] << " "; std::cout << highTimes[i] << " ";
} }
std::cout << "\n"; std::cout << "\n";
std::cout << " ACK: "; std::cout << " ACK: ";
} }
std::string activity_str; std::string activity_str;
for (uint32_t i = 0; i < (uint32_t)size; i++) { for (uint32_t i = 0; i < (uint32_t)size; i++) {
// Compute Activity // Compute Activity
double activity = toggleCounts[i] / ((double)max_time * real_timescale / clk_period); double activity = toggleCounts[i] / (((double)max_time * real_timescale / clk_period) * 2.0);
activity_str += std::to_string(activity) + " "; activity_str += std::to_string(activity) + " ";
} }
if (debug) { if (debug) {
std::cout << activity_str; std::cout << activity_str;
std::cout << "\n"; std::cout << "\n";
std::cout << " DUTY: "; std::cout << " DUTY: ";
} }
std::string duty_str; std::string duty_str;
for (uint32_t i = 0; i < (uint32_t)size; i++) { for (uint32_t i = 0; i < (uint32_t)size; i++) {
// Compute Duty cycle // Compute Duty cycle
double duty = (double)highTimes[i] / (double)max_time; double duty = (double)highTimes[i] / (double)max_time;
duty_str += std::to_string(duty) + " "; duty_str += std::to_string(duty) + " ";
} }
if (debug) { if (debug) {
std::cout << duty_str; std::cout << duty_str;
std::cout << "\n"; std::cout << "\n";
} }
w->set_string_attribute("$ACKT", activity_str); w->set_string_attribute("$ACKT", activity_str);
w->set_string_attribute("$DUTY", duty_str); w->set_string_attribute("$DUTY", duty_str);
}); });
} }
}; };