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

run clangformat

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2022-10-17 12:35:02 +02:00
parent bd082132ce
commit 445d32497d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/kernel/timing.cc
View File

@ -299,9 +299,11 @@ void TimingAnalyser::identify_related_domains()
std::function<void(const NetInfo *, dict<IdString, delay_t> &, delay_t)> find_net_drivers = 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) { [&](const NetInfo *ni, dict<IdString, delay_t> &drivers, delay_t delay_acc) {
// Get driving cell and port // Get driving cell and port
if (ni == nullptr) return; if (ni == nullptr)
return;
const CellInfo *cell = ni->driver.cell; const CellInfo *cell = ni->driver.cell;
if (cell == nullptr) return; if (cell == nullptr)
return;
const IdString port = ni->driver.port; const IdString port = ni->driver.port;
@ -363,8 +365,10 @@ void TimingAnalyser::identify_related_domains()
for (const auto &domain : domains) { for (const auto &domain : domains) {
const NetInfo *ni = ctx->nets.at(domain.key.clock).get(); const NetInfo *ni = ctx->nets.at(domain.key.clock).get();
if (ni == nullptr) continue; if (ni == nullptr)
if (ni->driver.cell == nullptr) continue; continue;
if (ni->driver.cell == nullptr)
continue;
dict<IdString, delay_t> drivers; dict<IdString, delay_t> drivers;
find_net_drivers(ni, drivers, 0); find_net_drivers(ni, drivers, 0);

3
gowin/arch.cc
View File

@ -880,7 +880,8 @@ void Arch::read_cst(std::istream &in)
std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^;]+;).*[\\s\\S]*"); std::regex portre = std::regex("IO_PORT +\"([^\"]+)\" +([^;]+;).*[\\s\\S]*");
std::regex port_attrre = std::regex("([^ =;]+=[^ =;]+) *([^;]*;)"); std::regex port_attrre = std::regex("([^ =;]+=[^ =;]+) *([^;]*;)");
std::regex iobelre = std::regex("IO([TRBL])([0-9]+)\\[?([A-Z])\\]?"); 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::regex clockre = std::regex("CLOCK_LOC +\"([^\"]+)\" +BUF([GS])(\\[([0-7])\\])?[^;]*;.*[\\s\\S]*");
std::smatch match, match_attr, match_pinloc; std::smatch match, match_attr, match_pinloc;
std::string line, pinline; std::string line, pinline;