Merge pull request f4pga#1570 from antmicro/mglb/guess-device-from-pa…

…rt-name xc7/toolchain_wrappers: find device/arch using part name
mithro · Jul 3, 2020 · 3abef09 · 3abef09
2 parents 9a392b6 + 3f58546
commit 3abef09
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/xc/xc7/toolchain_wrappers/synth b/xc/xc7/toolchain_wrappers/synth
@@ -18,7 +18,7 @@ fi
 VERILOG_FILES=()
 XDC_FILES=()
 TOP=top
-DEVICE=""
+DEVICE="*"
 PART=""
 
 VERILOGLIST=0

diff --git a/xc/xc7/toolchain_wrappers/vpr_common b/xc/xc7/toolchain_wrappers/vpr_common
@@ -53,6 +53,13 @@ function parse_args {
           esac
      done
 
+     if [ -z $DEVICE ] && [ -n $PART ]; then
+          # Try to find device name. Accept only when exactly one is found
+          PART_DIRS=(${MYPATH}/../share/symbiflow/arch/*/${PART})
+          if [ ${#PART_DIRS[@]} -eq 1 ]; then
+               DEVICE=$(basename $(dirname "${PART_DIRS[0]}"))
+          fi
+     fi
      if [ -z $DEVICE ]; then
           echo "Please provide device name"
           exit 1

diff --git a/xc/xc7/toolchain_wrappers/write_bitstream b/xc/xc7/toolchain_wrappers/write_bitstream
@@ -58,8 +58,14 @@ while true; do
 done
 
 if [ -z $DEVICE ]; then
-	echo "Please provide device name"
-	exit 1
+	# Try to find device name. Accept only when exactly one is found
+	PART_DIRS=(${XRAY_DATABASE_DIR}/*/${PART})
+	if [ ${#PART_DIRS[@]} -eq 1 ]; then
+		DEVICE=$(basename $(dirname "${PART_DIRS[0]}"))
+	else
+		echo "Please provide device name"
+		exit 1
+	fi
 fi
 
 if [ -z $FASM ]; then