From d5e6bfc74e30a062ada467ce13fc9b47756063e9 Mon Sep 17 00:00:00 2001 From: gatecat Date: Mon, 20 Apr 2026 15:45:20 +0200 Subject: [PATCH] clangformat Signed-off-by: gatecat --- common/route/router1.cc | 2 +- himbaechel/uarch/gatemate/gatemate.cc | 10 +++++++--- himbaechel/uarch/xilinx/xilinx.cc | 4 ++-- nexus/pack.cc | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/route/router1.cc b/common/route/router1.cc index c1e0925e..90a77fb9 100644 --- a/common/route/router1.cc +++ b/common/route/router1.cc @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include "log.h" #include "router1.h" diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc index 6b051fc2..a271feaf 100644 --- a/himbaechel/uarch/gatemate/gatemate.cc +++ b/himbaechel/uarch/gatemate/gatemate.cc @@ -425,13 +425,17 @@ void GateMateImpl::preRoute() } } -void GateMateImpl::reassign_bridges(NetInfo *start_net, const dict &net_wires, - WireId start_wire, dict &wire_to_net, int &num) +void GateMateImpl::reassign_bridges(NetInfo *start_net, const dict &net_wires, WireId start_wire, + dict &wire_to_net, int &num) { // Processing list, holds parameters to implement the equivalent of recursive calls. // This avoids a stack overflow when recursion becomes deep, as the function // has a relatively large stack footprint. - struct record { NetInfo *net; WireId wire; }; + struct record + { + NetInfo *net; + WireId wire; + }; std::vector to_process; // Insert start record. to_process.push_back({start_net, start_wire}); diff --git a/himbaechel/uarch/xilinx/xilinx.cc b/himbaechel/uarch/xilinx/xilinx.cc index ab3b5a2a..47cbc85f 100644 --- a/himbaechel/uarch/xilinx/xilinx.cc +++ b/himbaechel/uarch/xilinx/xilinx.cc @@ -761,8 +761,8 @@ delay_t XilinxImpl::estimateDelay(WireId src, WireId dst) const // TODO: improve sophistication here based on old nextpnr-xilinx code int dist_x = std::abs(dx - sx), dist_y = std::abs(dy - sy); - return 500 + 12 * (2 * std::max(dist_y - 6, 0) + 4 * std::min(dist_y, 6) - + std::max(dist_x - 12, 0) + 2 * std::min(dist_x, 12)); + return 500 + 12 * (2 * std::max(dist_y - 6, 0) + 4 * std::min(dist_y, 6) + std::max(dist_x - 12, 0) + + 2 * std::min(dist_x, 12)); } delay_t XilinxImpl::predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdString dst_pin) const diff --git a/nexus/pack.cc b/nexus/pack.cc index 616da530..31f37045 100644 --- a/nexus/pack.cc +++ b/nexus/pack.cc @@ -1235,7 +1235,7 @@ struct NexusPacker XFormRule delay_rule; delay_rule.param_xform[id_DEL_VALUE] = ctx->id("DELAY.DEL_VALUE"); delay_rule.param_xform[id_COARSE_DELAY] = ctx->id("DELAY.COARSE_DELAY"); - + base_iodelay_rules[id_DELAYB] = delay_rule; base_iodelay_rules[id_DELAYA] = delay_rule;