Merge pull request #28 from foss-for-synopsys-dwc-arc-processors/luis_qemu_testsuite_wip

Integrated the QEMU testsuite port for DejaGNU.

Signed-off-by: Luis Silva [email protected]

Author: luismgsilva

Makefile.in

@@ -100,25 +100,38 @@ else
 endif
 endif
 
+ifeq (@default_target@,linux)
+	TARGET_ALIAS = $(call make_tuple,linux-gnu)
+	TARGET_TRIPLET = $(call make_tupple,unknown-linux-gnu)
+else
+ifeq (@target_alias@,arc)
+	TARGET_ALIAS = $(call make_tuple,elf32)
+	TARGET_TRIPLET = $(call make_tuple,unknown-elf32)
+else
+	TARGET_ALIAS = $(call make_tuple,elf)
+	TARGET_TRIPLET = $(call make_tuple,unknown-elf)
+endif
+endif
+
 ifeq ($(SIM),qemu)
 	# Using qemu simulator.
 	SIM_STAMP:= stamps/build-qemu
+	SIM_PATH:=$(srcdir)/scripts/wrapper/$(SIM)
+	SIM_PREPARE:=PATH="$(SIM_PATH):$(INSTALL_DIR)/bin:$(PATH)" ARC_SYSROOT="$(SYSROOT)" DEJAGNU="$(srcdir)/dejagnu/site.exp" DEJAGNU_SIM_OPTIONS="-Wq,-semihosting" QEMU_CPU="$(QEMU_CPU)"
 else
 ifeq ($(SIM),nsim)
 	# Using nsim simulator.
 	ifeq (@default_target@, linux)
 		$(error nSIM not supported)
 	endif
 	SIM_STAMP:= nsim-validation
+	SIM_PATH:=$(srcdir)/scripts/wrapper/$(SIM)
+	SIM_PREPARE:=PATH="$(SIM_PATH):$(INSTALL_DIR)/bin:$(PATH)" ARC_SYSROOT="$(SYSROOT)" DEJAGNU="$(srcdir)/dejagnu/site.exp" QEMU_CPU="$(QEMU_CPU)"
 else
 	$(error Only support SIM=nsim, or SIM=qemu (default))
 endif
 endif
 
-SIM_PATH:=$(srcdir)/scripts/wrapper/$(SIM)
-SIM_PREPARE:=PATH="$(SIM_PATH):$(INSTALL_DIR)/bin:$(PATH)" ARC_SYSROOT="$(SYSROOT)" DEJAGNU="$(srcdir)/dejagnu/site.exp" QEMU_CPU="$(QEMU_CPU)"
-
-
 all: @default_target@ @qemu_build@
 	echo "$(INSTALL_DIR)" > stamps/install_dir
 baremetal: stamps/build-gcc-newlib-stage2
@@ -147,6 +160,9 @@ check-binutils: check-binutils-@default_target@
 check-binutils-linux: stamps/check-binutils-linux
 check-binutils-baremetal: stamps/check-binutils-baremetal
 
+check-qemu: check-qemu-@default_target@
+check-qemu-baremetal: stamps/check-qemu-baremetal
+
 check-newlib-baremetal:stamps/check-newlib-baremetal
 
 .PHONY: report
@@ -156,6 +172,7 @@ report-linux: $(patsubst %,report-%-linux,$(REGRESSION_TEST_LIST))
 report-baremetal: $(patsubst %,report-%-baremetal,$(REGRESSION_TEST_LIST))
 
 .PHONY: report-newlib-@default_target@ report-binutils-@default_target@
+report-qemu: report-qemu-@default_target@
 report-gcc: report-gcc-@default_target@
 report-binutils: report-binutils-@default_target@
 report-newlib: report-newlib-@default_target@
@@ -527,6 +544,22 @@ stamps/build-qemu: $(QEMU_SRCDIR)
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
 
