diff options
Diffstat (limited to 'mistral/arch.cc')
| -rw-r--r-- | mistral/arch.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mistral/arch.cc b/mistral/arch.cc index 60456846..034ecb98 100644 --- a/mistral/arch.cc +++ b/mistral/arch.cc @@ -81,18 +81,16 @@ Arch::Arch(ArchArgs args) auto hps_pos = cyclonev->hps_get_pos(); if (!hps_pos.empty()) { - create_hps_mpu_general_purpose(CycloneV::pos2x(hps_pos[CycloneV::I_HPS_MPU_GENERAL_PURPOSE]), CycloneV::pos2y(hps_pos[CycloneV::I_HPS_MPU_GENERAL_PURPOSE])); + create_hps_mpu_general_purpose(CycloneV::pos2x(hps_pos[CycloneV::I_HPS_MPU_GENERAL_PURPOSE]), + CycloneV::pos2y(hps_pos[CycloneV::I_HPS_MPU_GENERAL_PURPOSE])); } // This import takes about 5s, perhaps long term we can speed it up, e.g. defer to Mistral more... log_info("Initialising routing graph...\n"); int pip_count = 0; - for (const auto &mux : cyclonev->dest_node_to_rmux) { - const auto &rmux = cyclonev->rmux_info[mux.second]; - WireId dst_wire(mux.first); - for (const auto &src : rmux.sources) { - if (CycloneV::rn2t(src) == CycloneV::NONE) - continue; + for (const auto &rnode : cyclonev->rnodes()) { + WireId dst_wire(rnode.id()); + for (const auto &src : rnode.sources()) { WireId src_wire(src); wires[dst_wire].wires_uphill.push_back(src_wire); wires[src_wire].wires_downhill.push_back(dst_wire); |