From a35d8a9a255bf2c97e3c200e720670829d2d585a Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Wed, 4 Oct 2017 11:42:23 +0200
Subject: [PATCH] run the tests on crevetete to record the new timings for
future comparisons
---
.lpp.prcs_aux | 159 ----------------------------------------------
.mkfig | 6 --
_oasis | 2 +-
src/lv6version.ml | 4 +-
test/Makefile | 2 +-
test/lus2lic.sum | 28 ++++----
6 files changed, 18 insertions(+), 183 deletions(-)
delete mode 100644 .lpp.prcs_aux
delete mode 100644 .mkfig
diff --git a/.lpp.prcs_aux b/.lpp.prcs_aux
deleted file mode 100644
index 8dc34646..00000000
--- a/.lpp.prcs_aux
+++ /dev/null
@@ -1,159 +0,0 @@
-;; This file is automatically generated, editing may cause PRCS to do
-;; REALLY bad things.
-(Created-By-Prcs-Version 1 3 3)
-(src/srcTab.mli 1057 1162999560 c/25_srcTab.mli 1.1)
-(xx.ml 275 1160119994 c/13_xx.ml 1.1)
-(src/checkNodeBody.ml 4801 1160064580 49_checkNodeB 1.1)
-(left.lus 361 1160119994 12_left.lus 1.1)
-(src/poub/checkDef.ml 5899 1160064579 b/21_checkDef.m 1.1)
-(src/x.ml 72 1160119994 c/33_x.ml 1.1)
-(src/checkDef.ml 11955 1160064580 b/4_checkDef.m 1.1)
-(a.out 38940 1160831541 b/43_a.out 1.1)
-(notes/.pastex/notes.aux 2207 1161689620 c/49_notes.aux 1.1)
-(notes/notes.tex 378 1161677192 c/45_notes.tex 1.1)
-(src/verbose.mli 470 1162999560 c/24_verbose.ml 1.1)
-(doc/syntax-core.tex 8313 1160064577 b/26_syntax-cor 1.1)
-(src/expandPack.ml 6050 1162999287 c/39_expandPack 1.1)
-(tests/const-bool.lus 297 1160064580 23_const-bool 1.1)
-(notes/notes-idents.tex 3735 1161618659 c/47_notes-iden 1.1)
-(notes/notes-modules.tex 275 1161690174 c/43_notes-modu 1.1)
-(packEnvTest/readme 407 1160467694 c/6_readme 1.1)
-(src/globalEnv.mli 1076 1162999560 c/27_globalEnv. 1.1)
-(xx.dot 873 1160119994 c/14_xx.dot 1.1)
-(,,ALIRE 219 1160119994 19_,,ALIRE 1.1)
-(packEnvTest/contractForElementSelectionInArray/main.lus 868 1160467694 c/8_main.lus 1.1)
-(src/lxm.ml 1390 1162999287 c/32_lxm.ml 1.1)
-(tests/const-array.lus 286 1160064580 24_const-arra 1.1)
-(src/evalNode.ml 1019 1160064580 43_evalNode.m 1.1)
-(src/Makefile 4557 1162999365 b/5_Makefile 1.3)
-(xx 1814 1162314383 c/42_xx 1.1)
-(src/xx.ps 74940 1160064580 28_xx.ps 1.1)
-(packEnvTest/contractForElementSelectionInArray/tri.lus 8627 1160467694 c/12_tri.lus 1.1)
-(src/poub/checkType.ml 2291 1160064580 b/15_checkType. 1.1)
-(packEnvTest/preced.xec 1657 1160467694 c/2_preced.xec 1.1)
-(src/poub/checkNode.ml 3141 1160064579 b/16_checkNode. 1.1)
-(t.ml 1930 1160119994 7_t.ml 1.1)
-(doc/lpp.toc 871 1160064577 b/27_lpp.toc 1.1)
-(doc/poub/notes.tex 5297 1160064577 d/0_notes.tex 1.1)
-(tests/node-simple.lus 137 1160064580 20_node-simpl 1.1)
-(src/poub/checkEnv.ml 13703 1160064579 b/20_checkEnv.m 1.1)
-(src/poub/checkConst.ml 23520 1160064579 b/22_checkConst 1.1)
-(packEnvTest/packages.lus 1872 1160751074 b/50_packages.l 1.1)
-(toto.ml 51 1160119994 3_toto.ml 1.1)
-(packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus 813 1160467694 c/9_contractFo 1.1)
-(tests/const-simple.lus 573 1160064580 22_const-simp 1.1)
-(doc/syntax.ps 83525 1160064577 b/25_syntax.ps 1.1)
-(src/poub/checkArray.ml 4863 1160064579 b/23_checkArray 1.1)
-(doc/poub/idees.ps 51616 1160064577 d/2_idees.ps 1.1)
-(t.i 19 1160119994 9_t.i 1.1)
-(toto.mli 67 1160119994 2_toto.mli 1.1)
-(xx.lus 2713 1160831680 b/42_xx.lus 1.1)
-(src/poub/checkGlobal.ml 643 1160064579 b/18_checkGloba 1.1)
-(src/compileData.mli 18461 1162999560 c/29_compileDat 1.1)
-(src/compileNode.ml 1497 1161010349 c/20_compileNod 1.1)
-(trivial.lus 57 1160119994 1_trivial.lu 1.1)
-(src/lexeme.mli 1210 1161002040 40_lexeme.mli 1.2)
-(src/poub/evalNode.txt 1188 1160064580 b/13_evalNode.t 1.1)
-(src/compileData.ml 18138 1162999287 48_compileDat 1.2)
-(src/precieux/standardLib.ml 567 1160064580 b/6_standardLi 1.1)
-(src/toto.ml 51 1160119994 c/35_toto.ml 1.1)
-(src/compile.ml 1705 1162999287 27_compile.ml 1.3)
-(src/checkExp.ml 28346 1160064580 b/2_checkExp.m 1.1)
-(src/evalConst.ml 26029 1162999287 44_evalConst. 1.2)
-(notes/notes-compil.tex 12090 1161618781 c/46_notes-comp 1.1)
-(x.ml 72 1160119994 c/15_x.ml 1.1)
-(src/poub/expandEnv.ml 3095 1160064580 b/10_expandEnv. 1.1)
-(x.lus 88 1160119994 c/16_x.lus 1.1)
-(ALIRE 3146 1162215986 b/39_ALIRE 1.2)
-(src/expandPack.mli 1051 1162999560 c/28_expandPack 1.1)
-(style.css 1459 1160119994 10_style.css 1.1)
-(tests/const-struct.lus 433 1160064580 21_const-stru 1.1)
-(src/syntaxe.ml 13056 1162999287 25_syntaxe.ml 1.3)
-(packEnvTest/test.exp 0 1160467694 c/5_test.exp 1.1)
-(notes/.pastex/mkfig 115 1161689620 c/51_mkfig 1.1)
-(packEnvTest/contractForElementSelectionInArray/packageTableau.lus 14691 1160467694 c/10_packageTab 1.1)
-(src/srcTab.ml 7499 1162999287 c/36_srcTab.ml 1.1)
-(src/lexeme.ml 1390 1161005973 41_lexeme.ml 1.2)
-(xx.ps 45292 1161258629 b/45_xx.ps 1.2)
-(notes/notes.pdf 70922 1161689621 c/48_notes.pdf 1.1)
-(packEnvTest/test.res 0 1160467694 c/3_test.res 1.1)
-(src/parser.output 232120 1162999624 c/17_parser.out 1.2)
-(t2.lus 822 1160119994 4_t2.lus 1.1)
-(src/main.mli 264 1162999560 38_main.mli 1.1)
-(doc/poub/devel.ps 54968 1160064577 d/5_devel.ps 1.1)
-(src/verbose.ml 1870 1162999287 31_verbose.ml 1.2)
-(src/checkNode.ml 10563 1160064580 51_checkNode. 1.1)
-(newpacks.lus 1872 1160751320 b/46_newpacks.l 1.1)
-(src/xx.ml 4703 1162999287 29_xx.ml 1.2)
-(cons.lus 266 1160119994 14_cons.lus 1.1)
-(packages.lus 1891 1162919717 b/38_packages.l 1.2)
-(notes/.pastex/notes.log 7555 1161689621 c/50_notes.log 1.1)
-(packEnvTest/modelInst.lus 799 1160998867 b/47_modelInst. 1.1)
-(src/toto.ps 70655 1160064580 33_toto.ps 1.1)
-(struct0.lus 125 1160119994 11_struct0.lu 1.1)
-(src/checkNodeAlias.ml 2196 1160064580 50_checkNodeA 1.1)
-(src/checkGlobal.ml 15165 1160064580 b/1_checkGloba 1.1)
-(src/net.ml 131 1162999287 37_net.ml 1.1)
-(MODULES 311 1160119994 16_MODULES 1.1)
-(src/xx 513 1160064580 30_xx 1.1)
-(src/doit 114 1162999557 c/31_doit 1.1)
-(t1.lus 733 1160119994 5_t1.lus 1.1)
-(doc/lpp.ps 183307 1160064577 b/29_lpp.ps 1.1)
-(src/poub/expandArray.ml 17273 1160064580 b/12_expandArra 1.1)
-(notes/deps 200 1161679530 c/44_deps 1.1)
-(packEnvTest/test.diff 0 1160467694 b/51_test.diff 1.1)
-(src/dump.ml 18883 1162999287 46_dump.ml 1.3)
-(src/md5.ml 267 1162999287 c/18_md5.ml 1.1)
-(src/poub/checkExp.ml 17178 1160064579 b/19_checkExp.m 1.1)
-(packEnvTest/packages2.lus 1677 1160996760 b/49_packages2. 1.1)
-(toto.c 60 1160998805 b/41_toto.c 1.1)
-(A_LIRE 4454 1160119994 17_A_LIRE 1.1)
-(packEnvTest/Condact.lus 791 1160996960 b/48_Condact.lu 1.1)
-(src/parser.mly 34629 1162999623 35_parser.mly 1.3)
-(doc/poub/idees.lus 1929 1160064577 d/3_idees.lus 1.1)
-(src/utiles.ml 3743 1162999287 32_utiles.ml 1.2)
-(src/compUtils.mli 472 1162999560 c/30_compUtils. 1.1)
-(src/poub/checkMain.ml 20316 1160064579 b/17_checkMain. 1.1)
-(packEnvTest/contractForElementSelectionInArray/readme 271 1160467694 c/7_readme 1.1)
-(src/eval.ml 1175 1160119994 c/40_eval.ml 1.1)
-(packEnvTest/Makefile 378 1160467694 c/4_Makefile 1.1)
-(src/poub/compileData-exp.ml 19937 1160064580 b/14_compileDat 1.1)
-(src/t.ml 417 1162999287 34_t.ml 1.1)
-(src/lexer.mll 9641 1162999655 39_lexer.mll 1.3)
-(t0.lus 334 1160119994 6_t0.lus 1.1)
-(src/compileEnv.ml 7972 1160997891 47_compileEnv 1.2)
-(packEnvTest/main.xec 1068 1160467694 c/1_main.xec 1.1)
-(AFAIRE 467 1161866766 c/22_AFAIRE 1.1)
-(doc/Makefile 126 1160064577 b/31_Makefile 1.1)
-(toto.o 666 1160998806 b/40_toto.o 1.1)
-(packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus 128 1160467694 c/11_noeudsInde 1.1)
-(src/lazyComp.mli 116 1162999560 c/26_lazyComp.m 1.1)
-(preced.xec 1658 1161094208 c/21_preced.xec 1.1)
-(doc/lpp.tex 9369 1160064577 b/28_lpp.tex 1.1)
-(src/main.ml 4542 1162999287 26_main.ml 1.3)
-(eval.ml 1175 1160119994 13_eval.ml 1.1)
-(src/precieux/checkExp.ml 18901 1160064580 b/7_checkExp.m 1.1)
-(src/globalEnv.ml 15489 1162999287 c/38_globalEnv. 1.1)
-(packEnvTest/C.xec 741 1160467694 c/0_C.xec 1.1)
-(src/checkLeft.ml 6397 1160064580 b/0_checkLeft. 1.1)
-(src/evalType.ml 1881 1160064580 42_evalType.m 1.1)
-(src/compUtils.ml 769 1162999287 c/41_compUtils. 1.1)
-(src/errors.ml 5292 1162999287 45_errors.ml 1.3)
-(doc/commandes.tex 11049 1160064577 b/30_commandes. 1.1)
-(src/v.ml 319 1161781044 c/34_v.ml 1.1)
-(utils/odoc_fhtml.ml 40105 1160118575 0_odoc_fhtml 1.1)
-(doc/syntax.tex 529 1160064577 b/24_syntax.tex 1.1)
-(.depend 3628 1162999656 18_.depend 1.3)
-(src/effPack.ml 356 1160829610 c/19_effPack.ml 1.1)
-(src/poub/save.checkOper.ml 5080 1160064580 b/8_save.check 1.1)
-(doc/poub/idees.tex 2595 1160064577 d/1_idees.tex 1.1)
-(src/checkDump.ml 4251 1160064580 b/3_checkDump. 1.1)
-(src/poub/expandData.ml 3171 1160064580 b/11_expandData 1.1)
-(src/lxm.mli 1210 1162999560 c/23_lxm.mli 1.1)
-(src/netList.ml 506 1162999287 36_netList.ml 1.1)
-(src/lazyComp.ml 121 1162999287 c/37_lazyComp.m 1.1)
-(doc/poub/devel.tex 1715 1160064577 d/4_devel.tex 1.1)
-(Makefile.save 1535 1160119994 15_Makefile.s 1.1)
-(src/poub/flat.ml 1896 1160064580 b/9_flat.ml 1.1)
-(t.lus 493 1160119994 8_t.lus 1.1)
-(yy.ps 79015 1160827360 b/44_yy.ps 1.1)
diff --git a/.mkfig b/.mkfig
deleted file mode 100644
index c34e9673..00000000
--- a/.mkfig
+++ /dev/null
@@ -1,6 +0,0 @@
-all:\
-.pastex/srctab.pdf_t\
-
-.pastex/%.pdf_t: figs/%.fig
- fig2dev -Lpdftex figs/$*.fig > .pastex/$*.pdf
- fig2dev -Lpdftex_t -p .pastex/$*.pdf figs/$*.fig > .pastex/$*.pdf_t
diff --git a/_oasis b/_oasis
index e003d205..8ebaaba8 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lustre-v6
-Version: 1.718
+Version: 1.719
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
diff --git a/src/lv6version.ml b/src/lv6version.ml
index e168b458..e810ed6b 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
(** Automatically generated from Makefile *)
let tool = "lus2lic"
let branch = "master"
-let commit = "718"
-let sha_1 = "2cf779843c4861964cf2903df72c46c2b233c142"
+let commit = "719"
+let sha_1 = "c71d2ed6ddf9632f744fea83c36b9fc0554ae7c7"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "erwan.jahier@univ-grenoble-alpes.fr"
diff --git a/test/Makefile b/test/Makefile
index ad47b453..0b2eface 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,7 @@ jenkins: clean qtest rest
TEST_MACHINE=ssh ovaz
-#TEST_MACHINE=eval
+TEST_MACHINE=eval
# This fixes sporadic memory errors I get when running tests
OCAMLRUNPARAM=s=1M,i=32M,o=150
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index ea7658c5..36aecd5e 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Wed Sep 27 09:40:20
+Test Run By jahier on Wed Oct 4 11:18:31
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
==> lus2lic1.sum <==
-Test Run By jahier on Wed Sep 27 09:40:21
+Test Run By jahier on Wed Oct 4 11:18:31
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -412,7 +412,7 @@ PASS: sh multipar.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
==> lus2lic2.sum <==
-Test Run By jahier on Wed Sep 27 09:41:17
+Test Run By jahier on Wed Oct 4 11:19:10
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -752,7 +752,7 @@ PASS: sh zzz2.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {}
==> lus2lic3.sum <==
-Test Run By jahier on Wed Sep 27 09:42:18
+Test Run By jahier on Wed Oct 4 11:19:54
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1266,7 +1266,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test Run By jahier on Wed Sep 27 09:43:31
+Test Run By jahier on Wed Oct 4 11:20:54
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1783,14 +1783,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of unexpected failures 6
===============================
# Total number of failures: 14
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 56 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 61 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 73 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 49 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 39 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 44 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 60 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 33 seconds
* Ref time:
-0.06user 0.00system 3:59.96elapsed 0%CPU (0avgtext+0avgdata 5564maxresident)k
-96inputs+0outputs (0major+6134minor)pagefaults 0swaps
+103.85user 16.38system 2:56.20elapsed 68%CPU (0avgtext+0avgdata 276440maxresident)k
+0inputs+5932056outputs (0major+21523092minor)pagefaults 0swaps
* Quick time (-j 4):
-0.05user 0.02system 2:20.68elapsed 0%CPU (0avgtext+0avgdata 5424maxresident)k
-128inputs+0outputs (0major+6122minor)pagefaults 0swaps
+136.03user 21.24system 2:14.69elapsed 116%CPU (0avgtext+0avgdata 276404maxresident)k
+0inputs+5874448outputs (0major+21364697minor)pagefaults 0swaps
--
GitLab