Merge pull request f4pga#1673 from litghost/integrate_interchange

Integrate interchange
mithro · Oct 1, 2020 · 6200e28 · 6200e28
2 parents b9020ea + fdc272c
commit 6200e28
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 2 deletions.
diff --git a/.github/kokoro/steps/rapidwright.sh b/.github/kokoro/steps/rapidwright.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export RAPIDWRIGHT_PATH=$(pwd)/github/$KOKORO_DIR/env/RapidWright
+mkdir -p "${RAPIDWRIGHT_PATH}"
+git clone https://github.com/Xilinx/RapidWright.git "${RAPIDWRIGHT_PATH}"
+pushd "${RAPIDWRIGHT_PATH}"
+git checkout interchange
+make update_jars
+popd
diff --git a/.github/kokoro/xc7-vendor.sh b/.github/kokoro/xc7-vendor.sh
@@ -6,8 +6,11 @@ SCRIPT_DIR="$(dirname "${SCRIPT_SRC}")"
 export CMAKE_FLAGS=-GNinja
 export BUILD_TOOL=ninja
 export XRAY_VIVADO_SETTINGS=/opt/Xilinx/Vivado/2017.2/settings64.sh
+export URAY_VIVADO_SETTINGS=/image/Xilinx/Vivado/2019.2/settings64.sh
+source ${SCRIPT_DIR}/steps/rapidwright.sh
 source ${SCRIPT_DIR}/common.sh
 source third_party/prjxray/.github/kokoro/steps/xilinx.sh
+source third_party/prjuray/.github/kokoro/steps/xilinx.sh
 echo
 echo "========================================"
 echo "Vivado version"

diff --git a/.github/kokoro/xc7a200t-vendor.sh b/.github/kokoro/xc7a200t-vendor.sh
@@ -6,8 +6,11 @@ SCRIPT_DIR="$(dirname "${SCRIPT_SRC}")"
 export CMAKE_FLAGS=-GNinja
 export BUILD_TOOL=ninja
 export XRAY_VIVADO_SETTINGS=/opt/Xilinx/Vivado/2017.2/settings64.sh
+export URAY_VIVADO_SETTINGS=/image/Xilinx/Vivado/2019.2/settings64.sh
+source ${SCRIPT_DIR}/steps/rapidwright.sh
 source ${SCRIPT_DIR}/common.sh
 source third_party/prjxray/.github/kokoro/steps/xilinx.sh
+source third_party/prjuray/.github/kokoro/steps/xilinx.sh
 echo
 echo "========================================"
 echo "Vivado version"

diff --git a/.gitmodules b/.gitmodules
@@ -37,3 +37,6 @@
 [submodule "third_party/ibex"]
 	path = third_party/ibex
 	url = https://github.com/lowRISC/ibex
+[submodule "third_party/prjuray"]
+	path = third_party/prjuray
+	url = https://github.com/SymbiFlow/prjuray.git
diff --git a/environment.yml b/environment.yml
@@ -2,6 +2,7 @@ name: symbiflow_arch_def_base
 channels:
   - defaults
   - symbiflow
+  - conda-forge
 dependencies:
   - symbiflow-yosys=0.8_6021_gd8b2d1a2=20200708_083630
   - symbiflow-yosys-plugins=1.0.0.7_0060_g7454cd6=20200902_114536
@@ -16,6 +17,7 @@ dependencies:
   - iverilog
   - libxml2=2.9.10=20200629_180127
   - icestorm
+  - capnproto-java
   - pip
   - pip:
     - -r file:requirements.txt

diff --git a/third_party/prjuray b/third_party/prjuray
diff --git a/third_party/symbiflow-xc-fasm2bels b/third_party/symbiflow-xc-fasm2bels
diff --git a/xc/common/cmake/vivado.cmake b/xc/common/cmake/vivado.cmake
@@ -497,6 +497,12 @@ function(PREPARE_RAPIDWRIGHT)
   set(HAVE_RAPIDWRIGHT FALSE)
   set(HAVE_JAVA FALSE)
   set(HAVE_URAY_VIVADO FALSE)
+
+  if(DEFINED RAPIDWRIGHT_PATH)
+  elseif(DEFINED ENV{RAPIDWRIGHT_PATH})
+    set(RAPIDWRIGHT_PATH $ENV{RAPIDWRIGHT_PATH})
+  endif()
+
   if(EXISTS "${RAPIDWRIGHT_PATH}" AND EXISTS ${RAPIDWRIGHT_PATH}/interchange AND EXISTS ${RAPIDWRIGHT_PATH}/scripts/invoke_rapidwright.sh)
     set(HAVE_RAPIDWRIGHT TRUE)
   endif()
@@ -508,7 +514,7 @@ function(PREPARE_RAPIDWRIGHT)
     endif()
   endif()
 
-  if(DEFINED ENV{URAY_VIVADO_SETTINGS} AND EXISTS "$ENV{URAY_VIVADO_SETTINGS}")
+  if(DEFINED ENV{URAY_VIVADO_SETTINGS})
       set(HAVE_URAY_VIVADO TRUE)
   endif()
 

diff --git a/xc/xc7/tests/bufgce/bufgce_arty.v b/xc/xc7/tests/bufgce/bufgce_arty.v
@@ -14,4 +14,5 @@ module top (
     end
 
     assign led[0] = counter[25];
+    assign led[1] = sw[1];
 endmodule
diff --git a/xc/xc7/tests/bufgce/bufgce_nexys_video.v b/xc/xc7/tests/bufgce/bufgce_nexys_video.v
@@ -18,4 +18,5 @@ module top (
 
    assign tx = rx;
    assign led[0] = counter[25];
+   assign led[1] = sw[1];
 endmodule