+stamps/build-test-qemu: $(srcdir)/test-qemu
+	rm -rf $@ $(notdir $@)
+	mkdir $(notdir $@)
+	cd $(notdir $@) && $</configure \
+		--with-alias=$(TARGET_ALIAS) \
+		--with-triplet=$(TARGET_TRIPLET)
+	mkdir -p $(dir $@) && touch $@
+
+stamps/check-qemu-baremetal: stamps/build-gcc-newlib-stage2 $(SIM_STAMP) stamps/build-test-qemu
+ifneq ($(SIM),qemu)
+	$(error QEMU simulator must be used)
+endif
+	$(SIM_PREPARE) DEJAGNU_SIM_OPTIONS="-Wq,-serial -Wq,stdio" $(MAKE) -C build-test-qemu check "RUNTESTFLAGS=$(RUNTESTFLAGS) --target_board='$(NEWLIB_TARGET_BOARDS)'" || true
+	mkdir -p $(dir $@)
+	date > $@
+
 stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 $(SIM_STAMP)
 	$(SIM_PREPARE) $(MAKE) -C build-gcc-linux-stage2 check-gcc "RUNTESTFLAGS=$(RUNTESTFLAGS) --target_board='$(GLIBC_TARGET_BOARDS)'"
 	mkdir -p $(dir $@)
@@ -554,6 +587,11 @@ ifeq ($(shell command -v nsimdrv),)
 	$(error nsimdrv not detected)
 endif
 
+report-qemu-baremetal: stamps/check-qemu-baremetal
+	$(srcdir)/scripts/testsuite-filter newlib \
+		$(srcdir)/test/allowlist/qemu/$(QEMU_CPU)/qemu.json \
+		`find build-test-qemu -name *.sum |paste -sd "," -`
+
 report-gcc-baremetal: stamps/check-gcc-baremetal
 	$(srcdir)/scripts/testsuite-filter newlib \
 		$(srcdir)/test/allowlist/gcc/$(QEMU_CPU)/gcc.json \

dejagnu/baseboards/arc-sim.exp

@@ -56,6 +56,11 @@ set_board_info noargs 1
 set_board_info gdb,nosignals 1
 set_board_info sim_time_limit 300
 
+# Provides options to the simulator's execution call.
+if {[info exists ::env(DEJAGNU_SIM_OPTIONS)]} {
+    set_board_info sim,options "$env(DEJAGNU_SIM_OPTIONS)"
+}
+
 # skip gdb.reverse
 set_board_info gdb,can_reverse 0
 set_board_info gdb,use_precord 0

scripts/wrapper/qemu/arc64-elf-run

@@ -4,7 +4,7 @@ qemu_args=()
 while [[ "$1" != "" ]]
 do
     case "$1" in
-	-Wq,*) qemu_args+=("$echo "$1" | cut -d, -f2-)");;
+	-Wq,*) qemu_args+=("$(echo "$1" | cut -d, -f2-)");;
 	*) break;;
     esac
     shift
@@ -13,9 +13,11 @@ done
 xlen="$(readelf -h $1 | grep 'Class' | cut -d: -f 2 | xargs echo | sed 's/^ELF//')"
 
 case "$xlen" in
-    64) qemu="64";;
-    *) qemu="";;
+    64) qemu="64"
+	mem="3G";;
+    *)	qemu=""
+	mem="2G";;
 esac
 
-qemu-system-arc$qemu -semihosting -cpu ${QEMU_CPU} -M arc-sim -m 2G -nographic \
+qemu-system-arc$qemu -cpu ${QEMU_CPU} -M arc-sim -m $mem "${qemu_args[@]}" -nographic \
 		     -no-reboot -monitor none -kernel "$@"

test-qemu/Makefile.in

@@ -0,0 +1,26 @@
+srcdir = @srcdir@
+target_alias = @target_alias@
+target_triplet = @target_triplet@
+
+site.exp:
+	@echo "Making a new config file..."
+	@test ! -f site.bak || rm -f site.bak
+	@echo "## these variables are automatically generated by make ##" > $@-t
+	@echo "# Do not edit here. If you wish to override these values" >> $@-t
+	@echo "# add them to the last section" >> $@-t
+	@echo "set srcdir $(srcdir)/qemu/testsuite" >> $@-t
+	@echo "set objdir ./" >> $@-t
+	@echo "set tmpdir ./tmp" >> $@-t
+	@echo "set target_alias $(target_alias)" >> $@-t
+	@echo "set target_triplet $(target_triplet)" >> $@-t
+	@test ! -f site.exp || sed '1./^## All variables above are.*##/ d' site.exp >> $@-t
+	@test ! -f site.exp || mv site.exp site.bak
+	@mv $@-t site.exp
+
+check: site.exp
+	@if [ -d tmp ] ; then \
+	  true ; \
+	else \
+	  mkdir tmp ; \
+	fi
+	runtest --tool qemu $(RUNTESTFLAGS) || true