From 1a5c5ff4a64a6d61245946fc1417393f7254b85a Mon Sep 17 00:00:00 2001
From: AurelienUoU <u1235811@lnissrv4.eng.utah.edu>
Date: Fri, 12 Jul 2019 16:52:54 -0600
Subject: [PATCH] Update demo simulation result path

---
 ERI_demo/ERI.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ERI_demo/ERI.sh b/ERI_demo/ERI.sh
index cd812298c..f585d90b2 100755
--- a/ERI_demo/ERI.sh
+++ b/ERI_demo/ERI.sh
@@ -3,13 +3,13 @@
 
 # Set variables
 my_pwd=$PWD
-fpga_flow_scripts=${my_pwd}/fpga_flow/scripts
-vpr_path=${my_pwd}/vpr7_x2p/vpr
+fpga_flow_scripts="${my_pwd}/fpga_flow/scripts"
+vpr_path="${my_pwd}/vpr7_x2p/vpr"
 benchmark="test_modes"
 include_netlists="_include_netlists.v"
 compiled_file="compiled_$benchmark"
 tb_formal_postfix="_top_formal_verification_random_tb"
-verilog_output_dirname="${vpr_path}${benchmark}_Verilog"
+verilog_dirname="${vpr_path}/${benchmark}_Verilog"
 log_file="${benchmark}_sim.log"
 new_reg_sh="${PWD}/ERI_demo/my_eri_demo.sh"
 template_sh="${PWD}/ERI_demo/eri_demo.sh"
@@ -28,7 +28,8 @@ cd $my_pwd
 
 # Start the script -> run the fpga generation -> run the simulation -> check the log file
 source $new_reg_sh	# Leave us in vpr folder
-iverilog -o $compiled_file $verilog_output_dirname/SRC/$benchmark$include_netlists -s $benchmark$tb_formal_postfix
+cd $my_pwd
+iverilog -o $compiled_file ${verilog_dirname}/SRC/${benchmark}${include_netlists} -s ${benchmark}${tb_formal_postfix}
 vvp $compiled_file -j 64 >> $log_file
 
 result=`grep "Succeed" $log_file`
@@ -36,16 +37,13 @@ if ["$result" = ""]; then
   result=`grep "Failed" $log_file`
   if ["$result" = ""]; then
     echo "Unexpected error, Verification didn't run"
-    cd $my_pwd
     exit 1
   else
     echo "Verification failed"
-    cd $my_pwd
     exit 2
   fi
 else
   echo "Verification succeed"
+  gtkwave ${benchmark}_formal.vcd &
 fi
 
-gtkwave ${benchmark}_formal.vcd &
-cd $my_pwd