allow Xcelium, Modelsim, Questa as experimental simulators (#732)

joergkayser · web-flow · commit 1ebc208a0bc0 · 2018-04-26T16:50:46.000+02:00
* support for more experimental simulators (xcelium, questa, modelsim)
* more simulators in Makefile, PSLSE version checking, more export_sim files
* xcelium part of NVMe simulators
* remove ncsim support, irun is still avail
* add modelsim/questa as experimental simulators to README, xcelium as supported simulator
Signed-off-by: jkayser &lt;jkayser@de.ibm.com&gt;
diff --git a/check_pslse.sh b/check_pslse.sh
@@ -18,9 +18,10 @@
 cd ${PSLSE_ROOT}
 version=`git describe --tags`
 branch=`git branch`
-echo "checking PSLSE_ROOT=${PSLSE_ROOT} card=$FPGACARD version=$version branch=$branch"
-case $FPGACARD in
-  "N250SP") if [ $branch != "\* capi2" ];then echo "WARNING: PSLSE branch=$branch should be capi2";fi;;
-  *)        if [ $version != "v3.1"    ];then echo "WARNING: PSLSE version=$version should be v3.1";fi;;
-esac
+echo "checking PSLSE_ROOT=${PSLSE_ROOT}"
+echo "card=$FPGACARD version=$version branch=$branch PSLVER=$PSLVER"
+#case $FPGACARD in
+#  "N250SP") if [ $branch != "\* capi2" ];then echo "WARNING: PSLSE branch=$branch should be capi2";fi;;
+#  *)        if [ $version != "v3.1"    ];then echo "WARNING: PSLSE version=$version should be v3.1";fi;;
+#esac
 cd -
diff --git a/hardware/Makefile b/hardware/Makefile
@@ -104,7 +104,7 @@ SNAP_HDL_HLS=$(SNAP_HARDWARE_ROOT)/hdl/hls
 SNAP_SIM_CORE=$(SIM_DIR)/core
 SNAP_SIM_NVME=$(SIM_DIR)/nvme
 
-SNAP_SIMULATORS += irun xsim
+SNAP_SIMULATORS += irun xsim questa modelsim xcelium
 SNAP_MODELS += .model_irun .model_xsim
 
 SNAP_PP_FILES_VHD=$(SNAP_HDL_CORE)/psl_fpga.vhd        \
@@ -190,7 +190,7 @@ check_snap_settings:
 
 check_nvme:
 	@if [ "$(SIMULATOR)" != "nosim" ] && [ "$(NVME_USED)" == "TRUE" ]; then \
-		if [ "$(SIMULATOR)" != "irun" ]; then  \
+		if [ "$(SIMULATOR)" != "irun" ] && [ "$(SIMULATOR)" != "xcelium" ]; then  \
 			echo "                        NVMe simulation is not supported for SIMULATOR $(SIMULATOR)"; \
 			exit -1; \
 		fi; \
@@ -203,7 +203,7 @@ check_nvme:
 	fi
 
 check_simulator:
-	@if [ "$(SIMULATOR)" != "irun" ] && [ "$(SIMULATOR)" != "xsim" ] && [ "$(SIMULATOR)" != "nosim" ]; then \
+	@if [ "$(SIMULATOR)" != "irun" ] && [ "$(SIMULATOR)" != "xsim" ] && [ "$(SIMULATOR)" != "questa" ] && [ "$(SIMULATOR)" != "xcelium" ] && [ "$(SIMULATOR)" != "modelsim" ] && [ "$(SIMULATOR)" != "nosim" ]; then \
 		echo "                        unknown simulator=$SIMULATOR"; \
 		exit -1; \
 	fi
@@ -502,7 +502,7 @@ clean:
 	@echo -e "                        IPs";
 	@$(RM) -r ip
 	@echo -e "                        sim files";
-	@$(RM) -r sim/ies sim/xsim hdl/nvme/component.xml hdl/nvme/xgui
+	@$(RM) -r sim/ies sim/xsim sim/modelsim sim/questa sim/xcelium hdl/nvme/component.xml hdl/nvme/xgui
 	@echo -e "                        log files";
 	@$(RM) -r logs
 	@echo -e "                        action / application";
