QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Reannotate and repeat optimization pass once it done

Browse Source 
Could try hard to keep annotations more precise, but would be more error prone
This commit is contained in:
Ulf Norell 2019-04-02 21:39:17 +02:00
parent 41387ce0b1
commit 4b6191aa25
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/aeso_fcode_to_fate.erl
View File

@ -190,13 +190,21 @@ flatten_s(I) -> I.
optimize_fun(_Funs, Name, {{Args, Res}, Code}, Options) -> optimize_fun(_Funs, Name, {{Args, Res}, Code}, Options) ->
Code0 = flatten(Code), Code0 = flatten(Code),
debug(opt, Options, "Optimizing ~s\n", [Name]), debug(opt, Options, "Optimizing ~s\n", [Name]),
ACode = annotate_code(Code0), Code1 = simpl_loop(Code0, Options),
debug(opt, Options, " original:\n~s\n", [pp_ann(" ", ACode)]),
Code1 = simplify(ACode, Options),
debug(opt, Options, " optimized:\n~s\n", [pp_ann(" ", Code1)]),
Code2 = desugar(Code1), Code2 = desugar(Code1),
{{Args, Res}, Code2}. {{Args, Res}, Code2}.
simpl_loop(Code, Options) ->
ACode = annotate_code(Code),
debug(opt, Options, " annotated:\n~s\n", [pp_ann(" ", ACode)]),
Code1 = simplify(ACode, Options),
[ debug(opt, Options, " optimized:\n~s\n", [pp_ann(" ", Code1)]) || Code1 /= ACode ],
Code2 = unannotate(Code1),
case Code == Code2 of
true -> Code2;
false -> simpl_loop(Code2, Options)
end.
pp_ann(Ind, [{ifte, Then, Else} | Code]) -> pp_ann(Ind, [{ifte, Then, Else} | Code]) ->
[Ind, "IF-THEN\n", [Ind, "IF-THEN\n",
pp_ann(" " ++ Ind, Then), pp_ann(" " ++ Ind, Then),
@ -548,12 +556,18 @@ r_write_to_dead_var(_, _) -> false.
%% Desugar and specialize and remove annotations %% Desugar and specialize and remove annotations
desugar({_Ann, {'ADD', ?a, ?i(1), ?a}}) -> [aeb_fate_code:inc()]; unannotate({ifte, Then, Else}) -> [{ifte, unannotate(Then), unannotate(Else)}];
desugar({_Ann, {'SUB', ?a, ?a, ?i(1)}}) -> [aeb_fate_code:dec()]; unannotate(Code) when is_list(Code) ->
lists:flatmap(fun unannotate/1, Code);
unannotate({_Ann, I}) -> [I].
%% Desugar and specialize and remove annotations
desugar({'ADD', ?a, ?i(1), ?a}) -> [aeb_fate_code:inc()];
desugar({'SUB', ?a, ?a, ?i(1)}) -> [aeb_fate_code:dec()];
desugar({ifte, Then, Else}) -> [{ifte, desugar(Then), desugar(Else)}]; desugar({ifte, Then, Else}) -> [{ifte, desugar(Then), desugar(Else)}];
desugar(Code) when is_list(Code) -> desugar(Code) when is_list(Code) ->
lists:flatmap(fun desugar/1, Code); lists:flatmap(fun desugar/1, Code);
desugar({_Ann, I}) -> [I]. desugar(I) -> [I].
%% -- Phase III -------------------------------------------------------------- %% -- Phase III --------------------------------------------------------------
%% Constructing basic blocks %% Constructing basic blocks