diff options
| -rw-r--r-- | common/arch_pybindings_shared.h | 4 | ||||
| -rw-r--r-- | ecp5/arch_pybindings.cc | 3 | ||||
| -rw-r--r-- | ice40/arch_pybindings.cc | 4 | ||||
| -rw-r--r-- | nexus/arch.h | 1 | ||||
| -rw-r--r-- | nexus/arch_pybindings.cc | 3 |
5 files changed, 11 insertions, 4 deletions
diff --git a/common/arch_pybindings_shared.h b/common/arch_pybindings_shared.h index 8bb93a80..88f95020 100644 --- a/common/arch_pybindings_shared.h +++ b/common/arch_pybindings_shared.h @@ -91,9 +91,9 @@ fn_wrapper_1a<Context, decltype(&Context::getBoundPipNet), &Context::getBoundPip fn_wrapper_1a<Context, decltype(&Context::getConflictingPipNet), &Context::getConflictingPipNet, deref_and_wrap<NetInfo>, conv_from_str<PipId>>::def_wrap(ctx_cls, "getConflictingPipNet"); -fn_wrapper_1a<Context, decltype(&Context::getPipsDownhill), &Context::getPipsDownhill, wrap_context<PipRange>, +fn_wrapper_1a<Context, decltype(&Context::getPipsDownhill), &Context::getPipsDownhill, wrap_context<DownhillPipRange>, conv_from_str<WireId>>::def_wrap(ctx_cls, "getPipsDownhill"); -fn_wrapper_1a<Context, decltype(&Context::getPipsUphill), &Context::getPipsUphill, wrap_context<PipRange>, +fn_wrapper_1a<Context, decltype(&Context::getPipsUphill), &Context::getPipsUphill, wrap_context<UphillPipRange>, conv_from_str<WireId>>::def_wrap(ctx_cls, "getPipsUphill"); fn_wrapper_1a<Context, decltype(&Context::getPipSrcWire), &Context::getPipSrcWire, conv_to_str<WireId>, diff --git a/ecp5/arch_pybindings.cc b/ecp5/arch_pybindings.cc index b8e48ccf..8618bec1 100644 --- a/ecp5/arch_pybindings.cc +++ b/ecp5/arch_pybindings.cc @@ -56,6 +56,9 @@ void arch_wrap_python(py::module &m) readonly_wrapper<BelPin, decltype(&BelPin::bel), &BelPin::bel, conv_to_str<BelId>>::def_wrap(belpin_cls, "bel"); readonly_wrapper<BelPin, decltype(&BelPin::pin), &BelPin::pin, conv_to_str<IdString>>::def_wrap(belpin_cls, "pin"); + typedef const PipRange UphillPipRange; + typedef const PipRange DownhillPipRange; + #include "arch_pybindings_shared.h" WRAP_RANGE(m, Bel, conv_to_str<BelId>); diff --git a/ice40/arch_pybindings.cc b/ice40/arch_pybindings.cc index 9011d1dc..921956e8 100644 --- a/ice40/arch_pybindings.cc +++ b/ice40/arch_pybindings.cc @@ -72,6 +72,9 @@ void arch_wrap_python(py::module &m) readonly_wrapper<BelPin, decltype(&BelPin::bel), &BelPin::bel, conv_to_str<BelId>>::def_wrap(belpin_cls, "bel"); readonly_wrapper<BelPin, decltype(&BelPin::pin), &BelPin::pin, conv_to_str<IdString>>::def_wrap(belpin_cls, "pin"); + typedef const PipRange UphillPipRange; + typedef const PipRange DownhillPipRange; + #include "arch_pybindings_shared.h" WRAP_RANGE(m, Bel, conv_to_str<BelId>); @@ -80,6 +83,7 @@ void arch_wrap_python(py::module &m) WRAP_RANGE(m, Pip, conv_to_str<PipId>); WRAP_RANGE(m, BelPin, wrap_context<BelPin>); + WRAP_MAP_UPTR(m, CellMap, "IdCellMap"); WRAP_MAP_UPTR(m, NetMap, "IdNetMap"); WRAP_MAP(m, HierarchyMap, wrap_context<HierarchicalCell &>, "HierarchyMap"); diff --git a/nexus/arch.h b/nexus/arch.h index 8952ba6f..56b48bf3 100644 --- a/nexus/arch.h +++ b/nexus/arch.h @@ -999,7 +999,6 @@ struct Arch : BaseCtx BelId getBelByLocation(Loc loc) const { - BelId ret; auto &t = tileStatus.at(loc.y * chip_info->width + loc.x); if (loc.z >= int(t.bels_by_z.size())) return BelId(); diff --git a/nexus/arch_pybindings.cc b/nexus/arch_pybindings.cc index caab8312..1a3890ff 100644 --- a/nexus/arch_pybindings.cc +++ b/nexus/arch_pybindings.cc @@ -51,7 +51,8 @@ void arch_wrap_python(py::module &m) typedef std::unordered_map<IdString, HierarchicalCell> HierarchyMap; typedef std::unordered_map<IdString, IdString> AliasMap; - typedef UpDownhillPipRange PipRange; + typedef UpDownhillPipRange UphillPipRange; + typedef UpDownhillPipRange DownhillPipRange; typedef WireBelPinRange BelPinRange; #include "arch_pybindings_shared.h" |