From 363ddd0f3c6e1e2f9e5caf2851ffcacf32765437 Mon Sep 17 00:00:00 2001 From: David Shah Date: Sat, 2 Jun 2018 13:33:45 +0200 Subject: Python bindings working on both architectures Signed-off-by: David Shah --- common/pybindings.cc | 64 ++-------------------------------------- common/pybindings.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 61 deletions(-) create mode 100644 common/pybindings.h (limited to 'common') diff --git a/common/pybindings.cc b/common/pybindings.cc index 839ba7df..8bae4e51 100644 --- a/common/pybindings.cc +++ b/common/pybindings.cc @@ -20,78 +20,20 @@ #include "design.h" #include "chip.h" -#include -#include -#include -#include -#include -#include - -using namespace boost::python; +#include "pybindings.h" +// Required to determine concatenated module name (which differs for different archs) #define PASTER(x, y) x ## _ ## y #define EVALUATOR(x, y) PASTER(x,y) #define MODULE_NAME EVALUATOR(nextpnrpy, ARCHNAME) -/* -A wrapper for a Pythonised nextpnr Iterator. The actual class wrapped is a -pair containing (current, end) -*/ - -template -struct iterator_wrapper { - typedef decltype(*(std::declval())) value_t; - - static value_t next(std::pair &iter) { - if (iter.first != iter.second) { - value_t val = *iter.first; - ++iter.first; - return val; - } else { - PyErr_SetString(PyExc_StopIteration, "End of range reached"); - boost::python::throw_error_already_set(); - // Should be unreachable, but prevent control may reach end of non-void - throw std::runtime_error("unreachable"); - } - } - - static void wrap(const char *python_name) { - class_>(python_name, no_init) - .def("__next__", next); - } -}; - -/* -A wrapper for a nextpnr Range. Ranges should have two functions, begin() -and end() which return iterator-like objects supporting ++, * and != -Full STL iterator semantics are not required, unlike the standard Boost wrappers -*/ - -template -struct range_wrapper { - typedef decltype(std::declval().begin()) iterator_t; - - static std::pair iter(T &range) { - return std::make_pair(range.begin(), range.end()); - } - - static void wrap(const char *range_name, const char *iter_name) { - class_(range_name, no_init) - .def("__iter__", iter); - iterator_wrapper().wrap(iter_name); - } -}; - -#define WRAP_RANGE(t) range_wrapper().wrap(#t "Range", #t "Iterator") - // Architecture-specific bindings should be created in the below function, which must be implemented in all // architectures void arch_wrap_python(); BOOST_PYTHON_MODULE (MODULE_NAME) { // From Chip.h - WRAP_RANGE(Bels); - WRAP_RANGE(AllWires); + WRAP_RANGE(Bel); WRAP_RANGE(WireDelay); WRAP_RANGE(BelPin); diff --git a/common/pybindings.h b/common/pybindings.h new file mode 100644 index 00000000..eab2039d --- /dev/null +++ b/common/pybindings.h @@ -0,0 +1,83 @@ +/* + * nextpnr -- Next Generation Place and Route + * + * Copyright (C) 2018 Clifford Wolf + * Copyright (C) 2018 David Shah + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#ifndef COMMON_PYBINDINGS_H +#define COMMON_PYBINDINGS_H +#include +#include +#include +#include +#include +#include + +using namespace boost::python; +/* +A wrapper for a Pythonised nextpnr Iterator. The actual class wrapped is a +pair containing (current, end) +*/ + +template +struct iterator_wrapper { + typedef decltype(*(std::declval())) value_t; + + static value_t next(std::pair &iter) { + if (iter.first != iter.second) { + value_t val = *iter.first; + ++iter.first; + return val; + } else { + PyErr_SetString(PyExc_StopIteration, "End of range reached"); + boost::python::throw_error_already_set(); + // Should be unreachable, but prevent control may reach end of non-void + throw std::runtime_error("unreachable"); + } + } + + static void wrap(const char *python_name) { + class_>(python_name, no_init) + .def("__next__", next); + } +}; + +/* +A wrapper for a nextpnr Range. Ranges should have two functions, begin() +and end() which return iterator-like objects supporting ++, * and != +Full STL iterator semantics are not required, unlike the standard Boost wrappers +*/ + +template +struct range_wrapper { + typedef decltype(std::declval().begin()) iterator_t; + + static std::pair iter(T &range) { + return std::make_pair(range.begin(), range.end()); + } + + static void wrap(const char *range_name, const char *iter_name) { + class_(range_name, no_init) + .def("__iter__", iter); + iterator_wrapper().wrap(iter_name); + } +}; + +#define WRAP_RANGE(t) range_wrapper().wrap(#t "Range", #t "Iterator") + + +#endif /* end of include guard: COMMON_PYBINDINGS_HH */ -- cgit v1.2.3