diff options
| -rw-r--r-- | ecp5/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | ecp5/pack.cc | 6 | ||||
| -rw-r--r-- | ice40/CMakeLists.txt | 2 |
3 files changed, 33 insertions, 5 deletions
diff --git a/ecp5/CMakeLists.txt b/ecp5/CMakeLists.txt index 303208ed..fe7de587 100644 --- a/ecp5/CMakeLists.txt +++ b/ecp5/CMakeLists.txt @@ -25,15 +25,39 @@ else() "Trellis install prefix") message(STATUS "Trellis install prefix: ${TRELLIS_INSTALL_PREFIX}") - if(NOT DEFINED TRELLIS_LIBDIR) + if(NOT TRELLIS_LIBDIR) + # The pytrellis library isn't a normal shared library, but rather a native Python library; + # it does not follow the normal platform conventions for shared libraries, so we can't just + # use find_library() here. Instead, we emulate the useful parts of the find_library() logic + # for use with find_path(). + set(pytrellis_paths) + foreach(prefix_path ${CMAKE_PREFIX_PATH}) + list(APPEND pytrellis_paths ${prefix_path}/lib) + if(CMAKE_LIBRARY_ARCHITECTURE) + list(APPEND pytrellis_paths ${prefix_path}/lib/${CMAKE_LIBRARY_ARCHITECTURE}) + endif() + endforeach() + list(APPEND pytrellis_paths ${CMAKE_LIBRARY_PATH}) + if(NOT NO_CMAKE_SYSTEM_PATH) + foreach(prefix_path ${CMAKE_SYSTEM_PREFIX_PATH}) + list(APPEND pytrellis_paths ${prefix_path}/lib) + if(CMAKE_LIBRARY_ARCHITECTURE) + list(APPEND pytrellis_paths ${prefix_path}/lib/${CMAKE_LIBRARY_ARCHITECTURE}) + endif() + endforeach() + list(APPEND pytrellis_paths ${CMAKE_SYSTEM_LIBRARY_PATH}) + endif() + message(STATUS "Searching for pytrellis in: ${pytrellis_paths}") + if(WIN32) set(pytrellis_lib pytrellis.pyd) else() set(pytrellis_lib pytrellis${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() + find_path(TRELLIS_LIBDIR ${pytrellis_lib} HINTS ${TRELLIS_INSTALL_PREFIX}/lib/${TRELLIS_PROGRAM_PREFIX}trellis - PATHS ${CMAKE_SYSTEM_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} + PATHS ${pytrellis_paths} PATH_SUFFIXES ${TRELLIS_PROGRAM_PREFIX}trellis DOC "Location of the pytrellis library") if(NOT TRELLIS_LIBDIR) @@ -42,7 +66,7 @@ else() endif() message(STATUS "Trellis library directory: ${TRELLIS_LIBDIR}") - if(NOT DEFINED TRELLIS_DATADIR) + if(NOT TRELLIS_DATADIR) set(TRELLIS_DATADIR ${TRELLIS_INSTALL_PREFIX}/share/${TRELLIS_PROGRAM_PREFIX}trellis) endif() message(STATUS "Trellis data directory: ${TRELLIS_DATADIR}") diff --git a/ecp5/pack.cc b/ecp5/pack.cc index fb8a95e9..501f55b6 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -2853,10 +2853,14 @@ class Ecp5Packer while (!changed_nets.empty() && iter < itermax) { ++iter; std::unordered_set<IdString> changed_cells; - for (auto net : changed_nets) + for (auto net : changed_nets) { for (auto &user : ctx->nets.at(net)->users) if (user.port == id_CLKI || user.port == id_ECLKI || user.port == id_CLK0 || user.port == id_CLK1) changed_cells.insert(user.cell->name); + auto &drv = ctx->nets.at(net)->driver; + if (iter == 1 && drv.cell != nullptr && drv.port == id_OSC) + changed_cells.insert(drv.cell->name); + } changed_nets.clear(); for (auto cell : sorted(changed_cells)) { CellInfo *ci = ctx->cells.at(cell).get(); diff --git a/ice40/CMakeLists.txt b/ice40/CMakeLists.txt index 1bf64905..89203bbc 100644 --- a/ice40/CMakeLists.txt +++ b/ice40/CMakeLists.txt @@ -27,7 +27,7 @@ else() "IceStorm install prefix") message(STATUS "IceStorm install prefix: ${ICESTORM_INSTALL_PREFIX}") - if(NOT DEFINED ICEBOX_DATADIR) + if(NOT ICEBOX_DATADIR) set(ICEBOX_DATADIR ${ICESTORM_INSTALL_PREFIX}/share/icebox) endif() message(STATUS "icebox data directory: ${ICEBOX_DATADIR}") |