move toolchain wrappers to repo f4pga

.github/ci/install.sh

@@ -15,6 +15,15 @@ heading "Installing gsutil"
 )
 echo "----------------------------------------"
 
+heading "Set environment variables for F4PGA CLI utils"
+{
+	export F4PGA_FAM=xc7
+	export F4PGA_ENV_BIN="$(cd $(dirname "$0"); pwd)/../../env/conda/envs/symbiflow_arch_def_base/bin"
+	export F4PGA_ENV_SHARE="$(cd $(dirname "$0"); pwd)/../../install/share/symbiflow"
+}
+
+echo "----------------------------------------"
+
 pushd build
 make_target install "Running install tests (make install)"
 popd
@@ -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

@@ -17,15 +17,15 @@ jobs:
       fail-fast: false
       matrix:
         test:
-          - 'docs'
-          - 'testarch'
-          - 'tests'
-          - 'ice40'
-          - 'xc7'
-          - 'xc7-vendor'
-          - 'xc7a200t'
-          - 'xc7a200t-vendor'
-          - 'ql'
+          - docs
+          - testarch
+          - tests
+          - ice40
+          - xc7
+          - xc7-vendor
+          - xc7a200t
+          - xc7a200t-vendor
+          - ql
 
     name: ${{ matrix.test }}
 
@@ -53,14 +53,13 @@ jobs:
 
 
   Install:
+    needs: Test
     container: ubuntu:bionic
     runs-on:
       - self-hosted
       - Linux
       - X64
 
-    needs: Test
-
     env:
       MAX_CORES: 80
       GHA_EXTERNAL_DISK: "tools"

README.md

@@ -14,7 +14,7 @@
   -->
   <a title="Documentation Status" href="https://f4pga.readthedocs.io/projects/arch-defs/"><img alt="Documentation Status" src="https://img.shields.io/readthedocs/symbiflow-arch-defs/latest?longCache=true&style=flat-square&logo=ReadTheDocs&logoColor=fff&label=Architecture%20Definitions%20Documentation"></a><!--
   -->
-  <a title="'Automerge' workflow status" href="https://github.com/SymbiFlow/f4pga-arch-defs/actions/workflows/Doc.yml"><img alt="'Automerge' workflow status" src="https://img.shields.io/github/workflow/status/SymbiFlow/f4pga-arch-defs/Automerge/main?longCache=true&style=flat-square&label=Tests&logo=Github%20Actions&logoColor=fff"></a><!--
+  <a title="'Automerge' workflow status" href="https://github.com/SymbiFlow/f4pga-arch-defs/actions/workflows/Automerge.yml"><img alt="'Automerge' workflow status" src="https://img.shields.io/github/workflow/status/SymbiFlow/f4pga-arch-defs/Automerge/main?longCache=true&style=flat-square&label=Tests&logo=Github%20Actions&logoColor=fff"></a><!--
   -->
 </p>
 

conda_lock.yml

@@ -103,6 +103,7 @@ dependencies:
     - cycler==0.11.0
     - defusedxml==0.7.1
     - edalize @ git+https://github.com/lowRISC/edalize.git@23e1beab41508e13c565125e5edcadb86b0032f6
+    - f4pga @ https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga
     - fasm==0.0.2.post88
     - fasm-utils @ git+https://github.com/QuickLogic-Corp/quicklogic-fasm-utils@3d6a375ddb6b55aaa5a59d99e44a207d4c18709f
     - fonttools==4.31.1

docs/conf.py

@@ -38,6 +38,16 @@
 
 pygments_style = 'default'
 
+rst_prolog = """
+.. IMPORTANT::
+  Since May 2022, packages providing Architecture Definition assets do *not* include CLI
+  utilities/wrappers to interact with Yosys, Verilog-to-Routing, etc.
+  For backwards compatibility, end-users can install Python package ``f4pga`` from
+  :gh:`chipsalliance/f4pga`.
+  For instance:
+  ``pip install https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga``.
+"""
+
 todo_include_todos = False
 
 # -- Options for HTML output -----------------------------------------------------------------------

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})