diff --git a/hardware/setup/create_framework.tcl b/hardware/setup/create_framework.tcl
@@ -78,7 +78,7 @@ puts "                        setting up project settings"
 set_property target_language VHDL [current_project]
 set_property default_lib work [current_project]
 # Simulation
-if { ( $simulator == "ncsim" ) || ( $simulator == "irun" ) } {
+if { ( $simulator == "irun" ) } {
   set_property target_simulator IES [current_project]
   set_property compxlib.ies_compiled_library_dir $::env(IES_LIBS) [current_project]
   set_property -name {ies.elaborate.ncelab.more_options} -value {-access +rwc} -objects [current_fileset -simset]
diff --git a/hardware/setup/export_modelsim.tcl b/hardware/setup/export_modelsim.tcl
@@ -0,0 +1,28 @@
+#-----------------------------------------------------------
+#
+# Copyright 2016, International Business Machines
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-----------------------------------------------------------
+
+set vivadoVer     [version -short]
+set root_dir      $::env(SNAP_HARDWARE_ROOT)
+set mentor_libs   $::env(MENTOR_LIBS)
+set log_dir       $::env(LOGS_DIR)
+set log_file      $log_dir/compile_$::env(SIMULATOR).log
+
+puts "                        export simulation for version=$vivadoVer"
+open_project $root_dir/viv_project/framework.xpr  >> $log_file
+export_simulation -force -directory "$root_dir/sim" -simulator modelsim -lib_map_path "$mentor_libs" -ip_user_files_dir "$root_dir/viv_project/framework.ip_user_files" -ipstatic_source_dir "$root_dir/viv_project/framework.ip_user_files/ipstatic" -use_ip_compiled_libs  >> $log_file
+close_project  >> $log_file
diff --git a/hardware/setup/export_xcelium.tcl b/hardware/setup/export_xcelium.tcl
@@ -0,0 +1,29 @@
+#-----------------------------------------------------------
+#
+# Copyright 2016, International Business Machines
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-----------------------------------------------------------
+
+set vivadoVer    [version -short]
+set root_dir     $::env(SNAP_HARDWARE_ROOT)
+set ies_libs     $::env(IES_LIBS)
+set log_dir      $::env(LOGS_DIR)
+set log_file     $log_dir/compile_$::env(SIMULATOR).log
+set nvme_used    $::env(NVME_USED)
+
+puts "                        export simulation for version=$vivadoVer"
+open_project $root_dir/viv_project/framework.xpr  >> $log_file
+export_simulation -force -directory "$root_dir/sim" -simulator xcelium -lib_map_path "$ies_libs" -ip_user_files_dir "$root_dir/viv_project/framework.ip_user_files" -ipstatic_source_dir "$root_dir/viv_project/framework.ip_user_files/ipstatic" -use_ip_compiled_libs >> $log_file
+close_project  >> $log_file
diff --git a/hardware/setup/patch_sim.sh b/hardware/setup/patch_sim.sh
@@ -20,28 +20,39 @@ set -e
 NAME=`basename $2`
 if [ "$NAME" == "top.sh" ]; then
   echo "                     patch $NAME for $SIMULATOR"
-  if [ "$SIMULATOR" == "xsim" ]; then
-    sed -i "s/  simulate/# simulate/g"                   $1/$2 # run up to elaboration, skip execution
-    sed -i "s/-log elaborate.log/-log elaborate.log -sv_lib libdpi -sv_root ./g" $1/$2
-  fi
-  if [ "$SIMULATOR" == "irun" ]; then
-    sed -i "s/93 -relax/93 -elaborate -relax/gI"         $1/$2 # run irun up to elaboration, skip execution
-    sed -i "s/-top xil_defaultlib.top/-top work.top/gI"  $1/$2 # build top in work library
-     if [[ "$NVME_USED" == "TRUE" && -n "$DENALI" ]]; then :
-      echo "                     patch $irun include denali files for NVMe"
-      perl -i.ori -pe 'use Env qw(DENALI);s/(glbl.v)/$1 \\\n       +incdir+"${DENALI}\/ddvapi\/verilog"/mg' $1/$2 # add denali include directory
-      perl -i.ori -pe 'use Env qw(DENALI);s/(-namemap_mixgen)/$1 -disable_sem2009 -loadpli1 ${DENALI}\/verilog\/libdenpli.so:den_PLIPtr/mg' $1/$2 # add denali .so
-    fi
-    if [ -f ${SNAP_HARDWARE_ROOT}/sim/ies/run.f ]; then
-#     perl -i.ori -pe 's/(.*\/verilog\/top.v)/ -sv $1/mg' ${SNAP_HARDWARE_ROOT}/sim/ies/run.f; # compile top.v with system verilog, not needed anymore, since we work now with top.sv
-      perl -i.ori -pe 'BEGIN{undef $/;} s/(^-makelib.*\n.*glbl.v.*\n.*endlib)//mg' ${SNAP_HARDWARE_ROOT}/sim/ies/run.f; # remove glbl.v from compile list
-    fi
-  fi
-  if [ "$SIMULATOR" == "ncsim" ]; then
-    sed -i "s/  simulate/# simulate/g"                   $1/$2 # run ncsim up to elaboration, skip execution
-    sed -i "s/opts_ver=/set -e\nopts_ver=/g"             $1/$2 # use set -e to stop compilation on first error
-  fi
-  if [ "$SIMULATOR" == "questa" ]; then
-    sed -i "s/  simulate/# simulate/g"                   $1/$2 # run up to elaboration, skip execution
-  fi
+  case $SIMULATOR in
+    "xsim")   sed -i "s/  simulate/# simulate/g"                   $1/$2 # run up to elaboration, skip execution
+              sed -i "s/-log elaborate.log/-log elaborate.log -sv_lib libdpi -sv_root ./g" $1/$2
+              ;;
+    "irun")   sed -i "s/93 -relax/93 -elaborate -relax/gI"         $1/$2 # run irun up to elaboration, skip execution
+              sed -i "s/-top xil_defaultlib.top/-top work.top/gI"  $1/$2 # build top in work library
+              if [[ "$NVME_USED" == "TRUE" && -n "$DENALI" ]]; then :
+                echo "                     patch $irun include denali files for NVMe"
+                perl -i.ori -pe 'use Env qw(DENALI);s/(glbl.v)/$1 \\\n       +incdir+"${DENALI}\/ddvapi\/verilog"/mg' $1/$2 # add denali include directory
+                perl -i.ori -pe 'use Env qw(DENALI);s/(-namemap_mixgen)/$1 -disable_sem2009 -loadpli1 ${DENALI}\/verilog\/libdenpli.so:den_PLIPtr/mg' $1/$2 # add denali .so
+              fi
+              if [ -f ${SNAP_HARDWARE_ROOT}/sim/ies/run.f ]; then
+#               perl -i.ori -pe 's/(.*\/verilog\/top.v)/ -sv $1/mg' ${SNAP_HARDWARE_ROOT}/sim/ies/run.f; # compile top.v with system verilog, not needed anymore, since we work now with top.sv
+                perl -i.ori -pe 'BEGIN{undef $/;} s/(^-makelib.*\n.*glbl.v.*\n.*endlib)//mg' ${SNAP_HARDWARE_ROOT}/sim/ies/run.f; # remove glbl.v from compile list
+              fi
+              ;;
+    "xcelium")
+              sed -i "s/93 -relax/93 -elaborate -relax/gI"         $1/$2 # run irun up to elaboration, skip execution
+              sed -i "s/-top xil_defaultlib.top/-top work.top/gI"  $1/$2 # build top in work library
+              if [[ "$NVME_USED" == "TRUE" && -n "$DENALI" ]]; then :
+                echo "                     patch $irun include denali files for NVMe"
+                perl -i.ori -pe 'use Env qw(DENALI);s/(glbl.v)/$1 \\\n       +incdir+"${DENALI}\/ddvapi\/verilog"/mg' $1/$2 # add denali include directory
+                perl -i.ori -pe 'use Env qw(DENALI);s/(-namemap_mixgen)/$1 -disable_sem2009 -loadpli1 ${DENALI}\/verilog\/libdenpli.so:den_PLIPtr/mg' $1/$2 # add denali .so
+              fi
+              if [ -f ${SNAP_HARDWARE_ROOT}/sim/xcelium/run.f ]; then
+#               perl -i.ori -pe 's/(.*\/verilog\/top.v)/ -sv $1/mg' ${SNAP_HARDWARE_ROOT}/sim/xcelium/run.f; # compile top.v with system verilog, not needed anymore, since we work now with top.sv
+                perl -i.ori -pe 'BEGIN{undef $/;} s/(^-makelib.*\n.*glbl.v.*\n.*endlib)//mg' ${SNAP_HARDWARE_ROOT}/sim/xcelium/run.f; # remove glbl.v from compile list
+              fi
+              ;;
+    "questa"|"modelsim")
+              sed -i "s/  simulate/# simulate/g"                   $1/$2 # run up to elaboration, skip execution
+              ;;
+    *)        echo "unknown simulator=$SIMULATOR, terminating"
+              ;;
+  esac
 fi
