Add support for TCF files in tests

Add option --elf32-nsim-tcf to run-tests.sh to specify TCF files to use,
instead of nSIM props file.

Signed-off-by: Anton Kolesov <[email protected]>

Author: anthony-kolesov

dejagnu/nsim-extra.exp

@@ -67,7 +67,13 @@ proc nsim_open { portnum } {
     # it is blocked and it stops responding to TCP connection and Dejagnu is
     # forced to restart it. I don't know a way to redirect nsim_gdb output to
     # null from Expect, so we have to use a shell to help as here.
-    spawn sh -c "$env(NSIM_HOME)/bin/nsimdrv -gdb -port $portnum -propsfile $env(ARC_NSIM_PROPS) -reconnect >/dev/null 2>/dev/null"
+
+    # Use either TCF or props file. TCF has higher priority.
+    if [info exists env(ARC_NSIM_TCF)] {
+	spawn sh -c "$env(NSIM_HOME)/bin/nsimdrv -gdb -port $portnum -tcf $env(ARC_NSIM_TCF) -reconnect >/dev/null 2>/dev/null"
+    } else {
+	spawn sh -c "$env(NSIM_HOME)/bin/nsimdrv -gdb -port $portnum -propsfile $env(ARC_NSIM_PROPS) -reconnect >/dev/null 2>/dev/null"
+    }
     unset_board_info nsim_id
     set_board_info nsim_id $spawn_id
     unset_board_info nsim_port

run-tests.sh

@@ -75,6 +75,11 @@
 #    matches multilib and endian options. This option makes sense only when
 #    target board is arc-nsim.
 
+# --elf32-nsim-tcf <path/to/nsim/tcf/file>
+
+#    Kind of like the --elf32-nsim-props, but specifies tcf file instead. If
+#    this option is set, then --elf32-nsim-props will be ignored.
+
 # --elf32-hostlink-library <path/to/hostlink/library>
 
 #    Path to hostlink library archive. Required for test runs with Metaware.
@@ -140,6 +145,7 @@ ARC_TEST_ADDR_ELF32=
 ARC_TEST_ADDR_UCLIBC=aa4_32
 ARC_MULTILIB_OPTIONS=""
 ARC_NSIM_PROPS="${NSIM_HOME}/systemc/configs/nsim_a700.props"
+ARC_NSIM_TCF="${NSIM_HOME}/etc/tcf/templates/hs36.tcf"
 ARC_HOSTLINK_LIBRARY=
 make_load="`(echo processor; cat /proc/cpuinfo 2>/dev/null echo processor) \
            | grep -c processor`"
@@ -188,9 +194,14 @@ case ${opt} in
 	;;
 
     --elf32-nsim-props)
-    shift
-    ARC_NSIM_PROPS=$1
-    ;;
+	shift
+	ARC_NSIM_PROPS=$1
+	;;
+
+    --elf32-nsim-tcf)
+	shift
+	ARC_NSIM_TCF=$1
+	;;
 
     --elf32-hostlink-library)
 	shift
@@ -321,6 +332,7 @@ case ${opt} in
         echo "                      [--elf32-target-addr <address>]"
         echo "                      [--uclibc-target-addr <address>]"
         echo "                      [--elf32-nsim-props <path>]"
+        echo "                      [--elf32-nsim-tcf <path>]"
         echo "                      [--elf32-hostlink-library <path>]"
         echo "                      [--elf32 | --no-elf32]"
         echo "                      [--uclibc | --no-uclibc]"
@@ -388,6 +400,11 @@ export DO_LIBSTDCPP
 export DO_SIM
 export DO_GDB
 
+if [ "x$ARC_NSIM_TCF" != x ]
+then
+    export ARC_NSIM_TCF
+fi
+
 if [ "x${ARC_HOSTLINK_LIBRARY}" != x ]
 then
     export ARC_HOSTLINK_LIBRARY