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

Optimize matching on single constructors datatypes

Browse Source
This commit is contained in:
Ulf Norell 2019-04-25 13:23:11 +02:00
parent 6806554d77
commit 960ffb383f
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/aeso_fcode_to_fate.erl
View File

@ -248,9 +248,19 @@ split_to_scode(Env, {split, {variant, Cons}, X, Alts}) ->
[Code, split_to_scode(Env1, S)] [Code, split_to_scode(Env1, S)]
end end
end, end,
SType = {variant, [length(Args) || Args <- Cons]}, SType = {variant, [length(Args) || Args <- Cons]},
[aeb_fate_code:push(Arg), case {[GetAlt(I) || I <- lists:seq(0, length(Cons) - 1)], Def} of
{switch, SType, [GetAlt(I) || I <- lists:seq(0, length(Cons) - 1)], Def}]; %% Skip the switch for single constructor datatypes (with no catchall)
{[SAlt], missing} when SAlt /= missing -> SAlt;
{[SAlt], _} ->
%% Single-case switches are not compiled to a SWITCH instruction, so
%% we don't need to push the argument. See [SINGLE_CON_SWITCH]
%% below. We need the scode switch to keep track of the default
%% case though.
[{switch, SType, [SAlt], Def}];
{SAlts, _} ->
[aeb_fate_code:push(Arg), {switch, SType, SAlts, Def}]
end;
split_to_scode(_, Split = {split, _, _, _}) -> split_to_scode(_, Split = {split, _, _, _}) ->
?TODO({'case', Split}). ?TODO({'case', Split}).
@ -881,6 +891,11 @@ block(Blk = #blk{code = [{switch, Type, Alts, Default} | Code],
tuple -> tuple ->
[TCode] = Alts, [TCode] = Alts,
{Blk#blk{code = TCode ++ [{jump, RestRef}]}, [], []}; {Blk#blk{code = TCode ++ [{jump, RestRef}]}, [], []};
{variant, [_]} ->
%% [SINGLE_CON_SWITCH] Single constructor switches don't need a
%% switch instruction.
[AltCode] = Alts,
{Blk#blk{code = AltCode ++ [{jump, RestRef}]}, [], []};
{variant, _Ar} -> {variant, _Ar} ->
MkBlk = fun(missing) -> {DefRef, []}; MkBlk = fun(missing) -> {DefRef, []};
(ACode) -> FreshBlk(ACode ++ [{jump, RestRef}], DefRef) (ACode) -> FreshBlk(ACode ++ [{jump, RestRef}], DefRef)