Merge pull request #693 from os-fpga/dependabot/submodules/OpenFPGA-8464cb6

build(deps): bump OpenFPGA from `fddb700` to `8464cb6`

Author: serge-dsa

CMakeLists.txt

@@ -213,7 +213,6 @@ file(COPY
 
 file(COPY
   ${PATCH_DIR}/CMAKE_fix/VPR_CMake_RS1.cmake
-  ${PATCH_DIR}/CMAKE_fix/VPR_CMake_PRODUCTION_BUILD_RS2.cmake
   DESTINATION
   ${VPR_DEST_DIR})
 message(STATUS "NOTE: ADDED to VPR-root: VPR_CMake_RS1.cmake")

OpenFPGA

@@ -1,13 +1,7 @@
 diff --git a/vpr/CMakeLists.txt b/vpr/CMakeLists.txt
-index 371d11f39..b9fe13934 100644
+index 433ef2730..fa6b7f352 100644
 --- a/vpr/CMakeLists.txt
 +++ b/vpr/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.16)
-+cmake_minimum_required(VERSION 3.9)
- 
- project("vpr")
- 
 @@ -32,6 +32,10 @@ else()
      message(STATUS "EZGL: graphics disabled")
  endif()
@@ -43,36 +37,26 @@ index 371d11f39..b9fe13934 100644
 +
  files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
 
- if(${VTR_ENABLE_CAPNPROTO})
-@@ -60,6 +82,7 @@ add_library(libvpr STATIC
+ if(${VPR_DEBUG_PARTITION_TREE})
+@@ -56,6 +78,7 @@ add_library(libvpr STATIC
 
 
  target_include_directories(libvpr PUBLIC ${LIB_INCLUDE_DIRS})
 +target_include_directories(libvpr PUBLIC ${READ_EDIF_SRC_DIR})
 
- #VPR_ANALYTIC_PLACE is inisitalized in the root CMakeLists
+ #VPR_ANALYTIC_PLACE is initialized in the root CMakeLists
  #Check Eigen dependency
-@@ -80,16 +103,9 @@ endif()
- set_target_properties(libvpr PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
- 
- #Specify link-time dependancies
--target_link_libraries(libvpr
--                        libvtrutil
--                        libarchfpga
--                        libsdcparse
--                        libblifparse
--                        libtatum
--                        libargparse
--                        libpugixml
--                        librrgraph
--)
-+# 2nd RS patch - PRODUCTION_BUILD
-+include("${CMAKE_CURRENT_LIST_DIR}/VPR_CMake_PRODUCTION_BUILD_RS2.cmake")
-+message(STATUS "NOTE: INCLUDED VPR_CMake_PRODUCTION_BUILD_RS2.cmake\n")
+@@ -85,6 +108,9 @@ target_link_libraries(libvpr
+                         libargparse
+                         libpugixml
+                         librrgraph
++                        libreadedif
++                        ${OPENSSL_LIBRARIES}
++                        ${VERIFIC_LIBS} dl
+ )
 
  #link graphics library only when graphics set to on
- if (VPR_USE_EZGL STREQUAL "on")
-@@ -236,7 +252,7 @@ endif()
+@@ -233,7 +259,7 @@ endif()
  #Configure the build to use the selected engine
  if (VPR_USE_EXECUTION_ENGINE STREQUAL "tbb")
      target_compile_definitions(libvpr PRIVATE VPR_USE_TBB)
@@ -81,11 +65,3 @@ index 371d11f39..b9fe13934 100644
      target_link_libraries(libvpr ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator
      message(STATUS "VPR: will support parallel execution using '${VPR_USE_EXECUTION_ENGINE}'")
  elseif(VPR_USE_EXECUTION_ENGINE STREQUAL "serial")
-@@ -257,7 +273,6 @@ if (VPR_USE_SIGNAL_HANDLER)
- endif()
- 
- install(TARGETS vpr libvpr DESTINATION bin)
--install(FILES ${LIB_HEADERS} DESTINATION include/libvpr)
- 
- 
- #

include/CMAKE_fix/VPR_CMake.diff

@@ -2,28 +2,13 @@
 #  1st Rapid Silicon addition to VPR CMake
 #
 
-if (PRODUCTION_BUILD)
-    if(NOT RAPTOR)
-        get_filename_component(FLEX_LM_SRC_DIR "../../../Raptor_Tools/Flex_LM"
-        REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-        add_subdirectory(${FLEX_LM_SRC_DIR} flex_lm)
-    endif()
-    message("Production Build type set to ON")
-    set (PRODUCTION_BUILD_FLAG "-DPRODUCTION_BUILD=1")
-    add_definitions(-DPRODUCTION_BUILD)
-    message("FLEX: "  ${FLEX_LM_SRC_DIR})
-endif(PRODUCTION_BUILD)
-
 option(ENABLE_VERIFIC "Enable Verific front end" OFF)
-
 if (NOT RAPTOR)
-
     if(ENABLE_VERIFIC)
         get_filename_component(VERIFIC_HOME "../../../Raptor_Tools/verific_rs/"
         REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE)
         add_subdirectory(${VERIFIC_HOME} verific_rs)
     endif()
-
     get_filename_component(READ_EDIF_SRC_DIR "../../../Raptor_Tools/gatelevel_readers/read_edif"
     REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE)
     add_subdirectory(${READ_EDIF_SRC_DIR} read_edif)