diff --git a/hardware/sim/README.md b/hardware/sim/README.md
@@ -1,6 +1,8 @@
 # Simulation
-SNAP supports *Xilinx xsim* and *Cadence irun* tools for simulation.
-The environment variable `SIMULATOR` (see make snap_config) selects the simulator and can be set to `xsim` or to `irun`.
+SNAP supports *Xilinx xsim* and *Cadence irun or xcelium* tools for simulation.
+Other simulators like Mentor Modelsim or questa are supported by the respective Xilinx Vivado version and can be used as well, 
+but due to lack of licenses this support is not tested and is built into the SNAP framework as "experimental use" without warranty.
+The environment variable `SIMULATOR` (see make snap_config) selects the simulator.
 
 ## Building a model
 see [Image and model build](../#image-and-model-build) for further instructions
@@ -42,7 +44,7 @@ the variable `PSLSE_ROOT` (defined in `${SNAP_ROOT}/snap_env.sh`) needs to point
 ```
  export PSLSE_ROOT=             # path for the PSL simulation environment
  export PSLVER=                 # PSLSE functionality for POWER8 or POWER9
- export PSL_DCP=                # path to the PSL checkpoint fitting your target card
+ export PSL_DCP=                # path to the PSL checkpoint fitting your target card. For Simulation this is not needed and usually commented out
 ```
 
 ## Cadence irun
diff --git a/hardware/sim/ncrun.tcl b/hardware/sim/ncrun.tcl
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
- version 					;# show ncsim version
+ version 					;# show irun version
  assertion -off -all 				;# Disable all assertion fails prior to reset done.
  input ncaet.tcl				;# enabled through run_sim
  set  intovf_severity_level {warning};
diff --git a/hardware/sim/run_sim b/hardware/sim/run_sim
@@ -45,21 +45,22 @@
  HOSTNAME=`hostname -s`; echo "hostname=$HOSTNAME arguments=$@"
  TS=`date +%Y%m%d_%H%M%S`; if [ "$TST_TITLE" != "" ];then TS="${TS}_${TST_TITLE}";fi
  export SNAP_ROOT=${PWD%/hardware/sim*};echo "SNAP_ROOT=$SNAP_ROOT"  # default root, in case its not overwritten
- [ -f "${SNAP_ROOT}/snap_env.sh" ]    && . ${SNAP_ROOT}/snap_env.sh
  [ -f "${SNAP_ROOT}/.snap_config.sh" ] && . ${SNAP_ROOT}/.snap_config.sh
+ [ -f "${SNAP_ROOT}/snap_env.sh" ]     && . ${SNAP_ROOT}/snap_env.sh # snap_env at the end allows late overrides
  export PATH=$PATH:$SNAP_ROOT/software/tools:$ACTION_ROOT/sw
-
  if [ -z $PSLSE_ROOT ];then echo "variable PSLSE_ROOT not found, leaving"; exit 11; fi
 
 # ARGUMENTS #############
  runsim_args=$@
  while [[ $# > 0 ]]; do         # consume multiple args per loop with shift
 #  echo "arg1=$1 arg2=$2"
    case $1 in				
-     ncsim|xsim|irun)   SIM_OVER="$1";;
+     xsim|irun|questa|modelsim|xcelium)   SIM_OVER="$1";;
      -xsim)             SIM_OVER="xsim";;
      -irun)             SIM_OVER="irun";;
