diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-28 19:09:55 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-28 19:09:55 +0100 |
| commit | 39d53bf1d57c6ce9c78cbc42521ad96a783e6896 (patch) | |
| tree | 72a016fea4acdc554e639796b70f66de9229ca10 | |
| parent | 35c545b3b2711645452b747b3d75b4f46a078776 (diff) | |
| download | compcert-kvx-39d53bf1d57c6ce9c78cbc42521ad96a783e6896.tar.gz compcert-kvx-39d53bf1d57c6ce9c78cbc42521ad96a783e6896.zip | |
More Yarpgen
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | test/monniaux/yarpgen/Makefile | 25 |
2 files changed, 30 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f696257..fd5dffe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ build_x86_64: - ./config_x86_64.sh - make -j "$NJOBS" - make -C test all test - - make -C test/monniaux/yarpgen + - ulimit -s65536 && make -C test/monniaux/yarpgen rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always @@ -35,7 +35,7 @@ build_ia32: - ./config_ia32.sh - make -j "$NJOBS" - make -C test all test -# - make -C test/monniaux/yarpgen disabled due to -m32/-m64 issues + - ulimit -s65536 && make -C test/monniaux/yarpgen BITS=32 TARGET_CC='gcc -m32' rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always @@ -58,7 +58,7 @@ build_aarch64: - ./config_aarch64.sh - make -j "$NJOBS" - make -C test CCOMPOPTS='-static' SIMU='qemu-aarch64' EXECUTE='qemu-aarch64' all test - - make -C test/monniaux/yarpgen -k TARGET_CC='aarch64-linux-gnu-gcc' EXECUTE='qemu-aarch64' CCOMPOPTS='-static' TARGET_CFLAGS='-static' + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='aarch64-linux-gnu-gcc' EXECUTE='qemu-aarch64' CCOMPOPTS='-static' TARGET_CFLAGS='-static' rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always @@ -81,7 +81,7 @@ build_arm: - ./config_arm.sh - make -j "$NJOBS" - make -C test DIRS="c compression spass regression" CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test -# - make -C test/monniaux/yarpgen -k TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' disabled; mysterious differences between gcc/clang and compcert + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always @@ -146,7 +146,7 @@ build_rv64: - ./config_rv64.sh - make -j "$NJOBS" - make -C test CCOMPOPTS=-static SIMU='qemu-riscv64' EXECUTE='qemu-riscv64' all test - - make -C test/monniaux/yarpgen -k TARGET_CC='riscv64-linux-gnu-gcc' EXECUTE='qemu-riscv64' CCOMPOPTS='-static' TARGET_CFLAGS='-static' + - ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='riscv64-linux-gnu-gcc' EXECUTE='qemu-riscv64' CCOMPOPTS='-static' TARGET_CFLAGS='-static' rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always diff --git a/test/monniaux/yarpgen/Makefile b/test/monniaux/yarpgen/Makefile index dbd6ae75..30080855 100644 --- a/test/monniaux/yarpgen/Makefile +++ b/test/monniaux/yarpgen/Makefile @@ -10,6 +10,14 @@ YARPGEN=./yarpgen GENERATOR=yarpgen endif +<<<<<<< HEAD +======= +ifdef BITS +YARPGEN+=-m $(BITS) +CFLAGS+=-m$(BITS) +endif + +>>>>>>> origin/mppa-ci MAX=129 PREFIX=ran%06.f @@ -31,9 +39,15 @@ TESTS_GCC_HOST_S=$(TEST_C:.c=.gcc.host.s) TESTS_CCOMP_TARGET_OUT=$(shell seq --format $(PREFIX)/example.ccomp.target.out 1 $(MAX)) TESTS_GCC_TARGET_OUT=$(shell seq --format $(PREFIX)/example.gcc.target.out 1 $(MAX)) TESTS_GCC_HOST_OUT=$(shell seq --format $(PREFIX)/example.gcc.host.out 1 $(MAX)) +<<<<<<< HEAD TESTS_CMP=$(shell seq --format $(PREFIX)/example.host_target.cmp 1 $(MAX)) $(shell seq --format $(PREFIX)/example.target.cmp 1 $(MAX)) all: $(TESTS_CCOMP_TARGET_OUT) $(TESTS_GCC_TARGET_OUT) $(TESTS_GCC_HOST_OUT) $(TESTS_CCOMP_TARGET_S) $(TESTS_GCC_TARGET_S) $(TESTS_GCC_HOST_S) $(TESTS_CMP) $(TESTS_C) +======= +TESTS_CMP=$(shell seq --format $(PREFIX)/example.target.cmp 1 $(MAX)) # $(shell seq --format $(PREFIX)/example.host_target.cmp 1 $(MAX)) + +all: $(TESTS_CCOMP_TARGET_OUT) $(TESTS_GCC_TARGET_OUT) $(TESTS_CCOMP_TARGET_S) $(TESTS_GCC_TARGET_S) $(TESTS_CMP) $(TESTS_C) +>>>>>>> origin/mppa-ci tests_c: $(TESTS_C) @@ -51,11 +65,22 @@ tests_s: $(TESTS_CCOMP_TARGET_S) %.target.o : %.target.s $(TARGET_CC) -c -o $@ $< +<<<<<<< HEAD %.target.out : %.target $(EXECUTE) $< > $@ %.host.out : %.host ./$< > $@ +======= +%.host.o : %.host.s + $(CC) $(CFLAGS) -c -o $@ $< + +%.target.out : %.target + $(EXECUTE) $< | tee $@ + +%.host.out : %.host + ./$< | tee $@ +>>>>>>> origin/mppa-ci ran%/func.ccomp.target.s ran%/func.gcc.target.s ran%/func.ccomp.host.s ran%/func.gcc.host.s ran%/init.gcc.host.s : ran%/init.h |