roi_harness: misc fixes

Signed-off-by: John McMaster <johndmcmaster@gmail.com>

minitests/roi_harness/basys3.sh

@@ -11,3 +11,4 @@ export XRAY_PIN_04="W15"
 export XRAY_PIN_05="V15"
 export XRAY_PIN_06="W14"
 
+export XRAY_BITREAD="$XRAY_DIR/build/tools/bitread -part_file $XRAY_DIR/database/artix7/xc7a35tcpg236-1.yaml"

minitests/roi_harness/runme.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 
 set -ex
+rm -f out_last
 vivado -mode batch -source runme.tcl
 test -z "$(fgrep CRITICAL vivado.log)"
 
+pushd out_last
+${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
+${XRAY_SEGPRINT} -zd design.bits >design.segp
+${XRAY_DIR}/tools/segprint2fasm.py design.segp design.fasm
+popd

minitests/roi_harness/runme.tcl

@@ -53,6 +53,7 @@ puts "  Y_DOUT_BASE: $Y_DOUT_BASE"
 puts "  outdir: $outdir"
 
 file mkdir $outdir
+file link -symbolic out_last $outdir
 
 source ../../utils/utils.tcl
 
@@ -92,8 +93,8 @@ if {$part eq "xc7a50tfgg484-1"} {
         incr banki
         set net2pin(dout[$i]) $pin
    }
-# Arty A7 switch, button, and LED
 } elseif {$part eq "xc7a35tcsg324-1"} {
+    # Arty A7 switch, button, and LED
     if {$pincfg eq "ARTY-A7-SWBUT"} {
         # https://reference.digilentinc.com/reference/programmable-logic/arty/reference-manual?redirect=1
         # 4 switches then 4 buttons
@@ -142,7 +143,6 @@ if {$part eq "xc7a50tfgg484-1"} {
     } else {
         error "Unsupported config $pincfg"
     }
-# Arty A7 switch, button, and LED
 } elseif {$part eq "xc7a35tcpg236-1"} {
     if {$pincfg eq "BASYS3-SWBUT"} {
         # https://raw.githubusercontent.com/Digilent/digilent-xdc/master/Basys-3-Master.xdc
@@ -168,7 +168,7 @@ if {$part eq "xc7a50tfgg484-1"} {
        }
     } else {
         error "Unsupported config $pincfg"
-    }    
+    }
 } else {
     error "Pins: unsupported part $part"
 }

tools/fasm2frame.py

@@ -183,6 +183,7 @@ def run(f_in, f_out, sparse=False, debug=False):
             'INT_L': int2dbkey,
             'INT_R': int2dbkey,
             'HCLK_L': int2dbkey,
+            'HCLK_R': int2dbkey,
         }
 
         f = tile2dbkey.get(tilej['type'], None)

tools/segprint2fasm.py

@@ -61,10 +61,11 @@ def tag2fasm(grid, seg, tag):
         'INT_L': intf,
         'INT_R': intf,
         'HCLK_L': intf,
+        'HCLK_R': intf,
     }
     f = tag2asm.get(tile_type, None)
     if f is None:
-        raise Exception("Unhandled segment type %s" % tilej['type'])
+        raise Exception("Unhandled segment type %s" % tile_type)
     return f(seg, tile, tag_post)