diff options
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.cc | 16 | ||||
| -rw-r--r-- | ice40/arch.h | 4 | ||||
| -rw-r--r-- | ice40/bitstream.cc | 5 | ||||
| -rw-r--r-- | ice40/main.cc | 10 | ||||
| -rw-r--r-- | ice40/pack.cc | 12 | ||||
| -rw-r--r-- | ice40/place_legaliser.cc | 2 |
6 files changed, 25 insertions, 24 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index f3004155..92b1a2a6 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; } } diff --git a/ice40/arch.h b/ice40/arch.h index 7efa733c..d1c70f9a 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -531,9 +531,9 @@ struct Arch : BaseCtx DelayInfo delay; NPNR_ASSERT(wire != WireId()); if (fast_part) - delay.delay = chip_info->wire_data[wire.index].fast_delay; + delay.delay = chip_info->wire_data[wire.index].fast_delay; else - delay.delay = chip_info->wire_data[wire.index].slow_delay; + delay.delay = chip_info->wire_data[wire.index].slow_delay; return delay; } diff --git a/ice40/bitstream.cc b/ice40/bitstream.cc index af5febce..e9851a83 100644 --- a/ice40/bitstream.cc +++ b/ice40/bitstream.cc @@ -566,8 +566,9 @@ void write_asc(const Context *ctx, std::ostream &out) set_config(ti, config.at(y).at(x),
"Cascade.IPCON_LC0" + std::to_string(lc_idx) + "_inmux02_5", true);
else
- set_config(ti, config.at(y).at(x), "Cascade.MULT" + std::to_string(int(tile - TILE_DSP0)) +
- "_LC0" + std::to_string(lc_idx) + "_inmux02_5",
+ set_config(ti, config.at(y).at(x),
+ "Cascade.MULT" + std::to_string(int(tile - TILE_DSP0)) + "_LC0" +
+ std::to_string(lc_idx) + "_inmux02_5",
true);
}
}
diff --git a/ice40/main.cc b/ice40/main.cc index 32815b26..67393d41 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -144,16 +144,18 @@ int main(int argc, char *argv[]) #endif if (vm.count("help") || argc == 1) { help: - std::cout << boost::filesystem::basename(argv[0]) << " -- Next Generation Place and Route (git " - "sha1 " GIT_COMMIT_HASH_STR ")\n"; + std::cout << boost::filesystem::basename(argv[0]) + << " -- Next Generation Place and Route (git " + "sha1 " GIT_COMMIT_HASH_STR ")\n"; std::cout << "\n"; std::cout << options << "\n"; return argc != 1; } if (vm.count("version")) { - std::cout << boost::filesystem::basename(argv[0]) << " -- Next Generation Place and Route (git " - "sha1 " GIT_COMMIT_HASH_STR ")\n"; + std::cout << boost::filesystem::basename(argv[0]) + << " -- Next Generation Place and Route (git " + "sha1 " GIT_COMMIT_HASH_STR ")\n"; return 1; } diff --git a/ice40/pack.cc b/ice40/pack.cc index 8182eb70..91dcf846 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -662,12 +662,12 @@ static void pack_special(Context *ctx) auto feedback_path = packed->params[ctx->id("FEEDBACK_PATH")]; packed->params[ctx->id("FEEDBACK_PATH")] = - feedback_path == "DELAY" ? "0" : feedback_path == "SIMPLE" - ? "1" - : feedback_path == "PHASE_AND_DELAY" - ? "2" - : feedback_path == "EXTERNAL" ? "6" - : feedback_path; + feedback_path == "DELAY" + ? "0" + : feedback_path == "SIMPLE" ? "1" + : feedback_path == "PHASE_AND_DELAY" + ? "2" + : feedback_path == "EXTERNAL" ? "6" : feedback_path; packed->params[ctx->id("PLLTYPE")] = std::to_string(sb_pll40_type(ctx, ci)); NetInfo *pad_packagepin_net = nullptr; diff --git a/ice40/place_legaliser.cc b/ice40/place_legaliser.cc index 0d14fb35..a498e5f4 100644 --- a/ice40/place_legaliser.cc +++ b/ice40/place_legaliser.cc @@ -164,8 +164,6 @@ class PlacementLegaliser ctx->assignArchInfo(); - - return legalised_carries && replaced_cells; } |