Testing with more sleep time.

marianabuhazi · Apr 29, 2024 · 784f136 · 784f136
1 parent 2f29bfb
commit 784f136
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/utils/scripts/actions-pipeline/run_esp-config.sh b/utils/scripts/actions-pipeline/run_esp-config.sh
@@ -8,12 +8,6 @@ EMOJI_CHECK="\xE2\x9C\x94"
 # Source HLS accelerators
 source "get_hls_accelerators.sh"
 
-# Source the HLS tools
-echo ""
-echo -e "${BOLD}EXPORTING HLS TOOLS...${NC}"
-source /opt/cad/scripts/tools_env.sh
-echo ""
-
 # Define SoC configuration source + target
 defconfig="$HOME/esp/socs/defconfig/esp_xilinx-vc707-xc7vx485t_defconfig"
 esp_config="$HOME/esp/socs/xilinx-vc707-xc7vx485t/socgen/esp/.esp_config"
@@ -78,15 +72,18 @@ for accelerator in "${!dma[@]}"; do
 		# Open Minicom in the foreground
 		socat pty,link=ttyV0,waitslave,mode=777 tcp:goliah.cs.columbia.edu:4332 &
 		socat_pid=$!
-		sleep 2
+		sleep 5
 		VIRTUAL_DEVICE=$(readlink ttyV0)
 
 		# Run fpga program in the background
-		$fpga_run > "$run" 2>&1 &
+		"$fpga_run" > "$run" 2>&1 &
 		fpga_run_pid=$!
-		minicom -p "$VIRTUAL_DEVICE" -C "$minicom" >"$minicom" 2>&1
-		wait "$fpga_run_pid"
+		echo "Opening minicom in fg"
+		minicom -p "$VIRTUAL_DEVICE" -C "$minicom"
+		sleep 10
+
 		kill -9 "$socat_pid"
+		kill -9 "$fpga_run_pid"
 	else
 		echo -e "${BOLD}BITSTREAM GENERATION FAILED...${NC}"
 		echo -e "  - $accelerator"

diff --git a/utils/scripts/actions-pipeline/run_fpga_program.sh b/utils/scripts/actions-pipeline/run_fpga_program.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
 cd "$HOME/esp/socs/xilinx-vc707-xc7vx485t"
-sleep 10
+
+# Source the HLS tools
+echo ""
+echo -e "${BOLD}EXPORTING HLS TOOLS...${NC}"
+source /opt/cad/scripts/tools_env.sh
+echo ""
 
 make fpga-run