Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lustre-v6
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
verimag
synchrone
lustre-v6
Commits
24a93acc
Commit
24a93acc
authored
8 years ago
by
Erwan Jahier
Browse files
Options
Downloads
Patches
Plain Diff
The clock dep loop checker (
1cffc6b4
) was detecting spurious loops.
parent
1e82ed48
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
_oasis
+1
-1
1 addition, 1 deletion
_oasis
src/licTab.ml
+6
-4
6 additions, 4 deletions
src/licTab.ml
src/lv6version.ml
+2
-2
2 additions, 2 deletions
src/lv6version.ml
test/lus2lic.sum
+11
-11
11 additions, 11 deletions
test/lus2lic.sum
with
20 additions
and
18 deletions
_oasis
+
1
−
1
View file @
24a93acc
OASISFormat: 0.4
Name: lustre-v6
Version: 1.67
4
Version: 1.67
5
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
...
...
This diff is collapsed.
Click to expand it.
src/licTab.ml
+
6
−
4
View file @
24a93acc
(* Time-stamp: <modified the
2
2/1
2
/201
6
(at 1
5
:4
1
) by
j
ahier> *)
(* Time-stamp: <modified the
0
2/
0
1/201
7
(at 1
1
:4
5
) by
Erwan J
ahier> *)
open
Lxm
...
...
@@ -364,17 +364,18 @@ let dep_star lxm vl vars =
let
tbl
=
Hashtbl
.
create
(
List
.
length
vl
)
in
List
.
iter
(
fun
v
->
Hashtbl
.
add
tbl
v
Todo
)
vl
;
let
rec
find_deps
v
=
Lv6Verbose
.
exe
~
flag
:
dbg
(
fun
()
->
Printf
.
printf
" check clock dep : %s
\n
"
v
);
if
not
(
Hashtbl
.
mem
tbl
v
)
then
Hashtbl
.
add
tbl
v
Todo
;
match
Hashtbl
.
find
tbl
v
with
|
Done
cl
->
cl
|
Todo
->
(
Hashtbl
.
replace
tbl
v
(
Doing
);
match
find_direct_dep
lxm
v
vars
with
|
None
->
Hashtbl
.
add
tbl
v
(
Done
[]
);[]
|
None
->
Hashtbl
.
replace
tbl
v
(
Done
[]
);[]
|
Some
v2
->
let
v2_deps
=
find_deps
v2
in
let
v_deps
=
v2
::
v2_deps
in
Hashtbl
.
add
tbl
v
(
Done
v_deps
);
Hashtbl
.
replace
tbl
v
(
Done
v_deps
);
v_deps
)
|
Doing
->
...
...
@@ -393,7 +394,8 @@ let dep_star lxm vl vars =
)
vl
;
let
tbl2
=
Hashtbl
.
create
(
List
.
length
vl
)
in
Hashtbl
.
iter
(
fun
v
dep
->
match
dep
with
Done
cl
->
Hashtbl
.
add
tbl2
v
cl
|
_
->
()
)
tbl
;
Hashtbl
.
iter
(
fun
v
dep
->
match
dep
with
Done
cl
->
Hashtbl
.
replace
tbl2
v
cl
|
_
->
()
)
tbl
;
tbl2
module
TopoSortVars
=
...
...
This diff is collapsed.
Click to expand it.
src/lv6version.ml
+
2
−
2
View file @
24a93acc
(** Automatically generated from Makefile *)
let
tool
=
"lus2lic"
let
branch
=
"master"
let
commit
=
"67
4
"
let
sha_1
=
"1
cffc6b49d46a14e9edfd05a678b56e00466682e
"
let
commit
=
"67
5
"
let
sha_1
=
"1
e82ed48c773e465c63dca9f4b005273dee5c1b0
"
let
str
=
(
branch
^
"."
^
commit
^
" ("
^
sha_1
^
")"
)
let
maintainer
=
"jahier@imag.fr"
This diff is collapsed.
Click to expand it.
test/lus2lic.sum
+
11
−
11
View file @
24a93acc
==> lus2lic0.sum <==
Test Run By jahier on
Wed Nov 30 17:10:51
Test Run By jahier on
Mon Jan 2 11:38:03
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
Wed Nov 30 17:10:52
Test Run By jahier on
Mon Jan 2 11:38:04
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
Wed Nov 30 17:11:11
Test Run By jahier on
Mon Jan 2 11:38:23
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
Wed Nov 30 17:11:50
Test Run By jahier on
Mon Jan 2 11:39:03
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
Wed Nov 30 17:12:01
Test Run By jahier on
Mon Jan 2 11:39:14
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
...
...
@@ -1777,12 +1777,12 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# Total number of failures: 24
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 19 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in
39
seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in
40
seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 11 seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 3
1
seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 3
2
seconds
* Ref time:
0.0
6
user 0.0
3
system 1:4
0.95
elapsed 0%CPU (0avgtext+0avgdata 5
680
maxresident)k
0
inputs+0outputs (0major+61
45
minor)pagefaults 0swaps
0.0
3
user 0.0
6
system 1:4
2.20
elapsed 0%CPU (0avgtext+0avgdata 5
576
maxresident)k
64
inputs+0outputs (0major+61
32
minor)pagefaults 0swaps
* Quick time (-j 4):
0.0
4
user 0.0
4
system 0:
46.53
elapsed 0%CPU (0avgtext+0avgdata 5
64
8maxresident)k
32
inputs+0outputs (0major+616
2
minor)pagefaults 0swaps
0.0
6
user 0.0
2
system 0:
50.29
elapsed 0%CPU (0avgtext+0avgdata 5
72
8maxresident)k
128
inputs+0outputs (0major+616
3
minor)pagefaults 0swaps
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment