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

(broken) third round of review fixes

Browse Source
This commit is contained in:
Lofty 2024-01-02 20:15:42 +00:00 committed by myrtle
parent 49d505831d
commit 1bbcc5f2c4
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/kernel/pybindings.cc
View File

@ -25,6 +25,7 @@
#include "json_frontend.h" #include "json_frontend.h"
#include "log.h" #include "log.h"
#include "nextpnr.h" #include "nextpnr.h"
#include "rust.h"
#include <fstream> #include <fstream>
#include <memory> #include <memory>
@ -248,6 +249,9 @@ PYBIND11_EMBEDDED_MODULE(MODULE_NAME, m)
m.def("parse_json", parse_json_shim); m.def("parse_json", parse_json_shim);
m.def("load_design", load_design_shim, py::return_value_policy::take_ownership); m.def("load_design", load_design_shim, py::return_value_policy::take_ownership);
#ifdef USE_RUST
m.def("example_printnets", example_printnets);
#endif
auto region_cls = py::class_<ContextualWrapper<Region &>>(m, "Region"); auto region_cls = py::class_<ContextualWrapper<Region &>>(m, "Region");
readwrite_wrapper<Region &, decltype(&Region::name), &Region::name, conv_to_str<IdString>, readwrite_wrapper<Region &, decltype(&Region::name), &Region::name, conv_to_str<IdString>,

6
ice40/arch.cc
View File

@ -643,12 +643,6 @@ std::vector<GroupId> Arch::getGroupGroups(GroupId group) const
bool Arch::place() bool Arch::place()
{ {
#ifdef USE_RUST
log_info("Calling Rust\n");
example_printnets(getCtx());
log_info("Returned from Rust\n");
#endif
std::string placer = str_or_default(settings, id_placer, defaultPlacer); std::string placer = str_or_default(settings, id_placer, defaultPlacer);
if (placer == "heap") { if (placer == "heap") {
PlacerHeapCfg cfg(getCtx()); PlacerHeapCfg cfg(getCtx());

2
rust/rust.cc
View File

@ -142,7 +142,7 @@ extern "C" {
*nets = new NetInfo*[size]; *nets = new NetInfo*[size];
auto idx = 0; auto idx = 0;
for (auto& item : ctx->nets) { for (auto& item : ctx->nets) {
*names[idx] = item.first.hash(); *names[idx] = item.first.index;
*nets[idx] = item.second.get(); *nets[idx] = item.second.get();
idx++; idx++;
} }