move toolchain wrappers to repo f4pga

Signed-off-by: Unai Martinez-Corral <[email protected]>

.github/ci/install.sh

@@ -23,6 +23,15 @@ cp environment.yml install/
 
 echo "----------------------------------------"
 
+heading "Install f4pga CLI through pip"
+{
+	pip3 install https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga
+	export F4PGA_FAM=xc7
+	export F4PGA_ENV_BIN="$(cd $(dirname "$0")/../../env/conda/envs/symbiflow_arch_def_base/bin; pwd)"
+	export F4PGA_ENV_SHARE="$(cd $(dirname "$0")/../../install/share/symbiflow; pwd)"
+}
+echo "----------------------------------------"
+
 heading "Running installed toolchain tests"
 (
 	pushd build
@@ -44,7 +53,7 @@ heading "Compressing install dir (creating packages)"
 
 	du -ah install
 	export GIT_HASH=$(git rev-parse --short HEAD)
-	tar -I "pixz" -cvf symbiflow-arch-defs-install-${GIT_HASH}.tar.xz -C install bin share/symbiflow/techmaps share/symbiflow/scripts environment.yml
+	tar -I "pixz" -cvf symbiflow-arch-defs-install-${GIT_HASH}.tar.xz -C install share/symbiflow/techmaps share/symbiflow/scripts environment.yml
 	tar -I "pixz" -cvf symbiflow-arch-defs-benchmarks-${GIT_HASH}.tar.xz -C install benchmarks
 	for device in $(ls install/share/symbiflow/arch)
 	do

.github/workflows/Tests.yml

@@ -7,11 +7,23 @@ jobs:
 
   Test:
     container: ubuntu:bionic
-    runs-on: [self-hosted, Linux, X64]
+    runs-on:
+      - self-hosted
+      - Linux
+      - X64
     strategy:
       fail-fast: false
       matrix:
-        test: ['docs', 'testarch', 'tests', 'ice40', 'xc7', 'xc7-vendor', 'xc7a200t', 'xc7a200t-vendor', 'ql']
+        test:
+          - docs
+          - testarch
+          - tests
+          - ice40
+          - xc7
+          - xc7-vendor
+          - xc7a200t
+          - xc7a200t-vendor
+          - ql
     env:
       MAX_CORES: 80
       GHA_EXTERNAL_DISK: "tools"
@@ -34,7 +46,10 @@ jobs:
 
   Install:
     container: ubuntu:bionic
-    runs-on: [self-hosted, Linux, X64]
+    runs-on:
+      - self-hosted
+      - Linux
+      - X64
     needs: Test
 
     env:

quicklogic/common/cmake/quicklogic_install.cmake

@@ -23,31 +23,6 @@ function(DEFINE_QL_TOOLCHAIN_TARGET)
     return()
   endif ()
 
-  set(WRAPPERS
-        env
-        ql_symbiflow
-        symbiflow_analysis
-        symbiflow_generate_bitstream
-        symbiflow_generate_constraints
-        symbiflow_generate_libfile
-        symbiflow_pack
-        symbiflow_place
-        symbiflow_repack
-        symbiflow_route
-        symbiflow_synth
-        symbiflow_write_fasm
-  )
-
-  # Export VPR arguments
-  list(JOIN VPR_BASE_ARGS " " VPR_BASE_ARGS)
-  string(JOIN " " VPR_ARGS ${VPR_BASE_ARGS} "--route_chan_width ${ROUTE_CHAN_WIDTH}" ${VPR_ARCH_ARGS})
-
-  set(VPR_CONFIG_TEMPLATE "${symbiflow-arch-defs_SOURCE_DIR}/quicklogic/common/toolchain_wrappers/vpr_config.sh")
-  set(VPR_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/vpr_config.sh")
-  configure_file(${VPR_CONFIG_TEMPLATE} "${VPR_CONFIG}" @ONLY)
-
-  set(VPR_COMMON "${symbiflow-arch-defs_SOURCE_DIR}/quicklogic/common/toolchain_wrappers/vpr_common")
-
   # Add cells.sim to all deps, so it is installed with make install
   get_file_target(CELLS_SIM_TARGET ${DEFINE_QL_TOOLCHAIN_TARGET_CELLS_SIM})
   add_custom_target(
@@ -56,16 +31,6 @@ function(DEFINE_QL_TOOLCHAIN_TARGET)
     DEPENDS ${DEFINE_QL_TOOLCHAIN_TARGET_CELLS_SIM}
     )
 
-  set(TOOLCHAIN_WRAPPERS)
-  foreach(WRAPPER ${WRAPPERS})
-    set(WRAPPER_PATH "${symbiflow-arch-defs_SOURCE_DIR}/quicklogic/common/toolchain_wrappers/${WRAPPER}")
-    list(APPEND TOOLCHAIN_WRAPPERS ${WRAPPER_PATH})
-  endforeach()
-
-  install(FILES ${TOOLCHAIN_WRAPPERS} ${VPR_COMMON}
-          DESTINATION bin
-          PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
-
   install(FILES ${VPR_CONFIG}
           DESTINATION share/symbiflow/scripts/${FAMILY})