From f02d1dd446b10a43ce8cb5cb29926ee48d9c9345 Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 14 Sep 2024 22:22:20 +0000 Subject: [PATCH 1/6] Update igraph to 0.10.13 --- deps/igraph-0.10.x/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/igraph-0.10.x/CMakeLists.txt b/deps/igraph-0.10.x/CMakeLists.txt index 8c9a4f76865..315b192a71b 100644 --- a/deps/igraph-0.10.x/CMakeLists.txt +++ b/deps/igraph-0.10.x/CMakeLists.txt @@ -8,7 +8,7 @@ set (IGRAPH_INCLUDES "${IGRAPH_INSTALL}/include") set (IGRAPH_LIB "${IGRAPH_INSTALL}/lib/libigraph${CMAKE_SHARED_LIBRARY_SUFFIX}") set (HAVE_IGRAPH TRUE) -message("-- IGRAPH version 0.10.12 : download and build libigraph${CMAKE_SHARED_LIBRARY_SUFFIX} in ${IGRAPH_BASE}") +message("-- IGRAPH version 0.10.13 : download and build libigraph${CMAKE_SHARED_LIBRARY_SUFFIX} in ${IGRAPH_BASE}") #Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") @@ -17,9 +17,9 @@ endif() ExternalProject_Add(igraph_0_10 PREFIX "${IGRAPH_INSTALL}" - URL "https://github.com/igraph/igraph/releases/download/0.10.12/igraph-0.10.12.tar.gz" + URL "https://github.com/igraph/igraph/releases/download/0.10.13/igraph-0.10.13.tar.gz" SOURCE_DIR "${IGRAPH_DOWNLOAD}" - CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${IGRAPH_INSTALL}" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-Wno-deprecated" "-DIGRAPH_VERSION=0.10.12" + CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${IGRAPH_INSTALL}" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-Wno-deprecated" BINARY_DIR "${IGRAPH_BUILD}" PATCH_COMMAND echo "No patch for igraph-0.10.x required" INSTALL_DIR "${IGRAPH_INSTALL}" From f67c7170eb9f8416d0133200c22469d7a723562a Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 14 Sep 2024 22:23:25 +0000 Subject: [PATCH 2/6] Add missing algorithm header --- include/hal_core/utilities/utils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hal_core/utilities/utils.h b/include/hal_core/utilities/utils.h index 036343ed5c5..9fb3b23bc9f 100644 --- a/include/hal_core/utilities/utils.h +++ b/include/hal_core/utilities/utils.h @@ -32,6 +32,7 @@ #include "hal_core/defines.h" #include "hal_core/utilities/result.h" +#include #include #include #include @@ -775,4 +776,4 @@ namespace hal */ CORE_API Result wrapped_stoul(const std::string& s, const u32 base = 10); } // namespace utils -} // namespace hal \ No newline at end of file +} // namespace hal From 097c49e04045b3d6ec0fd58e98dc7a7cccb6f320 Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 14 Sep 2024 23:06:13 +0000 Subject: [PATCH 3/6] Cast Z3_decl_kind to std::size_t --- plugins/z3_utils/src/simplification.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp index d64cab665f2..fd70031e149 100644 --- a/plugins/z3_utils/src/simplification.cpp +++ b/plugins/z3_utils/src/simplification.cpp @@ -617,7 +617,7 @@ namespace hal return false; default: { - log_error("z3_utils", "commutative check not implemeted for type {}!", t); + log_error("z3_utils", "commutative check not implemeted for type {}!", static_cast(t)); return false; } } From 7b7a831bf23dbd587f356419c7793f0618a791ca Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 14 Sep 2024 23:23:06 +0000 Subject: [PATCH 4/6] Fix using system igraph --- cmake/detect_dependencies.cmake | 2 +- plugins/graph_algorithm/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/detect_dependencies.cmake b/cmake/detect_dependencies.cmake index ce1dda8d011..ac41c87bc90 100644 --- a/cmake/detect_dependencies.cmake +++ b/cmake/detect_dependencies.cmake @@ -291,5 +291,5 @@ else() find_package(igraph REQUIRED) get_target_property(igraph_LIBRARIES igraph::igraph IMPORTED_LOCATION_RELEASE) get_target_property(igraph_INCLUDES igraph::igraph INTERFACE_INCLUDE_DIRECTORIES) - message(STATUS "Using system's igraph from ${igraph_LIBRARIES}") + message(STATUS "Using system igraph ${igraph_VERSION} from ${igraph_LIBRARIES}") endif() diff --git a/plugins/graph_algorithm/CMakeLists.txt b/plugins/graph_algorithm/CMakeLists.txt index 5db5f4a6c1a..00e8772b5ae 100644 --- a/plugins/graph_algorithm/CMakeLists.txt +++ b/plugins/graph_algorithm/CMakeLists.txt @@ -14,6 +14,7 @@ if(PL_GRAPH_ALGORITHM OR BUILD_ALL_PLUGINS) LINK_LIBRARIES PUBLIC ${igraph_LIBRARIES} ) -add_dependencies(graph_algorithm igraph_0_10) - + if(USE_VENDORED_IGRAPH) + add_dependencies(graph_algorithm igraph_0_10) + endif() endif() From 818cd1b89883ce0cd119bf4d453f17ff3d83f258 Mon Sep 17 00:00:00 2001 From: xiota Date: Sun, 15 Sep 2024 02:37:55 +0000 Subject: [PATCH 5/6] Cast m_multithreading_priority to std::size_t --- .../module_identification/src/api/module_identification.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp index 808875e8a68..67f33a04c40 100644 --- a/plugins/module_identification/src/api/module_identification.cpp +++ b/plugins/module_identification/src/api/module_identification.cpp @@ -406,7 +406,7 @@ namespace hal const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1); - log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority); + log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, static_cast(config.m_multithreading_priority)); auto stats = Statistics(); @@ -561,4 +561,4 @@ namespace hal return execute_on_structural_candidates(base_to_structural_candidates, config); } } // namespace module_identification -} // namespace hal \ No newline at end of file +} // namespace hal From 98a8e061ace7565130b5896ae9502e8791c63f29 Mon Sep 17 00:00:00 2001 From: xiota Date: Sun, 15 Sep 2024 03:03:29 +0000 Subject: [PATCH 6/6] Enable plugins required by logic_evaluator plugin * genlib_writer * netlist_simulator_controller * resynthesis * simulator --- plugins/genlib_writer/CMakeLists.txt | 2 +- plugins/resynthesis/CMakeLists.txt | 2 +- plugins/simulator/CMakeLists.txt | 2 +- plugins/simulator/netlist_simulator_controller/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/genlib_writer/CMakeLists.txt b/plugins/genlib_writer/CMakeLists.txt index 955637dccfb..933cd86811b 100644 --- a/plugins/genlib_writer/CMakeLists.txt +++ b/plugins/genlib_writer/CMakeLists.txt @@ -1,4 +1,4 @@ -option(PL_GENLIB_WRITER "PL_GENLIB_WRITER" OFF) +option(PL_GENLIB_WRITER "PL_GENLIB_WRITER" ON) if(PL_GENLIB_WRITER OR BUILD_ALL_PLUGINS) file(GLOB_RECURSE GENLIB_WRITER_INC ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h) file(GLOB_RECURSE GENLIB_WRITER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) diff --git a/plugins/resynthesis/CMakeLists.txt b/plugins/resynthesis/CMakeLists.txt index 9fde507b982..f3a5cc4fa8d 100644 --- a/plugins/resynthesis/CMakeLists.txt +++ b/plugins/resynthesis/CMakeLists.txt @@ -1,4 +1,4 @@ -option(PL_RESYNTHESIS "PL_RESYNTHESIS" OFF) +option(PL_RESYNTHESIS "PL_RESYNTHESIS" ON) if(PL_RESYNTHESIS OR BUILD_ALL_PLUGINS) diff --git a/plugins/simulator/CMakeLists.txt b/plugins/simulator/CMakeLists.txt index 28ea518ad5c..e6a8bda219f 100644 --- a/plugins/simulator/CMakeLists.txt +++ b/plugins/simulator/CMakeLists.txt @@ -1,4 +1,4 @@ -option(PL_SIMULATOR "PL_SIMULATOR" OFF) +option(PL_SIMULATOR "PL_SIMULATOR" ON) if(PL_SIMULATOR OR BUILD_ALL_PLUGINS) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/plugins/simulator/netlist_simulator_controller/CMakeLists.txt b/plugins/simulator/netlist_simulator_controller/CMakeLists.txt index eb059700b4c..a7496d51fb7 100644 --- a/plugins/simulator/netlist_simulator_controller/CMakeLists.txt +++ b/plugins/simulator/netlist_simulator_controller/CMakeLists.txt @@ -1,4 +1,4 @@ -option(PL_NETLIST_SIMULATOR_CONTROLLER "PL_NETLIST_SIMULATOR_CONTROLLER" OFF) +option(PL_NETLIST_SIMULATOR_CONTROLLER "PL_NETLIST_SIMULATOR_CONTROLLER" ON) if(PL_NETLIST_SIMULATOR_CONTROLLER OR PL_SIMULATOR OR BUILD_ALL_PLUGINS) find_package(Qt5 COMPONENTS Core REQUIRED)