Skip to content
Snippets Groups Projects
Commit 1da499ba authored by erwan's avatar erwan
Browse files

Doc: homogeneisation of CLI help messages and minor fixes

parent 6079e0da
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
lv6-ref-man/lv6-ref-man.pdf
+ 0
− 0
View file @ 1da499ba
No preview for this file type
src/lv6MainArgs.ml
+ 23
− 23
View file @ 1da499ba
(* Time-stamp: <modified the 01/06/2018 (at 10:08) by Erwan Jahier> *)
(* Time-stamp: <modified the 29/07/2019 (at 10:09) by Erwan Jahier> *)
(*
Le manager d'argument adapt de celui de lutin, plus joli
N.B. solution un peu batarde : les options sont stockes, comme avant, dans Global,
......@@ -285,12 +285,12 @@ let mkoptab (opt:t) : unit = (
opt.exec <- true;
global_opt.expand_enums <- AsInt;
))
["interpret the program using RIF conventions for I/O (forces -eei)"]
["Interpret the program using RIF conventions for I/O (force -eei)"]
;
mkopt opt
["-2c";"--to-c"]
(Arg.Unit (fun _ -> set_c_options opt))
["generate C code"]
["Generate C code"]
;
mkopt opt ~doc_level:Basic
["-cc"; "--compile-generated-c"]
......@@ -305,16 +305,16 @@ let mkoptab (opt:t) : unit = (
mkopt opt
["-rif"]
(Arg.Unit(function s -> opt.rif <- true))
["behave as a rif input file (meaningless without -exec)"]
["Behave as a rif input file (meaningless without -exec)"]
;
mkopt opt ~doc_level:Advanced
["-ocaml"]
(Arg.Unit(function s -> opt.gen_ocaml <- true))
["generate ocaml glue code that makes it possible to call the lv6 interpreter ";
["Generate ocaml glue code that makes it possible to call the lv6 interpreter ";
"from ocaml with the current set of arguments (with Lv6Run.make)"]
;
mkopt opt ~doc_level:Advanced
mkopt opt ~doc_level:Dev
["-knc"; "--keep-nested-calls"]
(Arg.Unit (fun _ -> global_opt.one_op_per_equation <- false))
["Keep nested calls (inhibited by -en). By default, only one node ";
......@@ -339,17 +339,17 @@ let mkoptab (opt:t) : unit = (
mkopt opt ~doc_level:Advanced
["-ee"; "--expand-enums"]
(Arg.Unit (fun _ -> global_opt.expand_enums <- AsConst))
[" Translate enums using extern types and consts"]
["Translate enums using extern types and consts"]
;
mkopt opt ~doc_level:Advanced
["-eei"; "--expand-enums-as-int"]
(Arg.Unit (fun _ -> global_opt.expand_enums <- AsInt))
[" Translate enums into integers (to be kind with data plotters)"]
["Translate enums into integers (to be kind with data plotters)"]
;
mkopt opt ~doc_level:Dev
["-eeb"; "--expand-enums-as-bool"]
(Arg.Unit (fun _ -> global_opt.expand_enums <- AsBool))
[" Translate enums into boolean arrays (to be kind with model-checkers)"]
["Translate enums into boolean arrays (to be kind with model-checkers)"]
;
mkopt opt ~doc_level:Advanced
["-esa"; "--expand-structs-and-arrays"]
......@@ -357,7 +357,7 @@ let mkoptab (opt:t) : unit = (
opt.expand_arrays <- true;
opt.expand_nodes <- true;
opt.inline_iterator <- true))
["Expand structures and arrays (forces '-ei' and '-en')"]
["Expand structures and arrays (force '-ei' and '-en')"]
;
mkopt opt ~doc_level:Advanced
["-en"; "--expand-nodes"]
......@@ -387,7 +387,7 @@ let mkoptab (opt:t) : unit = (
mkopt opt ~doc_level:Advanced
["-lv4"; "--lustre-v4"]
(Arg.Unit (fun _ -> set_v4_options opt))
["deprecated: generate Lustre V4 code (automatically impose '-ei -ee -esa')"]
["deprecated: generate Lustre V4 code (force '-ei -ee -esa')"]
;
mkopt opt ~doc_level:Dev
["-kcg"; "--generate-scade-lustre"]
......@@ -395,12 +395,12 @@ let mkoptab (opt:t) : unit = (
(* opt.expand_arrays <- true; for problem of "#"; XXX remove me ! *)
global_opt.kcg <- true
))
[" Generate Lustre code that is compatible with the lustre of scade"]
["Generate Lustre code that is compatible with the lustre of scade"]
;
mkopt opt
["-ec"; "--expanded-code"]
(Arg.Unit (fun _ -> set_ec_options opt))
["Generate ec programs (set the following options: '--expand-nodes --no-when-not --expand-enums-as-bool --lustre-v4 --no-prefix')"]
["Generate ec programs (force '--expand-nodes --no-when-not --expand-enums-as-bool --lustre-v4 --no-prefix')"]
;
mkopt opt ~doc_level:Advanced
["-np"; "--no-prefix"]
......@@ -411,12 +411,12 @@ let mkoptab (opt:t) : unit = (
["-2cdil";"--to-c-dont-inline-predef"]
(Arg.Unit (fun _ ->
global_opt.gen_c_inline_predef <- false))
["do not inline predef calls when generating C code"]
["Do not inline predef calls when generating C code"]
;
mkopt opt ~doc_level:Advanced
["-2cil";"--2c-inline-loop"]
(Arg.Unit (fun i -> global_opt.soc2c_inline_loops <- true; set_c_options opt))
["inline loops (that come from array iterators)"]
["Inline loops (that come from array iterators)"]
;
mkopt opt ~doc_level:Advanced
["-2csf";"--2c-several-files"]
......@@ -426,7 +426,7 @@ let mkoptab (opt:t) : unit = (
mkopt opt ~doc_level:Advanced
["-2cgc";"--2c-global-ctx"]
(Arg.Unit (fun i -> global_opt.soc2c_global_ctx <- true; set_c_options opt))
["node context allocated as global variable (no \"new_ctx\" method)"]
["Node context allocated as global variable (no \"new_ctx\" method)"]
;
mkopt opt ~doc_level:Advanced
["-lic";"--gen-lic"]
......@@ -491,39 +491,39 @@ let mkoptab (opt:t) : unit = (
global_opt.gen_wcet <- true;
global_opt.soc2c_no_switch <-true;
global_opt.soc2c_global_ctx <- true))
["generates a main file for computing the wcet (force -2c -2cgc)"]
["Generate a main file for computing the wcet (force -2c -2cgc)"]
;
mkopt opt ~doc_level:Dev
["-2cs";"--2c-stack"]
(Arg.Unit (fun i -> set_c_options opt; global_opt.io_transmit_mode <- Stack))
["Soc I/O are transmitted as params of the step functions (force -2c)"]
["Transmit Soc I/O as params of the step functions (force -2c)"]
;
mkopt opt ~doc_level:Dev
["-2ch";"--2c-heap"]
(Arg.Unit (fun i -> set_c_options opt; global_opt.io_transmit_mode <- Heap))
["Soc I/O are transmitted via a ctx structure in the heap (force -2c)"]
["Transmit Soc I/O via a ctx structure in the heap (force -2c)"]
;
mkopt opt ~doc_level:Dev
["-2chs";"--2c-heap-and-stack"]
(Arg.Unit (fun i -> set_c_options opt; global_opt.io_transmit_mode <- HeapStack))
["I/O of memoryless soc are transmitted via the stack, and the heap otherwise (force -2c)"]
["Transmit soc memoryless I/O via the stack, and the heap otherwise (force -2c)"]
;
mkopt opt ~doc_level:Dev
["--schedule-simple"]
(Arg.Unit (fun i -> global_opt.schedul_mode <- Simple))
["no re-ordering after topological sort"]
["No re-ordering after topological sort"]
;
mkopt opt ~doc_level:Dev
["--schedule-sort"]
(Arg.Unit (fun i -> global_opt.schedul_mode <- Sort))
["sort wrt guard before after topological sort"]
["Sort wrt guard before after topological sort"]
;
mkopt opt ~doc_level:Dev
["--schedule-reorder"]
(Arg.Unit (fun i -> global_opt.schedul_mode <- Reorder))
["re-order Soc.gao after scheduling to increase the clock factorisation"]
["Re-order Soc.gao after scheduling to increase the clock factorisation"]
;
mkopt opt ~doc_level:Advanced
......
src/lv6parser.mly
+ 1
− 1
View file @ 1da499ba
......@@ -942,7 +942,7 @@ PredefOp: /* ebnf:print=short */
/* Appel fonctionnel par position (classique) */
/* NB
On a 2 rgles cause des appels chantillonn
 
*/
CallByPosExpression:
/*
......
test/lus2lic.sum
+ 196
− 196
View file @ 1da499ba
This diff is collapsed.
test/should_work/test_map_env.lut deleted 100644 → 0
+ 0
− 16
View file @ 6079e0da
(* This file was generated by lus2lic version master.716 (7654ff44fd22fa505ddd7580a9f4c8f9d5dececf). *)
(* lus2lic test_map.lus -n test_map --gen-autotest *)
(* on ovaz the 11/09/2017 at 08:21:18 *)
node test_map_env(o_0:real;o_1:real;o_2:real;o_3:real) returns(x_0: real [-10000.0;10000.0];x_1: real [-10000.0;10000.0];x_2: real [-10000.0;10000.0];x_3: real [-10000.0;10000.0];y_0: real [-10000.0;10000.0];y_1: real [-10000.0;10000.0];y_2: real [-10000.0;10000.0];y_3: real [-10000.0;10000.0]) =
{
x_0 = 1.0 and
x_1 = 2.0 and
x_2 = 3.0 and
x_3 = 4.0 and
y_0 = 11.0 and
y_1 = 12.0 and
y_2 = 13.0 and
y_3 = 14.0
}
fby loop true
utils/compare_exec_and_2c
+ 1
− 1
View file @ 1da499ba
......@@ -52,7 +52,7 @@ if
lurette -l 10 -o xxx.rif \
-sut "./$node.exec" \
-env "lutin $env -n $env_node -p $PRECISION -seed 42" \
-oracle "lus2lic $_oracle -n $oracle $OPT";
-oracle "./lus2lic $_oracle -n $oracle $OPT";
# lurettetop_exe -p $PRECISION -rp "sut:socket:127.0.0.1:$PORT" -rp "env:lutin:$env:-p:$PRECISION" -rp "oracle:v6:$_oracle:$oracle:$OPT" \
# -go -l 10 -ns2c --stop-on-oracle-error;
then
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment