mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-05-22 09:59:39 +00:00
Code Activity

Merge pull request #5882 from YosysHQ/std_cpp20

Browse source 
Bump required standard to C++20
This commit is contained in:
Miodrag Milanović 2026-05-15 13:13:43 +00:00 • committed by GitHub
commit 1d87cefd80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
passes/cmds/timeest.cc
View file

@ -100,7 +100,7 @@ struct EstimateSta {
cell, cell->type.unescape());
continue;
}
if (ff.sig_clk != clk)
if (!clk || ff.sig_clk.as_bit() != *clk)
continue;
launch.append(ff.sig_q);
sample.append(ff.sig_d);
@ -144,12 +144,12 @@ struct EstimateSta {
log_error("Unsupported async memory port '%s'\n", rd.cell);
continue;
}
if (sigmap(rd.clk) != clk)
if (!clk || sigmap(rd.clk).as_bit() != *clk)
continue;
add_seq(rd.cell, rd.data, {rd.addr, rd.srst, rd.en});
}
for (auto &wr : mem.wr_ports) {
if (sigmap(wr.clk) != clk)
if (!clk || sigmap(wr.clk).as_bit() != *clk)
continue;
add_seq(wr.cell, {}, {wr.en, wr.addr, wr.data});
}

6
passes/sat/formalff.cc
View file

@ -767,7 +767,7 @@ struct FormalFfPass : public Pass {
ff.sig_d = ff.sig_ad;
}
if (!ff.has_clk || sigmap(ff.sig_clk) != gate_clock || ff.pol_clk != pol_clk) {
if (!ff.has_clk || sigmap(ff.sig_clk).as_bit() != gate_clock || ff.pol_clk != pol_clk) {
log_debug("FF driver for gate enable %s.%s of gated clk bit %s.%s has incompatible clocking: "
"%s %s.%s\n",
module, log_signal(SigSpec(gate_enable)), module,
@ -798,7 +798,7 @@ struct FormalFfPass : public Pass {
auto &mem = memories.at(clocked_cell->name);
bool changed = false;
for (auto &rd_port : mem.rd_ports) {
if (rd_port.clk_enable && rd_port.clk == clk && rd_port.clk_polarity == pol_clk) {
if (rd_port.clk_enable && rd_port.clk.as_bit() == clk && rd_port.clk_polarity == pol_clk) {
log_debug("patching rd port\n");
changed = true;
rd_port.clk = gate_clock;
@ -808,7 +808,7 @@ struct FormalFfPass : public Pass {
}
}
for (auto &wr_port : mem.wr_ports) {
if (wr_port.clk_enable && wr_port.clk == clk && wr_port.clk_polarity == pol_clk) {
if (wr_port.clk_enable && wr_port.clk.as_bit() == clk && wr_port.clk_polarity == pol_clk) {
log_debug("patching wr port\n");
changed = true;
wr_port.clk = gate_clock;