caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clangformat

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2023-05-19 09:00:31 +02:00
parent 354b7daf12
commit 1d3e5151ba
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/kernel/exclusive_state_groups.h
View File

@ -125,10 +125,7 @@ template <size_t StateCount, typename StateType = int8_t, typename CountType = u
} }
} }
template <typename StateRange> template <typename StateRange> bool requires_range(const StateRange &state_range) const
bool
requires_range(const StateRange &state_range)
const
{ {
if (state < 0) { if (state < 0) {
return false; return false;

4
himbaechel/arch.cc
View File

@ -23,13 +23,11 @@
#include "log.h" #include "log.h"
#include "nextpnr.h" #include "nextpnr.h"
#include "util.h"
#include "placer1.h" #include "placer1.h"
#include "placer_heap.h" #include "placer_heap.h"
#include "router1.h" #include "router1.h"
#include "router2.h" #include "router2.h"
#include "util.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN

4
mistral/arch.h
View File

@ -435,8 +435,8 @@ struct Arch : BaseArch<ArchRanges>
int &clockInfoCount) const override; // delay.cc int &clockInfoCount) const override; // delay.cc
TimingClockingInfo getPortClockingInfo(const CellInfo *cell, IdString port, int index) const override; // delay.cc TimingClockingInfo getPortClockingInfo(const CellInfo *cell, IdString port, int index) const override; // delay.cc
bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort,
DelayQuad &delay) const override; // delay.cc DelayQuad &delay) const override; // delay.cc
DelayQuad getPipDelay(PipId pip) const override; // delay.cc DelayQuad getPipDelay(PipId pip) const override; // delay.cc
bool getArcDelayOverride(const NetInfo *net_info, const PortRef &sink, DelayQuad &delay) const override; // delay.cc bool getArcDelayOverride(const NetInfo *net_info, const PortRef &sink, DelayQuad &delay) const override; // delay.cc
// ------------------------------------------------- // -------------------------------------------------

2
mistral/bitstream.cc
View File

@ -19,8 +19,8 @@
#include "log.h" #include "log.h"
#include "nextpnr.h" #include "nextpnr.h"
#include "util.h"
#include "timing.h" #include "timing.h"
#include "util.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
namespace { namespace {

28
mistral/delay.cc
View File

@ -362,22 +362,29 @@ bool Arch::getArcDelayOverride(const NetInfo *net_info, const PortRef &sink, Del
} }
if (input_wave[0].empty()) { if (input_wave[0].empty()) {
cyclonev->rnode_timing_build_input_wave(src.node, temp, CycloneV::DELAY_MAX, inverted ? mistral::CycloneV::RF_FALL : mistral::CycloneV::RF_RISE, est, input_wave[0]); cyclonev->rnode_timing_build_input_wave(src.node, temp, CycloneV::DELAY_MAX,
cyclonev->rnode_timing_build_input_wave(src.node, temp, CycloneV::DELAY_MAX, inverted ? mistral::CycloneV::RF_RISE : mistral::CycloneV::RF_FALL, est, input_wave[1]); inverted ? mistral::CycloneV::RF_FALL : mistral::CycloneV::RF_RISE,
NPNR_ASSERT(!input_wave[mistral::CycloneV::RF_RISE].empty() && !input_wave[mistral::CycloneV::RF_FALL].empty()); est, input_wave[0]);
cyclonev->rnode_timing_build_input_wave(src.node, temp, CycloneV::DELAY_MAX,
inverted ? mistral::CycloneV::RF_RISE : mistral::CycloneV::RF_FALL,
est, input_wave[1]);
NPNR_ASSERT(!input_wave[mistral::CycloneV::RF_RISE].empty() &&
!input_wave[mistral::CycloneV::RF_FALL].empty());
} }
for (int edge = 0; edge != 2; edge++) { for (int edge = 0; edge != 2; edge++) {
auto actual_edge = edge ? inverted ? mistral::CycloneV::RF_RISE : mistral::CycloneV::RF_FALL : inverted ? mistral::CycloneV::RF_FALL : mistral::CycloneV::RF_RISE; auto actual_edge = edge ? inverted ? mistral::CycloneV::RF_RISE : mistral::CycloneV::RF_FALL
: inverted ? mistral::CycloneV::RF_FALL
: mistral::CycloneV::RF_RISE;
mistral::AnalogSim sim; mistral::AnalogSim sim;
int input = -1; int input = -1;
std::vector<std::pair<mistral::CycloneV::rnode_t, int>> outputs; std::vector<std::pair<mistral::CycloneV::rnode_t, int>> outputs;
cyclonev->rnode_timing_build_circuit(src.node, temp, CycloneV::DELAY_MAX, actual_edge, sim, input, outputs); cyclonev->rnode_timing_build_circuit(src.node, temp, CycloneV::DELAY_MAX, actual_edge, sim, input, outputs);
sim.set_input_wave(input, input_wave[edge]); sim.set_input_wave(input, input_wave[edge]);
auto o = std::find_if(outputs.begin(), outputs.end(), [&](std::pair<mistral::CycloneV::rnode_t, int> output) { auto o = std::find_if(
return output.first == dst.node; outputs.begin(), outputs.end(),
}); [&](std::pair<mistral::CycloneV::rnode_t, int> output) { return output.first == dst.node; });
NPNR_ASSERT(o != outputs.end()); NPNR_ASSERT(o != outputs.end());
output_wave[edge].clear(); output_wave[edge].clear();
@ -393,7 +400,8 @@ bool Arch::getArcDelayOverride(const NetInfo *net_info, const PortRef &sink, Del
inverted = !inverted; inverted = !inverted;
} }
delay = DelayQuad{delay_t(output_delay_sum[0].mi*1e12), delay_t(output_delay_sum[0].mx*1e12), delay_t(output_delay_sum[1].mi*1e12), delay_t(output_delay_sum[1].mx*1e12)}; delay = DelayQuad{delay_t(output_delay_sum[0].mi * 1e12), delay_t(output_delay_sum[0].mx * 1e12),
delay_t(output_delay_sum[1].mi * 1e12), delay_t(output_delay_sum[1].mx * 1e12)};
return true; return true;
} }
@ -406,7 +414,7 @@ delay_t Arch::predictDelay(BelId src_bel, IdString src_pin, BelId dst_bel, IdStr
Loc dst_loc = getBelLocation(dst_bel); Loc dst_loc = getBelLocation(dst_bel);
int x_diff = std::abs(dst_loc.x - src_loc.x); int x_diff = std::abs(dst_loc.x - src_loc.x);
int y_diff = std::abs(dst_loc.y - src_loc.y); int y_diff = std::abs(dst_loc.y - src_loc.y);
return 43*x_diff + 114*y_diff + 470; return 43 * x_diff + 114 * y_diff + 470;
} }
delay_t Arch::estimateDelay(WireId src, WireId dst) const delay_t Arch::estimateDelay(WireId src, WireId dst) const
@ -417,7 +425,7 @@ delay_t Arch::estimateDelay(WireId src, WireId dst) const
int y1 = CycloneV::rn2y(dst.node); int y1 = CycloneV::rn2y(dst.node);
int x_diff = std::abs(x1 - x0); int x_diff = std::abs(x1 - x0);
int y_diff = std::abs(y1 - y0); int y_diff = std::abs(y1 - y0);
return 43*x_diff + 114*y_diff + 470; return 43 * x_diff + 114 * y_diff + 470;
} }
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END