aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2021-09-21 09:09:08 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2021-09-21 09:09:08 +0200
commit04e9f9fef81b6adb9d7088496612b3f7aab99843 (patch)
treeeeb891db9fea774ba37f4dbba96a85836e446a9a
parentee73aa4d40ac7b57f54321cdec8a8f70633edc81 (diff)
parent683591ec8d60ed4d44b97d0f9f6870ec84ab07a6 (diff)
downloadcompcert-kvx-04e9f9fef81b6adb9d7088496612b3f7aab99843.tar.gz
compcert-kvx-04e9f9fef81b6adb9d7088496612b3f7aab99843.zip
Merge branch 'csmith' of gricad-gitlab.univ-grenoble-alpes.fr:sixcy/CompCert into csmith
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--test/monniaux/csmith/Makefile4
-rwxr-xr-xtest/monniaux/csmith/reduce/reduce_wrt_host.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6604997c..f0bcc6b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,7 +273,7 @@ build_kvx:
- source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS"
- source /opt/kalray/accesscore/kalray.sh && make -C test CCOMPOPTS=-static SIMU='kvx-cluster -- ' EXECUTE='kvx-cluster -- ' all test
- source /opt/kalray/accesscore/kalray.sh && ulimit -s65536 && make -C test/monniaux/yarpgen TARGET_CC='kvx-cos-gcc' EXECUTE='kvx-cluster -- ' CCOMPOPTS='-static' TARGET_CFLAGS='-static'
- - source /opt/kalray/accesscore/kalray.sh && ulimit -s65536 && make -C test/monniaux/csmith TARGET_CC='kvx-cos-gcc' CCOMPOPTS="-Wl,--defsym=USER_STACK_SIZE=0x20000" EXECUTE="timeout 10s kvx-cluster -- "
+ - source /opt/kalray/accesscore/kalray.sh && ulimit -s65536 && make -C test/monniaux/csmith TARGET_CC='kvx-cos-gcc' CCOMPOPTS="-Wl,--defsym=USER_STACK_SIZE=0x80000" EXECUTE="timeout 10s kvx-cluster -- "
rules:
- if: '$CI_COMMIT_BRANCH == "kvx-work"'
when: always
diff --git a/test/monniaux/csmith/Makefile b/test/monniaux/csmith/Makefile
index 1f32dccb..5a1d3843 100644
--- a/test/monniaux/csmith/Makefile
+++ b/test/monniaux/csmith/Makefile
@@ -18,7 +18,7 @@ CFLAGS += -Wno-incompatible-pointer-types
ifndef CSMITH
CSMITH=csmith/bin/csmith
endif
-CSMITHOPT=--max-funcs 10
+CSMITHOPT=--max-funcs 10 --no-unions
MAX=500
PREFIX=ran%06.f
@@ -91,7 +91,7 @@ clean:
-rm -rf ran*
csmith-2.3.0.tar.gz:
- curl -L -O $@ https://embed.cs.utah.edu/csmith/csmith-2.3.0.tar.gz
+ curl -L -o $@ https://embed.cs.utah.edu/csmith/csmith-2.3.0.tar.gz
csmith/bin/csmith: csmith-2.3.0.tar.gz
tar xfz csmith-2.3.0.tar.gz
diff --git a/test/monniaux/csmith/reduce/reduce_wrt_host.sh b/test/monniaux/csmith/reduce/reduce_wrt_host.sh
index c72ffe30..2cf2102c 100755
--- a/test/monniaux/csmith/reduce/reduce_wrt_host.sh
+++ b/test/monniaux/csmith/reduce/reduce_wrt_host.sh
@@ -6,7 +6,7 @@ then
then
if cmp source.clang.host.out source.gcc+san.host.out && aarch64-linux-gnu-gcc $INCLUDE -Werror=format -Werror=uninitialized -Werror=implicit source.c -Werror=return-type -o source.gcc.target && qemu-aarch64 -L /usr/aarch64-linux-gnu source.gcc.target >& source.gcc.target.out && grep checksum source.gcc.target.out > source.gcc.target.check && diff source.clang.host.out source.gcc.target.out
then
- if $COMPCERT/ccomp $INCLUDE -fall -fno-cse -fno-cse2 -fno-cse3 source.c -o source.ccomp.target
+ if $COMPCERT/ccomp $INCLUDE -Werror=missing-declarations -fall -fno-cse -fno-cse2 -fno-cse3 source.c -o source.ccomp.target
then
qemu-aarch64 -L /usr/aarch64-linux-gnu source.ccomp.target >& source.ccomp.target.out
if grep checksum source.ccomp.target.out > source.ccomp.target.check