From 2ad0d6e859cb90c0ae26652c71bf82e8f24ab49f Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 21 Dec 2021 23:19:28 +0100 Subject: compile & install gappa for KVX --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8ccedb8..096d8959 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,7 +276,7 @@ build_kvx: - rm -rf download - eval `opam config env` - opam update - - opam install -y menhir + - opam pin add coq-flocq 3.4.0 && opam install -y menhir gappa coq-gappa -coq-flocq script: - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" -- cgit From 9790ad0c32ff9ae1e08d974c0a410954bccf24b6 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 21 Dec 2021 23:36:45 +0100 Subject: use option -n for pin add --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 096d8959..9c4379fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,7 +276,7 @@ build_kvx: - rm -rf download - eval `opam config env` - opam update - - opam pin add coq-flocq 3.4.0 && opam install -y menhir gappa coq-gappa -coq-flocq + - opam pin add -n coq-flocq 3.4.0 && opam install -y menhir gappa coq-gappa -coq-flocq script: - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" -- cgit From 7063cdbba6a38b01429cb68389b22ea7b4b6aea2 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 21 Dec 2021 23:40:38 +0100 Subject: fix opam pin --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c4379fd..79f755d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,7 +276,7 @@ build_kvx: - rm -rf download - eval `opam config env` - opam update - - opam pin add -n coq-flocq 3.4.0 && opam install -y menhir gappa coq-gappa -coq-flocq + - opam pin add coq-flocq 3.4.0 --no-action && opam install -y menhir gappa coq-gappa -coq-flocq script: - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" -- cgit From 7b04543056d381c6bdb4ac256cc14ec9c31fcddd Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 21 Dec 2021 23:44:17 +0100 Subject: fix again opam --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79f755d7..82690410 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,7 +276,7 @@ build_kvx: - rm -rf download - eval `opam config env` - opam update - - opam pin add coq-flocq 3.4.0 --no-action && opam install -y menhir gappa coq-gappa -coq-flocq + - opam pin add coq-flocq 3.4.0 --no-action && opam install -y menhir gappa coq-gappa coq-flocq script: - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" -- cgit From 7875c804ceb0aaa054d9487866496a32a5787b13 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 21 Dec 2021 23:51:53 +0100 Subject: bison for gappa --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82690410..e18f9e56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,7 +269,8 @@ build_kvx: image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 + - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison + # bison for gappa - ./.download_from_Kalray.sh - (cd download ; rm -f *dkms*.deb *eclipse*.deb *llvm*.deb *board-mgmt* *oce-host* *pocl* *flash-util* *barebox* *-kann-* *-kaf-* *-stb-* *-opencv* *-eigen* *-task* *-blis* *-lz4*) - sudo dpkg -i download/*.deb -- cgit From ea0bb074c4edf530f8e7bf4065db4ee3cc15994a Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 21 Dec 2021 23:57:51 +0100 Subject: add flex --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e18f9e56..b8b28eb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,15 +269,15 @@ build_kvx: image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison - # bison for gappa + - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex + # bison and flex for gappa - ./.download_from_Kalray.sh - (cd download ; rm -f *dkms*.deb *eclipse*.deb *llvm*.deb *board-mgmt* *oce-host* *pocl* *flash-util* *barebox* *-kann-* *-kaf-* *-stb-* *-opencv* *-eigen* *-task* *-blis* *-lz4*) - sudo dpkg -i download/*.deb - rm -rf download - eval `opam config env` - - opam update - - opam pin add coq-flocq 3.4.0 --no-action && opam install -y menhir gappa coq-gappa coq-flocq + - opam update && opam pin add coq-flocq 3.4.0 --no-action + - opam install -y menhir gappa coq-gappa coq-flocq script: - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" -- cgit From e2d328f18030a00207f2610a159177060df857ec Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 22 Dec 2021 00:07:11 +0100 Subject: add libmpfr --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8b28eb6..b03119a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,8 +269,8 @@ build_kvx: image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex - # bison and flex for gappa + - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex libmpfr-dev + # bison, flex, libmpfr-dev for gappa - ./.download_from_Kalray.sh - (cd download ; rm -f *dkms*.deb *eclipse*.deb *llvm*.deb *board-mgmt* *oce-host* *pocl* *flash-util* *barebox* *-kann-* *-kaf-* *-stb-* *-opencv* *-eigen* *-task* *-blis* *-lz4*) - sudo dpkg -i download/*.deb -- cgit From dd1bb6c83309ef4c1a9a2f960c5dd935fc6882dd Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 22 Dec 2021 00:17:05 +0100 Subject: +Boost --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b03119a7..d678aab7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,8 +269,8 @@ build_kvx: image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex libmpfr-dev - # bison, flex, libmpfr-dev for gappa + - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex libmpfr-dev libboost-dev + # bison, flex, libmpfr-dev, libboost-dev for gappa - ./.download_from_Kalray.sh - (cd download ; rm -f *dkms*.deb *eclipse*.deb *llvm*.deb *board-mgmt* *oce-host* *pocl* *flash-util* *barebox* *-kann-* *-kaf-* *-stb-* *-opencv* *-eigen* *-task* *-blis* *-lz4*) - sudo dpkg -i download/*.deb -- cgit From bfe75ff0614ef6b93313c77fba44d12cb68bd94b Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 22 Dec 2021 00:47:23 +0100 Subject: external Flocq --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d678aab7..724d8543 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -279,7 +279,7 @@ build_kvx: - opam update && opam pin add coq-flocq 3.4.0 --no-action - opam install -y menhir gappa coq-gappa coq-flocq script: - - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh + - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh --use-external-Flocq - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" - make -j "$NJOBS" clightgen - source /opt/kalray/accesscore/kalray.sh && make -C test CCOMPOPTS=-static SIMU='kvx-cluster -- ' EXECUTE='kvx-cluster -- ' all test -- cgit From d51e5088717ef047902cca02f0ddd5e36fa50432 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 22 Dec 2021 09:22:26 +0100 Subject: rm flocq --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 724d8543..41df7d8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -279,6 +279,7 @@ build_kvx: - opam update && opam pin add coq-flocq 3.4.0 --no-action - opam install -y menhir gappa coq-gappa coq-flocq script: + - rm -rf flocq - source /opt/kalray/accesscore/kalray.sh && ./config_kvx.sh --use-external-Flocq - source /opt/kalray/accesscore/kalray.sh && make -j "$NJOBS" - make -j "$NJOBS" clightgen -- cgit From e5a0de154dae052e0cddb82b4c116a1b14501a1e Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 2 Feb 2022 18:48:28 +0100 Subject: update Coq --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41df7d8e..378eb1fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -266,7 +266,7 @@ build_rv32: build_kvx: stage: build - image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda + image: coq:8.13.2-ocaml-4.11.2-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex libmpfr-dev libboost-dev @@ -327,9 +327,9 @@ pages: # TODO: change to "deploy" when "build" succeeds (or integrate with "buil - if: '$CI_COMMIT_BRANCH == "master"' when: always -build_aarch64_coq13: +build_aarch64_coq14: stage: build - image: coqorg/coq:8.13.2-ocaml-4.11.2-flambda + image: coqorg/coq:8.14.1-ocaml-4.12.0-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - sudo apt-get -y install gcc-aarch64-linux-gnu qemu-user -- cgit From 760300e972f4c4b3eb14d90e79580bb1f2632197 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 2 Feb 2022 18:50:43 +0100 Subject: fix path to coq image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 378eb1fe..c730a00e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -266,7 +266,7 @@ build_rv32: build_kvx: stage: build - image: coq:8.13.2-ocaml-4.11.2-flambda + image: coqorg/coq:8.13.2-ocaml-4.11.2-flambda before_script: - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace libzip4 bison flex libmpfr-dev libboost-dev -- cgit