Merge pull request #1796 from antmicro/package-also-circuits

Package also circuits

.github/kokoro/continuous-install-200t.cfg

@@ -11,7 +11,7 @@ timeout_mins: 4320
 action {
   define_artifacts {
     # File types
-    regex: "**/symbiflow-arch-defs-install-200t*.tar.xz"
+    regex: "**/symbiflow-arch-defs-*.tar.xz"
     strip_prefix: "github/symbiflow-arch-defs-continuous-install-200t/"
   }
 }

.github/kokoro/continuous-install.cfg

@@ -11,7 +11,7 @@ timeout_mins: 4320
 action {
   define_artifacts {
     # File types
-    regex: "**/symbiflow-arch-defs-install*.tar.xz"
+    regex: "**/symbiflow-arch-defs-*.tar.xz"
     strip_prefix: "github/symbiflow-arch-defs-continuous-install/"
   }
 }

.github/kokoro/install-200t.sh

@@ -48,9 +48,8 @@ echo "----------------------------------------"
 (
 	rm -rf build
 	du -ah install
-	pushd install
 	export GIT_HASH=$(git rev-parse --short HEAD)
-	tar vcf - * | xz -9 -T${MAX_CORES} - > ../symbiflow-arch-defs-install-200t-${GIT_HASH}.tar.xz
-	popd
+	tar cfJv symbiflow-arch-defs-install-200t-${GIT_HASH}.tar.xz -C install bin share environment.yml
+	tar cfJv symbiflow-arch-defs-benchmarks-200t-${GIT_HASH}.tar.xz -C install benchmarks
 )
 echo "----------------------------------------"

.github/kokoro/install.sh

@@ -47,10 +47,9 @@ echo "----------------------------------------"
 (
 	rm -rf build
 	du -ah install
-	pushd install
 	export GIT_HASH=$(git rev-parse --short HEAD)
-	tar vcf - * | xz -9 -T${MAX_CORES} - > ../symbiflow-arch-defs-install-${GIT_HASH}.tar.xz
-	popd
+	tar cfJv symbiflow-arch-defs-install-${GIT_HASH}.tar.xz -C install bin share environment.yml
+	tar cfJv symbiflow-arch-defs-benchmarks-${GIT_HASH}.tar.xz -C install benchmarks
 )
 echo "----------------------------------------"
 

.github/kokoro/kokoro-cfg.py

@@ -17,11 +17,7 @@
 """
 
 INSTALL = """\
-    regex: "**/symbiflow-arch-defs-install*.tar.xz"\
-"""
-
-INSTALL_200T = """\
-    regex: "**/symbiflow-arch-defs-install-200t*.tar.xz"\
+    regex: "**/symbiflow-arch-defs-*.tar.xz"\
 """
 
 DB_FULL = """\
@@ -61,10 +57,8 @@
 
 for type in ['tests', 'docs', 'ice40', 'testarch', 'xc7', 'xc7-vendor',
              'xc7a200t', 'xc7a200t-vendor', 'ql', 'install', 'install-200t']:
-    if type == 'install':
+    if 'install' in type:
         artifacts = INSTALL
-    elif type == 'install-200t':
-        artifacts = INSTALL_200T
     else:
         artifacts = DEFAULT_ARTIFACTS
 

.github/kokoro/presubmit-install-200t.cfg

@@ -11,7 +11,7 @@ timeout_mins: 4320
 action {
   define_artifacts {
     # File types
-    regex: "**/symbiflow-arch-defs-install-200t*.tar.xz"
+    regex: "**/symbiflow-arch-defs-*.tar.xz"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-install-200t/"
   }
 }

.github/kokoro/presubmit-install.cfg

@@ -11,7 +11,7 @@ timeout_mins: 4320
 action {
   define_artifacts {
     # File types
-    regex: "**/symbiflow-arch-defs-install*.tar.xz"
+    regex: "**/symbiflow-arch-defs-*.tar.xz"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-install/"
   }
 }

common/cmake/devices.cmake

@@ -1153,6 +1153,7 @@ function(ADD_FPGA_TARGET)
   #   [ASSERT_USAGE <usage_spec>]
   #   [DEFINES <definitions>]
   #   [BIT_TO_V_EXTRA_ARGS]
+  #   [INSTALL_CIRCUIT]
   #   )
   # ~~~
   #
@@ -1179,6 +1180,14 @@ function(ADD_FPGA_TARGET)
   # DEFINES is a list of environment variables to be defined during Yosys
   # invocation.
   #
+  # INSTALL_CIRCUIT is an option that enables installing the generated eblif circuit
+  # file in the install destination directory. Also the generates/user-provided SDC
+  # (if present), gets installed as well.
+  #     - eblif destination: <install_directory>/benchmarks/circuits
+  #     - sdc destination: <install_directory>/benchmarks/sdc
+  # To avoid name conflicts, the eblif file name, as well as the SDC name, are replaced
+  # with the NAME of the FPGA test target
+  #
   # Targets generated:
   #
   # * <name>_eblif - Generated eblif file.
@@ -1197,7 +1206,7 @@ function(ADD_FPGA_TARGET)
   # * ${TOP}.route - Place and routed design (http://docs.verilogtorouting.org/en/latest/vpr/file_formats/#routing-file-format-route)
   # * ${TOP}.${BITSTREAM_EXTENSION} - Bitstream for target.
   #
-  set(options EXPLICIT_ADD_FILE_TARGET EMIT_CHECK_TESTS NO_SYNTHESIS ROUTE_ONLY)
+  set(options EXPLICIT_ADD_FILE_TARGET EMIT_CHECK_TESTS NO_SYNTHESIS ROUTE_ONLY INSTALL_CIRCUIT)
   set(oneValueArgs NAME TOP BOARD INPUT_IO_FILE EQUIV_CHECK_SCRIPT AUTOSIM_CYCLES ASSERT_USAGE INPUT_XDC_FILE INPUT_SDC_FILE)
   set(multiValueArgs SOURCES TESTBENCH_SOURCES DEFINES BIT_TO_V_EXTRA_ARGS)
   cmake_parse_arguments(
@@ -1447,16 +1456,48 @@ function(ADD_FPGA_TARGET)
     message(FATAL_ERROR "SDC and XDC constraint files cannot be provided simultaneously!")
   endif()
 
+  set(SDC_FILE "")
+  set(SDC_DEPS "")
   if(NOT "${ADD_FPGA_TARGET_INPUT_XDC_FILE}" STREQUAL "")
     append_file_dependency(VPR_DEPS ${OUT_SDC_REL})
     get_file_location(SDC_LOCATION ${OUT_SDC_REL})
     set(SDC_ARG --sdc_file ${SDC_LOCATION})
+    set(SDC_FILE ${SDC_LOCATION})
+    set(SDC_DEPS ${OUT_SDC_REL})
   endif()
 
   if(NOT "${ADD_FPGA_TARGET_INPUT_SDC_FILE}" STREQUAL "")
     append_file_dependency(VPR_DEPS ${ADD_FPGA_TARGET_INPUT_SDC_FILE})
     get_file_location(SDC_LOCATION ${ADD_FPGA_TARGET_INPUT_SDC_FILE})
     set(SDC_ARG --sdc_file ${SDC_LOCATION})
+    set(SDC_FILE ${SDC_LOCATION})
+    set(SDC_DEPS ${ADD_FPGA_TARGET_INPUT_SDC_FILE})
+  endif()
+
+  if (${ADD_FPGA_TARGET_INSTALL_CIRCUIT})
+    set(INSTALL_DEPS "")
+    append_file_dependency(INSTALL_DEPS ${OUT_EBLIF_REL})
+
+    install(
+      FILES ${OUT_EBLIF}
+      RENAME ${NAME}.eblif
+      DESTINATION "benchmarks/circuits"
+    )
+
+    if (NOT SDC_FILE STREQUAL "")
+      install(
+        FILES ${SDC_FILE}
+        RENAME ${NAME}.sdc
+        DESTINATION "benchmarks/sdc"
+      )
+      append_file_dependency(INSTALL_DEPS ${SDC_DEPS})
+    endif()
+
+    add_custom_target(
+      "INSTALL_${NAME}_CIRCUIT"
+      ALL
+      DEPENDS ${INSTALL_DEPS}
+    )
   endif()
 
   # Generate routing and generate HLC.

common/cmake/litex.cmake

@@ -92,6 +92,7 @@ function(ADD_LITEX_TEST)
         ${EXTERNAL_SOURCES}
       INPUT_XDC_FILE ${LITEX_GATEWARE}/top.xdc
       EXPLICIT_ADD_FILE_TARGET
+      INSTALL_CIRCUIT
     )
   else()
     add_fpga_target(
@@ -103,6 +104,7 @@ function(ADD_LITEX_TEST)
       INPUT_IO_FILE ${LITEX_GATEWARE}/top.pcf
       INPUT_SDC_FILE ${LITEX_GATEWARE}/top.sdc
       EXPLICIT_ADD_FILE_TARGET
+      INSTALL_CIRCUIT
     )
   endif()
 

tests/9-soc/murax/CMakeLists.txt

@@ -70,6 +70,7 @@ foreach(FREQ ${BASYS_FREQS})
         Murax.v
       INPUT_IO_FILE basys3-full.pcf
       EXPLICIT_ADD_FILE_TARGET
+      INSTALL_CIRCUIT
     )
 
     math(EXPR PERIOD "1000 / ${FREQ}" OUTPUT_FORMAT DECIMAL)

tests/9-soc/picosoc/CMakeLists.txt

@@ -120,6 +120,7 @@ foreach(FREQ ${BASYS3_FREQS})
       INPUT_XDC_FILE basys3.xdc
       INPUT_IO_FILE ${BASYS3_PCF}
       EXPLICIT_ADD_FILE_TARGET
+      INSTALL_CIRCUIT
     )
 
     math(EXPR PERIOD "1000 / ${FREQ}" OUTPUT_FORMAT DECIMAL)

xc/xc7/tests/counter/CMakeLists.txt

@@ -23,6 +23,7 @@ add_fpga_target(
   SOURCES counter_basys3.v
   INPUT_IO_FILE ${COMMON}/basys3.pcf
   EXPLICIT_ADD_FILE_TARGET
+  INSTALL_CIRCUIT
   )
 
 add_vivado_target(

xc/xc7/tests/soc/ibex/CMakeLists.txt

@@ -75,6 +75,7 @@ add_fpga_target(
   INPUT_IO_FILE pins_artya7.pcf
   INPUT_SDC_FILE pins_artya7.sdc
   EXPLICIT_ADD_FILE_TARGET
+  INSTALL_CIRCUIT
 )
 
 add_vivado_target(