fpga: tools: Add modelsim.ini to ModelSim calls

This adds the MSIM_VIV_COMPLIBDIR environment variable to specify
a non-default location for the compilation libraries.

This also allows a modelsim.ini other than the one in the ModelSim
installation folder to be used. By default, the one in the simulation
libraries compilation directory will be used. This can be changed by
setting MSIM_MODELSIM_INI to the one you want to use, or set it to an
empty string to use the one in the ModelSim installation folder.

1 files changed, 9 insertions, 2 deletions

diff --git a/fpga/usrp3/tools/scripts/launch_modelsim.sh b/fpga/usrp3/tools/scripts/launch_modelsim.sh
index 8fc7309a0..ad71c473c 100755
--- a/fpga/usrp3/tools/scripts/launch_modelsim.sh
+++ b/fpga/usrp3/tools/scripts/launch_modelsim.sh
@@ -47,6 +47,13 @@ function print_color {
 # and avoids some cases where simulation mismatch could otherwise occur.
 MSIM_DEFAULT="-voptargs=+acc -quiet -L unisims_ver"
 
+# Use specified modelsim.ini, if set
+if [[ -z $MSIM_MODELSIM_INI ]]; then
+    MODELSIMINI_ARG=""
+else
+    MODELSIMINI_ARG="-modelsimini $MSIM_MODELSIM_INI"
+fi
+
 cd $MSIM_PROJ_DIR
 
 # Generate the library options string
@@ -58,14 +65,14 @@ done
 
 if [ $MSIM_MODE == "gui" ]; then
     echo "* Launching ModelSim"
-    vsim $MSIM_DEFAULT $MSIM_ARGS $MSIM_LIB_ARGS $MSIM_SIM_TOP 2>&1 | while IFS= read -r line; do
+    vsim $MSIM_DEFAULT $MODELSIMINI_ARG $MSIM_ARGS $MSIM_LIB_ARGS $MSIM_SIM_TOP 2>&1 | while IFS= read -r line; do
         print_color $line
     done
     exit_status=${PIPESTATUS[0]}
     if [ ${exit_status} -ne 0 ]; then exit ${exit_status}; fi
 elif [ $MSIM_MODE == "batch" ]; then
     echo "* Launching ModelSim"
-    vsim -batch -do "run -all; quit -f" $MSIM_DEFAULT $MSIM_ARGS $MSIM_LIB_ARGS $MSIM_SIM_TOP 2>&1 | while IFS= read -r line; do
+    vsim -batch -do "run -all; quit -f" $MODELSIMINI_ARG $MSIM_DEFAULT $MSIM_ARGS $MSIM_LIB_ARGS $MSIM_SIM_TOP 2>&1 | while IFS= read -r line; do
         print_color $line
     done
     exit_status=${PIPESTATUS[0]}