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
0929f236
Commit
0929f236
authored
2 years ago
by
erwan
Browse files
Options
Downloads
Patches
Plain Diff
fix: a bug in the C code in presence of extern functions
parent
bce7b883
No related branches found
Branches containing commit
Tags
v6.106.1
Tags containing commit
No related merge requests found
Pipeline
#102575
passed
2 years ago
Stage: build
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/soc2c.ml
+11
-11
11 additions, 11 deletions
lib/soc2c.ml
test/lus2lic.sum
+11
-11
11 additions, 11 deletions
test/lus2lic.sum
with
22 additions
and
22 deletions
lib/soc2c.ml
+
11
−
11
View file @
0929f236
(* Time-stamp: <modified the 0
6
/0
5
/2022 (at 1
0:2
9) by Erwan Jahier> *)
(* Time-stamp: <modified the
2
0/0
6
/2022 (at 1
7:4
9) by Erwan Jahier> *)
(* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
(* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
...
@@ -1016,24 +1016,24 @@ typedef float _float;
...
@@ -1016,24 +1016,24 @@ typedef float _float;
puth
"
\n
#include <stdio.h>"
;
puth
"
\n
#include <stdio.h>"
;
puth
"
\n
#include <stdlib.h>"
;
puth
"
\n
#include <stdlib.h>"
;
puth
"
\n
#include <string.h>
\n
"
;
puth
"
\n
#include <string.h>
\n
"
;
if
needs_hfile
||
args
.
Lv6MainArgs
.
ext_types
then
(
puth
(
Printf
.
sprintf
"#ifndef _%s_H_FILE
\n
"
base0
);
puth
(
Printf
.
sprintf
"#include
\"
%s
\"\n
"
ext_hfile0
);
puth
(
Printf
.
sprintf
"#define _%s_H_FILE
\n
"
base0
);
puth
"#endif
\n
"
;
);
puth
"#include
\"
lustre_consts.h
\"
"
;
puth
"#include
\"
lustre_consts.h
\"
"
;
output_string
och
(
"
output_string
och
(
"
// User typedef
// User typedef
#ifndef _"
^
base0
^
"_TYPES
#ifndef _"
^
base0
^
"_TYPES
#define _"
^
base0
^
"_TYPES
\n
"
);
#define _"
^
base0
^
"_TYPES
\n
"
);
output_string
och
(
user_typedef
licprg
);
flush
och
;
output_string
och
(
user_typedef
licprg
);
flush
och
;
output_string
och
((
typedef_all
licprg
stbl
main_soc
)
output_string
och
((
typedef_all
licprg
stbl
main_soc
)
^
"#endif // end of _"
^
base0
^
"_TYPES
^
"#endif // end of _"
^
base0
^
"_TYPES
"
"
);
^
(
if
needs_hfile
then
"#include
\"
"
^
base0
^
"_ext.h
\"\n
"
else
""
));
if
needs_hfile
||
args
.
Lv6MainArgs
.
ext_types
then
(
puth
(
Printf
.
sprintf
"
\n
#ifndef _%s_H_FILE
\n
"
base0
);
puth
(
Printf
.
sprintf
"#include
\"
%s
\"\n
"
ext_hfile0
);
puth
(
Printf
.
sprintf
"#define _%s_H_FILE
\n
"
base0
);
puth
(
Printf
.
sprintf
"#endif // _%s_H_FILE
\n\n
"
base0
);
);
try
try
Lv6util
.
entete
occ
"/*"
"*/"
;
Lv6util
.
entete
occ
"/*"
"*/"
;
if
Lv6MainArgs
.
global_opt
.
Lv6MainArgs
.
soc2c_dro
then
()
else
if
Lv6MainArgs
.
global_opt
.
Lv6MainArgs
.
soc2c_dro
then
()
else
...
...
This diff is collapsed.
Click to expand it.
test/lus2lic.sum
+
11
−
11
View file @
0929f236
==> lus2lic0.sum <==
==> lus2lic0.sum <==
Test run by jahier on
Wed
Jun
15 15:01:24
Test run by jahier on
Mon
Jun
20 17:30:38
Native configuration is x86_64-pc-linux-gnu
Native configuration is x86_64-pc-linux-gnu
=== lus2lic0 tests ===
=== lus2lic0 tests ===
...
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
...
@@ -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
XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
==> lus2lic1.sum <==
==> lus2lic1.sum <==
Test run by jahier on
Wed
Jun
15 15:01:25
Test run by jahier on
Mon
Jun
20 17:30:39
Native configuration is x86_64-pc-linux-gnu
Native configuration is x86_64-pc-linux-gnu
=== lus2lic1 tests ===
=== lus2lic1 tests ===
...
@@ -626,7 +626,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
...
@@ -626,7 +626,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
PASS: /home/jahier/lus2lic/test/../utils/compare_lv6_and_lv6_en multipar.lus {}
PASS: /home/jahier/lus2lic/test/../utils/compare_lv6_and_lv6_en multipar.lus {}
==> lus2lic2.sum <==
==> lus2lic2.sum <==
Test run by jahier on
Wed
Jun
15 15:07:17
Test run by jahier on
Mon
Jun
20 17:36:32
Native configuration is x86_64-pc-linux-gnu
Native configuration is x86_64-pc-linux-gnu
=== lus2lic2 tests ===
=== lus2lic2 tests ===
...
@@ -1171,7 +1171,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_lv6_and_lv6_en zzz2.lus {}
...
@@ -1171,7 +1171,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_lv6_and_lv6_en zzz2.lus {}
PASS: /home/jahier/lus2lic/test/../utils/compare_gcc_and_clang zzz2.lus {}
PASS: /home/jahier/lus2lic/test/../utils/compare_gcc_and_clang zzz2.lus {}
==> lus2lic3.sum <==
==> lus2lic3.sum <==
Test run by jahier on
Wed
Jun
15 15:13:46
Test run by jahier on
Mon
Jun
20 17:43:24
Native configuration is x86_64-pc-linux-gnu
Native configuration is x86_64-pc-linux-gnu
=== lus2lic3 tests ===
=== lus2lic3 tests ===
...
@@ -1686,7 +1686,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
...
@@ -1686,7 +1686,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
==> lus2lic4.sum <==
Test run by jahier on
Wed
Jun
15 15:14:57
Test run by jahier on
Mon
Jun
20 17:44:34
Native configuration is x86_64-pc-linux-gnu
Native configuration is x86_64-pc-linux-gnu
=== lus2lic4 tests ===
=== lus2lic4 tests ===
...
@@ -2211,11 +2211,11 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_gcc_and_clang multipar.lus {}
...
@@ -2211,11 +2211,11 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_gcc_and_clang multipar.lus {}
===============================
===============================
# Total number of failures: 17
# Total number of failures: 17
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 35
2
seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 35
3
seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in
389
seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in
412
seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 7
1
seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 7
0
seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in
89
seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in
62
seconds
* Ref time:
* Ref time:
32
3.65
user
78.07
system 1
5:01.63
elapsed 4
4
%CPU (0avgtext+0avgdata 77
252
maxresident)k
32
2.91
user
81.61
system 1
4:58.21
elapsed 4
5
%CPU (0avgtext+0avgdata 77
544
maxresident)k
143424
inputs+458
920
outputs (
454
major+194
44018
minor)pagefaults 0swaps
50792
inputs+458
048
outputs (
203
major+194
37060
minor)pagefaults 0swaps
* Quick time (-j 4):
* Quick time (-j 4):
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