-     -ncsim)            SIM_OVER="ncsim";;
+     -questa)           SIM_OVER="questa";;
+     -xcelium)          SIM_OVER="xcelium";;
+     -modelsim)         SIM_OVER="modelsim";;
      -app)		TST_NAME="$2";shift
      			if [[ ! -f ${SNAP_ROOT}/software/${TST_NAME} ]];then echo "file ${SNAP_ROOT}/software/${TST_NAME} not found, leaving";exit 11;fi;;
      -list)		TST_NAME='LIST';LISTNAME="$2";shift
@@ -117,21 +118,33 @@
    shift
  done
 
- if [[ -z $SIMDIR && -z $SIMULATOR ]];then SIMULATOR="ncsim"; fi   # simulator determined by environment variable
+ if [[ -z $SIMDIR && -z $SIMULATOR ]];then SIMULATOR="irun"; fi   # simulator determined by environment variable
  if [[ -n $SIM_OVER ]];then echo "force simulator overwrite from $SIMULATOR to $SIM_OVER";SIMULATOR=$SIM_OVER;fi
- if [[ "$SIMULATOR" == "ncsim" || "$SIMULATOR" == "irun" ]];then
-   if [ -z $CDS_INST_DIR ];then echo "CDS_INST_DIR not defined for $SIMULATOR"; exit 1; fi
-   SIMDIR="ies"					# simulation directory generated by vivado
-   if [ -z $SIMTOP ];then SIMTOP="work.top";fi	# default top structure
- elif [ "$SIMULATOR" == "xsim" ];then
-   SIMDIR=$SIMULATOR				# simulation directory generated by vivado
-   if [ -z $SIMTOP ];then SIMTOP="top";fi	# default top structure
- elif [[ "$SIMULATOR" == "questa" || "$SIMDIR" == "questa" ]];then
-   if [ -z $MODELSIM_DIR ];then echo "MODELSIM_DIR not defined for questa"; exit 1; fi
-   SIMDIR="questa"				# simulation directory generated by vivado
-   SIMULATOR="vsim"
-   if [ -z $SIMTOP ];then SIMTOP="top";fi	# default top structure
- else echo "simulator=$SIMULATOR is not supported"; exit 1; fi
+ case $SIMULATOR in
+   irun)
+     if [ -z $CDS_INST_DIR ];then echo "CDS_INST_DIR not defined for $SIMULATOR"; exit 1; fi
+     SIMDIR="ies"                                       # simulation directory generated by vivado
+     if [ -z $SIMTOP ];then SIMTOP="work.top";fi	# default top structure
+     ;;
+   xcelium)
+     if [ -z $CDS_INST_DIR ];then echo "CDS_INST_DIR not defined for $SIMULATOR"; exit 1; fi
+     SIMDIR="xcelium"                                   # simulation directory generated by vivado
+     SIMULATOR="xrun"
+     if [ -z $SIMTOP ];then SIMTOP="work.top";fi        # default top structure
+     ;;
+   xsim)
+     SIMDIR=$SIMULATOR				# simulation directory generated by vivado
+     if [ -z $SIMTOP ];then SIMTOP="top";fi	# default top structure
+     ;;
+   questa|modelsim)
+     if [ -z $MODELSIM_DIR ];then echo "MODELSIM_DIR not defined for questa"; exit 1; fi
+     SIMDIR="questa"				# simulation directory generated by vivado
+     SIMULATOR="vsim"
+     if [ -z $SIMTOP ];then SIMTOP="top";fi	# default top structure
+     ;;
+   *) echo "simulator=$SIMULATOR is not supported"; exit 1
+     ;;
+ esac
  echo "simulator=$SIMULATOR simdir=$SIMDIR simtop=$SIMTOP"
 
  P3=`basename $PWD`
