Merge pull request #1907 from antmicro/acom/fpga-interchange-initial-arch-reading

FPGA Interchange: Initial interchange device reading

Author: acomodi

.github/scripts/install_dependencies.sh

@@ -10,6 +10,7 @@ sudo apt install -y \
   binutils \
   binutils-gold \
   build-essential \
+  capnproto \
   cmake \
   ctags \
   curl \
@@ -20,6 +21,7 @@ sudo apt install -y \
   git \
   gperf \
   libcairo2-dev \
+  libcapnp-dev \
   libgtk-3-dev \
   libevent-dev \
   libfontconfig1-dev \
@@ -54,3 +56,9 @@ sudo apt install -y \
 #  libtbb-dev
 
 pip install -r requirements.txt
+
+git clone https://github.com/capnproto/capnproto-java.git $GITHUB_WORKSPACE/env/capnproto-java
+pushd $GITHUB_WORKSPACE/env/capnproto-java
+make
+sudo make install
+popd

CMakeLists.txt

@@ -40,6 +40,7 @@ option(VTR_ENABLE_CAPNPROTO "Enable capnproto binary serialization support in VP
 #Allow the user to enable/disable VPR analytic placement
 #VPR option --enable_analytic_placer is also required for Analytic Placement
 option(VPR_ANALYTIC_PLACE "Enable analytic placement in VPR." ON)
+option(VPR_ENABLE_INTERCHANGE "Enable FPGA interchange." ON)
 
 option(WITH_BLIFEXPLORER "Enable build with blifexplorer" OFF)
 
@@ -121,6 +122,11 @@ endif()
 # Build type flags
 #
 
+set(EXTRA_FLAGS "")
+if(VPR_ENABLE_INTERCHANGE)
+    set(EXTRA_FLAGS "-lz")
+endif()
+
 if(NOT MSVC)
     # for GCC and Clang
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g3")
@@ -295,7 +301,7 @@ endif()
 # Set final flags
 #
 separate_arguments(
-    ADDITIONAL_FLAGS UNIX_COMMAND "${SANITIZE_FLAGS} ${PROFILING_FLAGS} ${COVERAGE_FLAGS} ${LOGGING_FLAGS} ${COLORED_COMPILE}"
+    ADDITIONAL_FLAGS UNIX_COMMAND "${SANITIZE_FLAGS} ${PROFILING_FLAGS} ${COVERAGE_FLAGS} ${LOGGING_FLAGS} ${COLORED_COMPILE} ${EXTRA_FLAGS}"
     )
 separate_arguments(
     WARN_FLAGS UNIX_COMMAND "${WARN_FLAGS}"
@@ -366,7 +372,6 @@ if (VPR_USE_EZGL STREQUAL "auto")
     endif()
 endif()
 
-
 #Add the various sub-projects
 if(${WITH_ABC})
     add_subdirectory(abc)

libs/EXTERNAL/CMakeLists.txt

@@ -8,7 +8,7 @@ add_subdirectory(libblifparse)
 add_subdirectory(libtatum)
 add_subdirectory(libcatch2)
 
-#VPR_USE_EZGL is initialized in the root CMakeLists. 
+#VPR_USE_EZGL is initialized in the root CMakeLists.
 #compile libezgl only if the user asks for or has its dependencies installed.
 if(VPR_USE_EZGL STREQUAL "on")
     add_subdirectory(libezgl)

libs/libarchfpga/CMakeLists.txt

@@ -12,16 +12,23 @@ list(REMOVE_ITEM LIB_SOURCES ${EXEC_SOURCES})
 
 #Create the library
 add_library(libarchfpga STATIC
-             ${LIB_HEADERS}
-             ${LIB_SOURCES})
+    ${LIB_HEADERS}
+    ${LIB_SOURCES}
+)
+
 target_include_directories(libarchfpga PUBLIC ${LIB_INCLUDE_DIRS})
+
 set_target_properties(libarchfpga PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
 
 #Specify link-time dependancies
 target_link_libraries(libarchfpga
                         libvtrutil
                         libpugixml
-                        libpugiutil)
+                        libpugiutil
+                        libvtrcapnproto
+)
+
+target_compile_definitions(libarchfpga PUBLIC ${INTERCHANGE_SCHEMA_HEADERS})
 
 #Create the test executable
 add_executable(read_arch ${EXEC_SOURCES})