aboutsummaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorKeith Rothman <537074+litghost@users.noreply.github.com>2021-02-01 14:28:32 -0800
committerKeith Rothman <537074+litghost@users.noreply.github.com>2021-02-02 07:44:49 -0800
commitda74a425d23352d7cddf9d1c4b0b7c86dd567c40 (patch)
tree3657232a91e97f839cd9114f40aa0c565afc23d4 /generic
parent01509ec7c991f0ec674fd933095dfe52be28b46f (diff)
downloadnextpnr-da74a425d23352d7cddf9d1c4b0b7c86dd567c40.tar.gz
nextpnr-da74a425d23352d7cddf9d1c4b0b7c86dd567c40.tar.bz2
nextpnr-da74a425d23352d7cddf9d1c4b0b7c86dd567c40.zip
Run "make clangformat".
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Diffstat (limited to 'generic')
-rw-r--r--generic/arch.h36
-rw-r--r--generic/arch_pybindings.cc28
2 files changed, 25 insertions, 39 deletions
diff --git a/generic/arch.h b/generic/arch.h
index 924115a7..f3e26bb5 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -271,40 +271,32 @@ struct Arch : BaseCtx
bool place();
bool route();
- std::vector<IdString> getCellTypes() const {
+ std::vector<IdString> getCellTypes() const
+ {
std::vector<IdString> cell_types;
cell_types.reserve(bels.size());
- for(auto bel : bels) {
+ for (auto bel : bels) {
cell_types.push_back(bel.first);
}
return cell_types;
}
- std::vector<BelBucketId> getBelBuckets() const {
- return getCellTypes();
- }
+ std::vector<BelBucketId> getBelBuckets() const { return getCellTypes(); }
- IdString getBelBucketName(BelBucketId bucket) const {
- return bucket;
- }
+ IdString getBelBucketName(BelBucketId bucket) const { return bucket; }
- BelBucketId getBelBucketByName(IdString bucket) const {
- return bucket;
- }
+ BelBucketId getBelBucketByName(IdString bucket) const { return bucket; }
- BelBucketId getBelBucketForBel(BelId bel) const {
- return getBelType(bel);
- }
+ BelBucketId getBelBucketForBel(BelId bel) const { return getBelType(bel); }
- BelBucketId getBelBucketForCellType(IdString cell_type) const {
- return cell_type;
- }
+ BelBucketId getBelBucketForCellType(IdString cell_type) const { return cell_type; }
- std::vector<BelId> getBelsInBucket(BelBucketId bucket) const {
+ std::vector<BelId> getBelsInBucket(BelBucketId bucket) const
+ {
std::vector<BelId> bels;
- for(BelId bel : getBels()) {
- if(bucket == getBelBucketForBel(bel)) {
+ for (BelId bel : getBels()) {
+ if (bucket == getBelBucketForBel(bel)) {
bels.push_back(bel);
}
}
@@ -323,9 +315,7 @@ struct Arch : BaseCtx
// Get the TimingClockingInfo of a port
TimingClockingInfo getPortClockingInfo(const CellInfo *cell, IdString port, int index) const;
- bool isValidBelForCellType(IdString cell_type, BelId bel) const {
- return cell_type == getBelType(bel);
- }
+ bool isValidBelForCellType(IdString cell_type, BelId bel) const { return cell_type == getBelType(bel); }
bool isValidBelForCell(CellInfo *cell, BelId bel) const;
bool isBelLocationValid(BelId bel) const;
diff --git a/generic/arch_pybindings.cc b/generic/arch_pybindings.cc
index 9e98bfe5..23f2c05c 100644
--- a/generic/arch_pybindings.cc
+++ b/generic/arch_pybindings.cc
@@ -227,30 +227,26 @@ void arch_wrap_python(py::module &m)
"clock"_a, "clktoq"_a);
// const\_range\<BelBucketId\> getBelBuckets() const
- fn_wrapper_0a<Context, decltype(&Context::getBelBuckets),
- &Context::getBelBuckets,
- wrap_context<const std::vector<BelBucketId> &>>::def_wrap(ctx_cls, "getBelBuckets");
+ fn_wrapper_0a<Context, decltype(&Context::getBelBuckets), &Context::getBelBuckets,
+ wrap_context<const std::vector<BelBucketId> &>>::def_wrap(ctx_cls, "getBelBuckets");
// BelBucketId getBelBucketForBel(BelId bel) const
- fn_wrapper_1a<Context, decltype(&Context::getBelBucketForBel),
- &Context::getBelBucketForBel, conv_to_str<BelBucketId>,
- conv_from_str<BelId>>::def_wrap(ctx_cls, "getBelBucketForBel");
+ fn_wrapper_1a<Context, decltype(&Context::getBelBucketForBel), &Context::getBelBucketForBel,
+ conv_to_str<BelBucketId>, conv_from_str<BelId>>::def_wrap(ctx_cls, "getBelBucketForBel");
// BelBucketId getBelBucketForCellType(IdString cell\_type) const
- fn_wrapper_1a<Context, decltype(&Context::getBelBucketForCellType),
- &Context::getBelBucketForCellType, conv_to_str<BelBucketId>,
- conv_from_str<IdString>>::def_wrap(ctx_cls, "getBelBucketForCellType");
+ fn_wrapper_1a<Context, decltype(&Context::getBelBucketForCellType), &Context::getBelBucketForCellType,
+ conv_to_str<BelBucketId>, conv_from_str<IdString>>::def_wrap(ctx_cls, "getBelBucketForCellType");
// const\_range\<BelId\> getBelsInBucket(BelBucketId bucket) const
- fn_wrapper_1a<Context, decltype(&Context::getBelsInBucket),
- &Context::getBelsInBucket, wrap_context<const std::vector<BelId> &>,
- conv_from_str<BelBucketId>>::def_wrap(ctx_cls, "getBelsInBucket");
+ fn_wrapper_1a<Context, decltype(&Context::getBelsInBucket), &Context::getBelsInBucket,
+ wrap_context<const std::vector<BelId> &>, conv_from_str<BelBucketId>>::def_wrap(ctx_cls,
+ "getBelsInBucket");
// bool isValidBelForCellType(IdString cell\_type, BelId bel) const
- fn_wrapper_2a<Context, decltype(&Context::isValidBelForCellType),
- &Context::isValidBelForCellType, pass_through<bool>,
- conv_from_str<IdString>, conv_from_str<BelId>>::def_wrap(
- ctx_cls, "isValidBelForCellType");
+ fn_wrapper_2a<Context, decltype(&Context::isValidBelForCellType), &Context::isValidBelForCellType,
+ pass_through<bool>, conv_from_str<IdString>, conv_from_str<BelId>>::def_wrap(ctx_cls,
+ "isValidBelForCellType");
WRAP_MAP_UPTR(m, CellMap, "IdCellMap");
WRAP_MAP_UPTR(m, NetMap, "IdNetMap");