@@ -144,7 +157,7 @@
  fi
 
  P3=`basename $PWD`
- if [ "$P3" == "ies" ] || [ "$P3" == "xsim" ]|| [ "$P3" == "questa" ];then	# contains files from Vivado and sim output, no GIT release
+ if [ "$P3" == "ies" ]||[ "$P3" == "xsim" ]||[ "$P3" == "questa" ]||[ "$P3" == "modelsim" ]||[ "$P3" == "xcelium" ];then # contains files from Vivado and sim output, no GIT release
    echo "prepare simout directory from pwd=$PWD p3=$P3"
 #  P3=`basename $PWD`
 #  P4=`dirname $PWD`
@@ -162,7 +175,7 @@
      else echo "cannot find list=${filename}.sh";exit 1
      fi
    fi
-   if [ "$SIMDIR" == "ies" ];then
+   if [ "$SIMDIR" == "ies" ]||[ "$SIMDIR" == "xcelium" ];then
 #    cp run_* cds.lib hdl.var $SIMOUT
      cp ../nc*.tcl  	      $SIMOUT
 #    cp nc*.log		      $SIMOUT 		# compile output in case of debug questions
@@ -174,8 +187,14 @@
    cd $SIMOUT
 #  ln -s $SNAP_ROOT/hardware/support  support  	# to easier get to waveform signallists
    if   [ "$SIMDIR" == "ies" ];then
