diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | aarch64/Asmexpand.ml | 1 | ||||
| -rw-r--r-- | test/gourdinl/builtin_memcpy.c | 9 | ||||
| -rw-r--r-- | test/monniaux/csmith/Makefile | 10 |
4 files changed, 17 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ecdafdf..6604997c 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' EXECUTE='timeout 10s 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 -- " rules: - if: '$CI_COMMIT_BRANCH == "kvx-work"' when: always diff --git a/aarch64/Asmexpand.ml b/aarch64/Asmexpand.ml index 828c96d6..68884550 100644 --- a/aarch64/Asmexpand.ml +++ b/aarch64/Asmexpand.ml @@ -185,6 +185,7 @@ let memcpy_small_arg sz arg tmp = | BA_addrstack ofs -> if offset_in_range ofs && offset_in_range (Ptrofs.add ofs (Ptrofs.repr (Z.of_uint sz))) + && (Z.to_int ofs) mod 8 = 0 then (XSP, ofs) else begin expand_addimm64 (RR1 tmp) XSP ofs; (RR1 tmp, _0) end | _ -> diff --git a/test/gourdinl/builtin_memcpy.c b/test/gourdinl/builtin_memcpy.c new file mode 100644 index 00000000..421f543c --- /dev/null +++ b/test/gourdinl/builtin_memcpy.c @@ -0,0 +1,9 @@ +struct a b; +struct a { + short; + int; + short; +} c() { + struct a d[2][16]; + b = d[1][7]; +} diff --git a/test/monniaux/csmith/Makefile b/test/monniaux/csmith/Makefile index f4b0d68a..1f32dccb 100644 --- a/test/monniaux/csmith/Makefile +++ b/test/monniaux/csmith/Makefile @@ -6,7 +6,7 @@ INCLUDES=-I csmith/include/csmith-2.3.0/ TARGET_CCOMP=../../../ccomp ifndef TARGET_CC -TARGET_CC=kvx-cos-gcc +TARGET_CC=gcc endif ifndef EXECUTE @@ -20,7 +20,7 @@ CSMITH=csmith/bin/csmith endif CSMITHOPT=--max-funcs 10 -MAX=10000 +MAX=500 PREFIX=ran%06.f CCOMPOTS=-static @@ -90,7 +90,9 @@ ran%/example.host_target.cmp : ran%/example.gcc.host.out ran%/example.ccomp.targ clean: -rm -rf ran* -csmith/bin/csmith: - curl -L -o csmith-2.3.0.tar.gz https://embed.cs.utah.edu/csmith/csmith-2.3.0.tar.gz +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 WD=`pwd` && cd csmith-2.3.0 && ./configure --prefix=$$WD/csmith && make install |