Merge pull request #283 from riscv/travis

Resurrect the testsuite on Travis

.travis.yml

@@ -12,6 +12,8 @@ addons:
       - bison
       - build-essential
       - curl
+      - dejagnu
+      - expect
       - flex
       - gawk
       - gperf
@@ -28,12 +30,12 @@ before_install:
   - export CXX=g++-4.8
   - export CC=gcc-4.8
 env:
-  - CARGS="--enable-linux  --disable-multilib --with-arch=rv32imac --with-abi=ilp32"
-  - CARGS="--enable-linux  --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32"
-  - CARGS="--enable-linux  --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32d"
-  - CARGS="--enable-linux  --disable-multilib --with-arch=rv64imac --with-abi=lp64"
-  - CARGS="--enable-linux  --disable-multilib --with-arch=rv64imafdc --with-abi=lp64"
-  - CARGS="--enable-linux  --disable-multilib --with-arch=rv64imafdc --with-abi=lp64d"
+#  - CARGS="--enable-linux  --disable-multilib --with-arch=rv32imac --with-abi=ilp32"
+#  - CARGS="--enable-linux  --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32"
+#  - CARGS="--enable-linux  --disable-multilib --with-arch=rv32imafdc --with-abi=ilp32d"
+#  - CARGS="--enable-linux  --disable-multilib --with-arch=rv64imac --with-abi=lp64"
+#  - CARGS="--enable-linux  --disable-multilib --with-arch=rv64imafdc --with-abi=lp64"
+#  - CARGS="--enable-linux  --disable-multilib --with-arch=rv64imafdc --with-abi=lp64d"
   - CARGS="--disable-linux  --disable-multilib --with-arch=rv32i --with-abi=ilp32"
   - CARGS="--disable-linux  --disable-multilib --with-arch=rv32im --with-abi=ilp32"
   - CARGS="--disable-linux  --disable-multilib --with-arch=rv32iac --with-abi=ilp32"
@@ -45,5 +47,5 @@ install: true
 script:
   - ./configure --prefix=/tmp/build-default $CARGS
   - travis_wait 90 scripts/wrapper/make_tail
-  - travis_wait 45 scripts/wrapper/make_tail check
+  - travis_wait 180 scripts/wrapper/make_tail check
   - make report

Makefile.in

@@ -370,28 +370,29 @@ stamps/build-qemu: $(srcdir)/riscv-qemu
 		--target-list=riscv64-linux-user,riscv32-linux-user
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
+	mkdir -p $(dir $@)
 	date > $@
 
-check-gdb-newlib: stamps/build-gcc-newlib-stage2
-	export PATH=$(INSTALL_DIR)/bin:$(PATH) && \
-	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
-	cd build-binutils-newlib && \
-	$(MAKE) check-gdb "RUNTESTFLAGS=--target_board=riscv-sim"
-
-stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu
-	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
-	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
-	export RISC_V_SYSROOT=$(SYSROOT) && \
-	cd build-gcc-newlib-stage2 && \
-	$(MAKE) check-gcc "RUNTESTFLAGS=--target_board='$(NEWLIB_TARGET_BOARDS)'"
+stamps/build-dejagnu: $(srcdir)/riscv-dejagnu
+	rm -rf $@ $(notdir $@)
+	mkdir $(notdir $@)
+	cd $(notdir $@) && $</configure \
+		--prefix=$(INSTALL_DIR)
+	$(MAKE) -C $(notdir $@)
+	mkdir -p $(dir $@)
+	date > $@
+
+check-gdb-newlib: stamps/build-gcc-newlib-stage2 stamps/build-dejagnu
+	PATH="$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" $(MAKE) -C build-binutils-newlib check-gdb "RUNTESTFLAGS=--target_board=riscv-sim"
+
+stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu stamps/build-dejagnu
+	PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(MAKE) -C build-gcc-newlib-stage2 check-gcc "RUNTESTFLAGS=--target_board='$(NEWLIB_TARGET_BOARDS)'"
+	mkdir -p $(dir $@)
 	date > $@
 
-stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 stamps/build-qemu
-	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
-	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
-	export RISC_V_SYSROOT=$(SYSROOT) && \
-	cd build-gcc-linux-stage2 && \
-	$(MAKE) check-gcc "RUNTESTFLAGS=--target_board='$(GLIBC_TARGET_BOARDS)'"
+stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 stamps/build-qemu stamps/build-dejagnu
+	PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(MAKE) -C build-gcc-linux-stage2 check-gcc "RUNTESTFLAGS=--target_board='$(GLIBC_TARGET_BOARDS)'"
+	mkdir -p $(dir $@)
 	date > $@
 
 .PHONY: check-dhrystone-newlib
@@ -404,10 +405,7 @@ stamps/check-dhrystone-newlib-%: \
 	$(eval $@_ARCH := $(word 4,$(subst -, ,$@)))
 	$(eval $@_ABI := $(word 5,$(subst -, ,$@)))
 	$(eval $@_XLEN := $(patsubst rv32%,32,$(patsubst rv64%,64,$($@_ARCH))))
-	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
-	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
-	export RISC_V_SYSROOT=$(SYSROOT) && \
-	$(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true
+	PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true
 
 .PHONY: check-dhrystone-linux
 check-dhrystone-linux: $(patsubst %,stamps/check-dhrystone-linux-%,$(GLIBC_MULTILIB_NAMES))
@@ -419,10 +417,7 @@ stamps/check-dhrystone-linux-%: \
 	$(eval $@_ARCH := $(word 4,$(subst -, ,$@)))
 	$(eval $@_ABI := $(word 5,$(subst -, ,$@)))
 	$(eval $@_XLEN := $(patsubst rv32%,32,$(patsubst rv64%,64,$($@_ARCH))))
-	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
-	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
-	export RISC_V_SYSROOT=$(SYSROOT) && \
-	$(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true
+	PATH="$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH)" DEJAGNULIBS="$(srcdir)/riscv-dejagnu" RISC_V_SYSROOT="$(SYSROOT)" $(srcdir)/test/benchmarks/dhrystone/check -march=$($@_ARCH) -mabi=$($@_ABI) -cc=riscv$(XLEN)-unknown-elf-gcc -objdump=riscv$(XLEN)-unknown-elf-objdump -sim=riscv$($@_XLEN)-unknown-elf-run -out=$@ $(filter %.c,$^) || true
 
 .PHONY: report-gcc-newlib
 report-gcc-newlib: stamps/check-gcc-newlib

riscv-gcc

@@ -1 +1 @@
-Subproject commit c95cdcae21de8dbb8a8ceb9c58b5f9560f0628ff
+Subproject commit 4fb4d8f9e9ac8a28d6ea5117688eadbcd0f7978e

scripts/wrapper/make_tail

@@ -1,3 +1,6 @@
 #!/bin/bash
 
+set -o pipefail
+set -e
+
 make "$@" | tail

test/gcc-newlib/rv32i-ilp32.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0

test/gcc-newlib/rv32iac-ilp32.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0

test/gcc-newlib/rv32im-ilp32.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0

test/gcc-newlib/rv32imac-ilp32.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0

test/gcc-newlib/rv32imafc-ilp32f.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0

test/gcc-newlib/rv64imac-lp64.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0

test/gcc-newlib/rv64imafdc-lp64d.log

@@ -1,3 +1,8 @@
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/memmove-4.c scan-tree-dump-not optimized "memmove"
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/strlenopt-8.c scan-tree-dump-times strlen "memcpy \\(" 2
 build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tls/pr78796.c execution test
+# These all look like performance problems related to our movmem
+# implementation.
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/ipa/iinline-cstagg-2.c scan-ipa-dump inline "thisisthetarget[^\\n]*inline copy in outerfunction"
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _T2" 0
+build-gcc-newlib-stage2/gcc/testsuite/gcc/gcc.sum:FAIL: gcc.dg/tree-ssa/pr42585.c scan-tree-dump-times optimized "struct _fat_ptr _ans" 0