-     ln -s $SNAP_ROOT/hardware/sim/ies/ies        	# point to compiled model
-     ln -s $SNAP_ROOT/hardware/sim/ies/INCA_libs 	# point to compiled model
+     ln -s $SNAP_ROOT/hardware/sim/ies/ies              # ?
+     ln -s $SNAP_ROOT/hardware/sim/ies/INCA_libs        # point to compiled model
+     ln -s $SNAP_ROOT/hardware/sim/ies/ies_libs         # point to compiled library
+     ln -s $SNAP_ROOT/hardware/sim/nvme denali          # point to denali runtime files
+   elif [ "$SIMDIR" == "xcelium" ];then
+     ln -s $SNAP_ROOT/hardware/sim/xcelium/xcelium      # ?
+     ln -s $SNAP_ROOT/hardware/sim/xcelium/xcelium.d    # point to compiled model
+     ln -s $SNAP_ROOT/hardware/sim/xcelium/xcelium_lib  # point to compiled library
      ln -s $SNAP_ROOT/hardware/sim/nvme denali          # point to denali runtime files
    elif [ "$SIMDIR" == "xsim" ];then
      ln -s $SNAP_ROOT/hardware/sim/xsim/xsim.dir
@@ -207,8 +226,8 @@
  if [[ "$NVME_USED" == "TRUE" && -n "$DENALI" ]]; then
    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DENALI/verilog                                                        # to find libvpi.so and libdenpli.so
  fi
- if [ "$SIMDIR" == "ies" ];then
-#  if [ "$SIM_INIT" == "" ];then SIM_INIT='-ncinitialize x';fi                  # default init value for ncsim
+ if [ "$SIMDIR" == "ies" ]||[ "$SIMDIR" == "xcelium" ];then
+#  if [ "$SIM_INIT" == "" ];then SIM_INIT='-ncinitialize x';fi                  # default init value for irun
 #  SIM_ARG='-gui' 		# interactive, stop @cyc0
 #  SIM_ARG='-gui -tcl'		# interactive with simvision
 #  SIM_ARG='-gui -run -tcl' 	# non_interactive, with simvision
@@ -283,8 +302,8 @@
  echo "run_sim sim_arg=${SIM_ARG}, tst_arg=${TST_ARG}, AET=$AET"|tee -a sim.log
 
 ##### call Simulator
- echo "**** call simulator=$SIMULATOR in background, wait for socket in $SIMULATOR.log->shim_host.dat"|tee -a sim.log &
- if [ "$SIMULATOR" == "irun" ];then SIM_ARG+=" -r";fi
+ if [ "$SIMULATOR" == "irun" ]||[ "$SIMULATOR" == "xrun" ];then SIM_ARG+=" -r";fi
+ echo "**** call simulator=$SIMULATOR $SIM_ARG $SIMTOP in background, wait for socket in $SIMULATOR.log->shim_host.dat"|tee -a sim.log &
  $SIMULATOR $SIM_ARG $SIMTOP |tee -a sim.log &
  SIMLOG_PID=$!                          # sim.log records 1st socket
  SIMLOG_PPID=`ps -ef|grep $SIMLOG_PID |grep tee  |awk '{print $3}'`
diff --git a/scripts/Kconfig b/scripts/Kconfig
diff --git a/snap_config b/snap_config

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`- version ;# show ncsim version`
	`16`	`+ version ;# show irun version`
`17`	`17`	`assertion -off -all ;# Disable all assertion fails prior to reset done.`
`18`	`18`	`input ncaet.tcl ;# enabled through run_sim`
`19`	`19`	`set intovf_severity_level {warning};`