diff options
| author | Palmer Dabbelt <palmer@dabbelt.com> | 2016-07-12 11:17:10 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@eecs.berkeley.edu> | 2016-07-12 11:17:10 -0700 |
| commit | 7f3b666f55c9f01c2f2fd725c1686e1a509df173 (patch) | |
| tree | 2e256eed2b68c15a0e0dfa6984acf96bd2252fca | |
| parent | b6c8a03dcd7ed3c109d2c9da797b295f160f051d (diff) | |
| download | riscv-tests-7f3b666f55c9f01c2f2fd725c1686e1a509df173.zip riscv-tests-7f3b666f55c9f01c2f2fd725c1686e1a509df173.tar.gz riscv-tests-7f3b666f55c9f01c2f2fd725c1686e1a509df173.tar.bz2 | |
Add a "--with-xlen" configure argument (#16)
The tools had riscv64-unknown-elf-gcc hard-coded all over the place.
This lets users override that if they have a 32-bit toolchain.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | benchmarks/Makefile | 2 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | isa/Makefile | 3 | ||||
| -rw-r--r-- | mt/Makefile | 2 |
6 files changed, 34 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 9129d56..62a95b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,6 @@ prefix := @prefix@ abs_top_src_dir := @abs_top_srcdir@ +XLEN := @XLEN@ instbasedir := $(DESTDIR)$(prefix) bmarkdir := $(abs_top_src_dir)/benchmarks isa_src_dir := $(abs_top_src_dir)/isa @@ -14,11 +15,11 @@ install: all benchmarks: mkdir -p benchmarks - $(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir) + $(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir) XLEN=$(XLEN) isa: mkdir -p isa - $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) + $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) XLEN=$(XLEN) clean: $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) clean diff --git a/benchmarks/Makefile b/benchmarks/Makefile index e294f72..965246e 100644 --- a/benchmarks/Makefile +++ b/benchmarks/Makefile @@ -46,7 +46,7 @@ bmarks_host = \ HOST_OPTS = -std=gnu99 -DPREALLOCATE=0 -DHOST_DEBUG=1 HOST_COMP = gcc $(HOST_OPTS) -RISCV_PREFIX ?= riscv64-unknown-elf- +RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf- RISCV_GCC ?= $(RISCV_PREFIX)gcc RISCV_GCC_OPTS ?= -mcmodel=medany -static -std=gnu99 -O2 -ffast-math -fno-common -fno-builtin-printf RISCV_LINK ?= $(RISCV_GCC) -T $(src_dir)/common/test.ld $(incs) @@ -583,6 +583,7 @@ PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS +XLEN OBJEXT EXEEXT ac_ct_CC @@ -631,6 +632,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +with_xlen ' ac_precious_vars='build_alias host_alias @@ -1245,6 +1247,11 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-xlen=XLEN Set XLEN, the X-register bit width (default is 64) + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -2515,6 +2522,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu + +# Check whether --with-xlen was given. +if test "${with_xlen+set}" = set; then : + withval=$with_xlen; XLEN=$withval + +else + XLEN=64 + + +fi + + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/configure.ac b/configure.ac index d85ddd6..ebfd649 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,14 @@ AC_INIT(riscv-tests, 1.0) cross_compiling=yes AC_PROG_CC +AC_ARG_WITH(xlen, + [AS_HELP_STRING([--with-xlen=XLEN], + [Set XLEN, the X-register bit width (default is 64)])], + AC_SUBST(XLEN, $withval), + AC_SUBST(XLEN, 64) + ) + + AC_OUTPUT( Makefile ) diff --git a/isa/Makefile b/isa/Makefile index 4e1af6c..facc611 100644 --- a/isa/Makefile +++ b/isa/Makefile @@ -23,13 +23,12 @@ default: all # Build rules #-------------------------------------------------------------------- -RISCV_PREFIX ?= riscv64-unknown-elf- +RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf- RISCV_GCC ?= $(RISCV_PREFIX)gcc ENTROPY ?= -DENTROPY=$(shell echo $$$$) RISCV_GCC_OPTS ?= $(ENTROPY) -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles RISCV_OBJDUMP ?= $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.text.init --section=.data RISCV_SIM ?= spike -XLEN ?= 64 vpath %.S $(src_dir) diff --git a/mt/Makefile b/mt/Makefile index e4a8bfd..b45e551 100644 --- a/mt/Makefile +++ b/mt/Makefile @@ -75,7 +75,7 @@ bmarks = $(bmarks_vvadd) $(bmarks_matmul) # Build rules #-------------------------------------------------------------------- -RISCV_PREFIX=riscv64-unknown-elf- +RISCV_PREFIX=riscv$(XLEN)-unknown-elf- RISCV_GCC = $(RISCV_PREFIX)gcc RISCV_GCC_OPTS = -std=gnu99 -O2 -ffast-math RISCV_LINK = $(RISCV_GCC) -T $(common)/test.ld $(incs) |