jeltz/heptagon
1
0
Fork 0
Code Issues Pull requests Releases Activity

Corrected bug in causality analysis

Browse source 
The following node was accepted by the causality analysis:

node m(x:int) = (y,z:int)
let
    automaton
    state A
    do
      y = x + z;
      z = x + 1;
    until x = 3 then B
    state B
    do
      y = x + 3;
      z = y * x;
    until x = 10 then A
    end
tel

Each state is indeed causal, but once the automaton is translated to equations
(which is the systematic way in the current version), the node is not
schedulable.

Correction: all "Or" of dependency constraints translated to "And".

This constraint could be relaxed if code generation is done from Heptagon code,
before translation to minils equations.
This commit is contained in:
Gwenaël Delaval 2017-05-23 10:56:50 +02:00
parent cc666cb32c
commit 63e090633c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compiler/heptagon/analysis/causality.ml
View file

@ -203,12 +203,12 @@ and typing_eq eq =
and typing_switch handlers =
let handler { w_block = b } = typing_block b in
corlist (List.map handler handlers)
candlist (List.map handler handlers)
and typing_present handlers b =
let handler { p_cond = e; p_block = b } =
cseq (typing e) (typing_block b) in
corlist ((typing_block b) :: (List.map handler handlers))
candlist ((typing_block b) :: (List.map handler handlers))
and typing_automaton state_handlers =
(* typing the body of the automaton *)
@ -222,7 +222,7 @@ and typing_automaton state_handlers =
let t2 = candlist (List.map escape sunless) in
cseq t2 (cseq tb t1) in
corlist (List.map handler state_handlers)
candlist (List.map handler state_handlers)
and typing_block { b_local = _dec; b_equs = eq_list; b_loc = _loc } =
(*let teq = typing_eqs eq_list in
@ -247,8 +247,8 @@ let typing_contract loc contract =
((typing e_a) ::
(typing e_a_loc) ::
(typing e_g_loc) ::
(List.map (fun o -> typing o.o_exp) objs)
)) in
(List.map (fun o -> typing o.o_exp) objs)
)) in
Causal.check loc t_contract;
let t_contract = clear (build b.b_local) t_contract in
t_contract