diff --git a/Makefile b/Makefile index 6565e09..64a4e2e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -RISCV_GNU_TOOLCHAIN_REV = 3134bf4 +RISCV_GNU_TOOLCHAIN_REV = 888ae43 GCC_URL = http://mirrors.kernel.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.gz NEWLIB_URL = ftp://sourceware.org/pub/newlib/newlib-2.2.0.tar.gz BINUTILS_URL = http://mirrors.kernel.org/gnu/binutils/binutils-2.26.tar.gz diff --git a/README.md b/README.md index 4198603..e35e270 100644 --- a/README.md +++ b/README.md @@ -542,7 +542,7 @@ pure RV32I target, and install it in `/opt/riscv32i`: git clone https://github.com/riscv/riscv-gnu-toolchain riscv-gnu-toolchain-rv32i cd riscv-gnu-toolchain-rv32i - git checkout 3134bf4 + git checkout 888ae43 mkdir build; cd build ../configure --with-xlen=32 --with-arch=I --prefix=/opt/riscv32i --disable-float --disable-atomic @@ -566,7 +566,7 @@ By default calling any of those make targets will (re-)download the toolchain sources. Run `make download-tools` to download the sources to `/var/cache/distfiles/` once in advance. -*Note: This instructions are for git rev 3134bf4 (2016-04-08) of riscv-gnu-toolchain.* +*Note: This instructions are for git rev 888ae43 (2016-04-10) of riscv-gnu-toolchain.* Evaluation: Timing and Utilization on Xilinx 7-Series FPGAs diff --git a/scripts/torture/Makefile b/scripts/torture/Makefile index 8856a7a..e9bea89 100644 --- a/scripts/torture/Makefile +++ b/scripts/torture/Makefile @@ -36,7 +36,6 @@ tests/generated.ok: riscv-torture/build.ok mkdir -p tests rm -f riscv-torture/output/test_* cd riscv-torture && ./sbt 'generator/run -n 1000' - sed -i -e '/addi x2, x2, 0/ s/addi/xori/;' riscv-torture/output/test_*.S touch tests/generated.ok define test_template diff --git a/scripts/torture/testbench.v b/scripts/torture/testbench.v index d6b974f..41f3495 100644 --- a/scripts/torture/testbench.v +++ b/scripts/torture/testbench.v @@ -79,9 +79,9 @@ module testbench ( end end if (errcount) - $display("FAILED: Got %1d errors for %1s/%1s!", errcount, hex_filename, ref_filename); + $display("FAILED: Got %1d errors for %1s => %1s!", errcount, hex_filename, ref_filename); else - $display("PASSED %1s/%1s.", hex_filename, ref_filename); + $display("PASSED %1s => %1s.", hex_filename, ref_filename); $finish; end end