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

Merge pull request #3672 from jix/yw-cosim-hierarchy-fixes 

sim: For yw cosim, drive parent module's signals for input ports
This commit is contained in:
Jannis Harder 2023-02-15 13:45:00 +01:00 committed by GitHub
parent 1cedad7a68 1698202ccc
commit 1c667fab2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
passes/sat/sim.cc
View File

@ -139,6 +139,8 @@ struct SimInstance
dict<SigBit, pool<Cell*>> upd_cells; dict<SigBit, pool<Cell*>> upd_cells;
dict<SigBit, pool<Wire*>> upd_outports; dict<SigBit, pool<Wire*>> upd_outports;
dict<SigBit, SigBit> in_parent_drivers;
pool<SigBit> dirty_bits; pool<SigBit> dirty_bits;
pool<Cell*> dirty_cells; pool<Cell*> dirty_cells;
pool<IdString> dirty_memories; pool<IdString> dirty_memories;
@ -218,6 +220,12 @@ struct SimInstance
dirty_bits.insert(sig[i]); dirty_bits.insert(sig[i]);
} }
} }
if (wire->port_input && instance != nullptr && parent != nullptr) {
for (int i = 0; i < GetSize(sig); i++) {
in_parent_drivers.emplace(sig[i], parent->sigmap(instance->getPort(wire->name)[i]));
}
}
} }
memories = Mem::get_all_memories(module); memories = Mem::get_all_memories(module);
@ -372,6 +380,22 @@ struct SimInstance
return did_something; return did_something;
} }
void set_state_parent_drivers(SigSpec sig, Const value)
{
sigmap.apply(sig);
for (int i = 0; i < GetSize(sig); i++) {
auto sigbit = sig[i];
auto sigval = value[i];
auto in_parent_driver = in_parent_drivers.find(sigbit);
if (in_parent_driver == in_parent_drivers.end())
set_state(sigbit, sigval);
else
parent->set_state_parent_drivers(in_parent_driver->second, sigval);
}
}
void set_memory_state(IdString memid, Const addr, Const data) void set_memory_state(IdString memid, Const addr, Const data)
{ {
set_memory_state(memid, addr.as_int(), data); set_memory_state(memid, addr.as_int(), data);
@ -1760,7 +1784,7 @@ struct SimWorker : SimShared
log("yw: set %s to %s\n", signal.path.str().c_str(), log_const(value)); log("yw: set %s to %s\n", signal.path.str().c_str(), log_const(value));
if (found_path.wire != nullptr) { if (found_path.wire != nullptr) {
found_path.instance->set_state( found_path.instance->set_state_parent_drivers(
SigChunk(found_path.wire, signal.offset, signal.width), SigChunk(found_path.wire, signal.offset, signal.width),
value); value);
} else if (!found_path.memid.empty()) { } else if (!found_path.memid.empty()) {