aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgatecat <gatecat@ds0.me>2022-10-17 12:35:02 +0200
committergatecat <gatecat@ds0.me>2022-10-17 12:35:02 +0200
commit445d32497d4059bcd4d39d9163b24bd7161255df (patch)
tree90197f2c40775d336dd2634289c36a5007f2e88d
parentbd082132cebb13f631cb65ba51eb433c374e0e2c (diff)
downloadnextpnr-445d32497d4059bcd4d39d9163b24bd7161255df.tar.gz
nextpnr-445d32497d4059bcd4d39d9163b24bd7161255df.tar.bz2
nextpnr-445d32497d4059bcd4d39d9163b24bd7161255df.zip
run clangformat
Signed-off-by: gatecat <gatecat@ds0.me>
-rw-r--r--common/kernel/timing.cc16
-rw-r--r--gowin/arch.cc3
2 files changed, 12 insertions, 7 deletions
diff --git a/common/kernel/timing.cc b/common/kernel/timing.cc
index f046ba7d..47235789 100644
--- a/common/kernel/timing.cc
+++ b/common/kernel/timing.cc
@@ -299,10 +299,12 @@ void TimingAnalyser::identify_related_domains()
std::function<void(const NetInfo *, dict<IdString, delay_t> &, delay_t)> find_net_drivers =
[&](const NetInfo *ni, dict<IdString, delay_t> &drivers, delay_t delay_acc) {
// Get driving cell and port
- if (ni == nullptr) return;
+ if (ni == nullptr)
+ return;
const CellInfo *cell = ni->driver.cell;
- if (cell == nullptr) return;
-
+ if (cell == nullptr)
+ return;
+
const IdString port = ni->driver.port;
bool didGoUpstream = false;
@@ -363,9 +365,11 @@ void TimingAnalyser::identify_related_domains()
for (const auto &domain : domains) {
const NetInfo *ni = ctx->nets.at(domain.key.clock).get();
- if (ni == nullptr) continue;
- if (ni->driver.cell == nullptr) continue;
-
+ if (ni == nullptr)
+ continue;
+ if (ni->driver.cell == nullptr)
+ continue;
+
dict<IdString, delay_t> drivers;
find_net_drivers(ni, drivers, 0);
diff --git a/gowin/arch.cc b/gowin/arch.cc
index 00050f44..f00dfb0a 100644
--- a/gowin/arch.cc
+++ b/gowin/arch.cc
@@ -880,7 +880,8 @@ void Arch::read_cst(std::istream &in)
std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^;]+;).*[\\s\\S]*");
std::regex port_attrre = std::regex("([^ =;]+=[^ =;]+) *([^;]*;)");
std::regex iobelre = std::regex("IO([TRBL])([0-9]+)\\[?([A-Z])\\]?");
- std::regex inslocre = std::regex("INS_LOC +\"([^\"]+)\" +R([0-9]+)C([0-9]+)\\[([0-9])\\]\\[([AB])\\] *;.*[\\s\\S]*");
+ std::regex inslocre =
+ std::regex("INS_LOC +\"([^\"]+)\" +R([0-9]+)C([0-9]+)\\[([0-9])\\]\\[([AB])\\] *;.*[\\s\\S]*");
std::regex clockre = std::regex("CLOCK_LOC +\"([^\"]+)\" +BUF([GS])(\\[([0-7])\\])?[^;]*;.*[\\s\\S]*");
std::smatch match, match_attr, match_pinloc;
std::string line, pinline;