From 85c5034f2b9a788cc1ab75c18815caae7bdb7d5c Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Mon, 2 Jan 2017 15:58:30 +0100
Subject: [PATCH] Fix a bug in the clock checking that was preventing to have
merge on tuples.
---
_oasis | 2 +-
src/evalClock.ml | 25 ++++++++++++++++---------
src/lv6version.ml | 4 ++--
test/lus2lic.sum | 24 ++++++++++++------------
4 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/_oasis b/_oasis
index 5cf4b218..7ec67509 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lustre-v6
-Version: 1.675
+Version: 1.676
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/evalClock.ml b/src/evalClock.ml
index e9be9d00..24948404 100644
--- a/src/evalClock.ml
+++ b/src/evalClock.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 24/11/2016 (at 16:23) by Erwan Jahier> *)
+(* Time-stamp: <modified the 02/01/2017 (at 15:54) by Erwan Jahier> *)
open AstPredef
@@ -83,7 +83,7 @@ let rec fold_left3 f accu l1 l2 l3 =
match (l1, l2, l3) with
([], [], []) -> accu
| (a1::l1, a2::l2, a3::l3) -> fold_left3 f (f accu a1 a2 a3) l1 l2 l3
- | (_, _, _) -> invalid_arg "fold_left3 (evalClock)"
+ | (_, _, _) -> invalid_arg "in EvalClock.fold_left3"
let (check_args : Lxm.t list -> subst -> Lic.id_clock list -> Lic.id_clock list -> subst) =
fun lxms s cil_par cil_arg ->
@@ -225,7 +225,10 @@ let rec (f : IdSolver.t -> subst -> Lic.val_exp -> Lxm.t list -> Lic.clock list
let s =
if exp_clks = [] then s else (
if (List.length exp_clks <> List.length inf_clks) then
- raise (Compile_error(lxm_of_val_exp ve, "Bad arity"))
+ let msg = Printf.sprintf "Bad arity: %i expected, %i found"
+ (List.length exp_clks) (List.length inf_clks)
+ in
+ raise (Compile_error(lxm_of_val_exp ve, msg))
else
fold_left3
(fun s lxm eclk iclk -> UnifyClock.f s lxm eclk iclk)
@@ -275,7 +278,7 @@ and (f_aux : IdSolver.t -> subst -> Lic.val_exp ->
let posop,args = CURRENT (Some cc), cv_val_exp::args in
let ve = { ve with
ve_core = CallByPosLic ({it=posop; src=lxm}, args) ;
- ve_clk = [cv_clk]
+ ve_clk = [cv_clk]
} in
ve
| _ -> { ve with ve_core = CallByPosLic ({it=posop; src=lxm}, args)}
@@ -293,10 +296,10 @@ and (f_aux : IdSolver.t -> subst -> Lic.val_exp ->
raise (Compile_error(lxm, "\n*** can't eval constant: "^msg))
)
| Merge(ce, cl) ->
- let ce, cel, s = f_aux id_solver s ce in
+ let ce, cel, s = f_aux id_solver s ce in
let (merge_clk : Lic.clock) = List.hd ce.ve_clk in
let ce_id,lxm = match ce with
- | { ve_core= CallByPosLic({it = VAR_REF id ; src = lxm },[]) } -> id,lxm
+ | { ve_core= CallByPosLic({it = VAR_REF id },[]) } -> id, ve.ve_src
| _ -> assert false
in
let check_case (s,acc) (c,ve) =
@@ -309,13 +312,17 @@ and (f_aux : IdSolver.t -> subst -> Lic.val_exp ->
| _ -> assert false
in
let id_clk = (id_clk, ce_id, Lic.type_of_const c.it) in
- let exp_clk = [On(id_clk, merge_clk)] in
- let ve,cel,s = f id_solver s ve [c.src] exp_clk in
+ let exp_clk = On(id_clk, merge_clk) in
+ (* [ve] can be a tuple! nb: tuple with different clocks won't work here *)
+ let exp_clk = List.map (fun _ -> exp_clk) ve.ve_typ in
+ let lxms = List.map (fun _ -> c.src) ve.ve_typ in
+ let ve,cel,s = f id_solver s ve lxms exp_clk in
s, (c,ve)::acc
in
let s,cl = List.fold_left check_case (s,[]) cl in
let ve = { ve with ve_core = Merge(ce, List.rev cl) } in
- ve, [ce_id,merge_clk], s, lxm
+ let merge_clk = List.map (fun _ -> ce_id, merge_clk) ve.ve_typ in
+ ve, merge_clk, s, lxm
in
let new_clk = snd (List.split cel) in
let s, ve =
diff --git a/src/lv6version.ml b/src/lv6version.ml
index c03c9b22..edbaa0dd 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 = "675"
-let sha_1 = "1e82ed48c773e465c63dca9f4b005273dee5c1b0"
+let commit = "676"
+let sha_1 = "24a93acc1d2d2d2815902aa67acf26a0a0795c65"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr"
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 8703cec0..749ad985 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Mon Jan 2 11:38:03
+Test Run By jahier on Mon Jan 2 15:47:50
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -64,7 +64,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 Mon Jan 2 11:38:04
+Test Run By jahier on Mon Jan 2 15:47:50
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -399,7 +399,7 @@ PASS: sh multipar.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
==> lus2lic2.sum <==
-Test Run By jahier on Mon Jan 2 11:38:23
+Test Run By jahier on Mon Jan 2 15:48:09
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -745,7 +745,7 @@ PASS: sh zzz2.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {}
==> lus2lic3.sum <==
-Test Run By jahier on Mon Jan 2 11:39:03
+Test Run By jahier on Mon Jan 2 15:48:48
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1251,7 +1251,7 @@ PASS: ./myec2c {-o multipar.c multipar.ec}
PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test Run By jahier on Mon Jan 2 11:39:14
+Test Run By jahier on Mon Jan 2 15:48:59
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1775,14 +1775,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of unexpected failures 4
===============================
# Total number of failures: 24
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 19 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 40 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 38 seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 11 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 32 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 30 seconds
* Ref time:
-0.03user 0.06system 1:42.20elapsed 0%CPU (0avgtext+0avgdata 5576maxresident)k
-64inputs+0outputs (0major+6132minor)pagefaults 0swaps
+0.05user 0.04system 1:39.74elapsed 0%CPU (0avgtext+0avgdata 5736maxresident)k
+128inputs+0outputs (0major+6144minor)pagefaults 0swaps
* Quick time (-j 4):
-0.06user 0.02system 0:50.29elapsed 0%CPU (0avgtext+0avgdata 5728maxresident)k
-128inputs+0outputs (0major+6163minor)pagefaults 0swaps
+0.04user 0.04system 0:48.79elapsed 0%CPU (0avgtext+0avgdata 5648maxresident)k
+96inputs+0outputs (0major+6161minor)pagefaults 0swaps
--
GitLab