diff options
author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-31 20:57:36 -0700 |
---|---|---|
committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-07-31 20:57:36 -0700 |
commit | 92ec2cd13825ef996ebf0d88246d975a19352800 (patch) | |
tree | db4a1c7447eff669bf47c64de95747b3edab6438 /ice40 | |
parent | f646ec790a79f29d6964f3b7e30088f044b4a4e9 (diff) | |
download | nextpnr-92ec2cd13825ef996ebf0d88246d975a19352800.tar.gz nextpnr-92ec2cd13825ef996ebf0d88246d975a19352800.tar.bz2 nextpnr-92ec2cd13825ef996ebf0d88246d975a19352800.zip |
clangformat for stuff I've touched
Diffstat (limited to 'ice40')
-rw-r--r-- | ice40/arch.cc | 26 | ||||
-rw-r--r-- | ice40/main.cc | 3 |
2 files changed, 16 insertions, 13 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 18887a3c..5545ddf4 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -317,15 +317,15 @@ PortType Arch::getBelPinType(BelId bel, PortPin pin) const return PortType(bel_wires[i].type); } } else { - int b = 0, e = num_bel_wires-1; + int b = 0, e = num_bel_wires - 1; while (b <= e) { - int i = (b+e) / 2; + int i = (b + e) / 2; if (bel_wires[i].port == pin) return PortType(bel_wires[i].type); if (bel_wires[i].port > pin) - e = i-1; + e = i - 1; else - b = i+1; + b = i + 1; } } @@ -349,17 +349,17 @@ WireId Arch::getBelPinWire(BelId bel, PortPin pin) const } } } else { - int b = 0, e = num_bel_wires-1; + int b = 0, e = num_bel_wires - 1; while (b <= e) { - int i = (b+e) / 2; + int i = (b + e) / 2; if (bel_wires[i].port == pin) { ret.index = bel_wires[i].wire_index; break; } if (bel_wires[i].port > pin) - e = i-1; + e = i - 1; else - b = i+1; + b = i + 1; } } @@ -618,7 +618,7 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const { - const auto& driver = net_info->driver; + const auto &driver = net_info->driver; auto driver_loc = getBelLocation(driver.cell->bel); auto sink_loc = getBelLocation(sink.cell->bel); @@ -636,13 +636,15 @@ delay_t Arch::predictDelay(const NetInfo *net_info, const PortRef &sink) const // offset = 500; // } - if (driver.port == id_o) offset += 330; - if (sink.port == id_i0 || sink.port == id_i1 || sink.port == id_i2 || sink.port == id_i3) offset += 260; + if (driver.port == id_o) + offset += 330; + if (sink.port == id_i0 || sink.port == id_i1 || sink.port == id_i2 || sink.port == id_i3) + offset += 260; return xscale * abs(xd) + yscale * abs(yd) + offset; } -delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef& sink, delay_t budget) const +delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay_t budget) const { const auto &driver = net_info->driver; if (driver.port == id_cout) { diff --git a/ice40/main.cc b/ice40/main.cc index ab672ddc..2a0cded5 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -105,7 +105,8 @@ int main(int argc, char *argv[]) options.add_options()("asc", po::value<std::string>(), "asc bitstream file to write"); options.add_options()("read", po::value<std::string>(), "asc bitstream file to read"); options.add_options()("seed", po::value<int>(), "seed value for random number generator"); - options.add_options()("slack_redist_iter", po::value<int>(), "number of iterations between slack redistribution"); + options.add_options()("slack_redist_iter", po::value<int>(), + "number of iterations between slack redistribution"); options.add_options()("version,V", "show version"); options.add_options()("tmfuzz", "run path delay estimate fuzzer"); options.add_options()("test", "check architecture database integrity"); |