balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Less stupid way to combine adjacent drops

Browse Source
This commit is contained in:
Tom Jack 2019-10-25 00:42:31 -05:00
parent 7c99affd4b
commit afbf2ba2db
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/passes/9-self_michelson/self_michelson.ml
View File

@ -372,20 +372,23 @@ let rec opt_tail_fail : michelson -> michelson =
Prim (l, p, List.map opt_tail_fail args, annot) Prim (l, p, List.map opt_tail_fail args, annot)
| x -> x | x -> x
let opt_combine_drops : peep2 = function let rec opt_combine_drops (x : michelson) : michelson =
(* DROP ; DROP ↦ DROP 2 *) let rec combine : michelson list -> michelson list = function
| Prim (_, I_DROP, [], _), Prim (_, I_DROP, [], _) -> | [] -> []
Some [i_dropn 2] | Prim (_, I_DROP, [], []) :: xs ->
(* DROP ; DROP m ↦ DROP 1+m *) let xs' = combine xs in
| Prim (_, I_DROP, [], _), Prim (_, I_DROP, [Int (_, m)], _) -> begin match xs' with
Some [i_dropn (1 + Z.to_int m)] | [] -> [Prim (-1, I_DROP, [], [])]
(* DROP n ; DROP ↦ DROP n+1 *) | Prim (_, I_DROP, [], []) :: xs' -> Prim (-1, I_DROP, [Int (-1, Z.of_int 2)], []) :: xs'
| Prim (_, I_DROP, [Int (_, n)], _), Prim (_, I_DROP, [], _) -> | Prim (_, I_DROP, [Int (_, n)], []) :: xs' -> Prim (-1, I_DROP, [Int (-1, Z.of_int (1 + Z.to_int n))], []) :: xs'
Some [i_dropn (Z.to_int n + 1)] | x' :: xs' -> Prim (-1, I_DROP, [], []) :: x' :: xs'
(* DROP n ; DROP m ↦ DROP n+m *) end
| Prim (_, I_DROP, [Int (_, n)], _), Prim (_, I_DROP, [Int (_, m)], _) -> | x :: xs -> x :: combine xs in
Some [i_dropn (Z.to_int n + Z.to_int m)] match x with
| _ -> None | Seq (l, args) -> Seq (l, combine (List.map opt_combine_drops args))
| Prim (l, p, args, annot) ->
Prim (l, p, List.map opt_combine_drops args, annot)
| x -> x
let optimize : michelson -> michelson = let optimize : michelson -> michelson =
fun x -> fun x ->
@ -400,5 +403,5 @@ let optimize : michelson -> michelson =
peephole @@ peep2 opt_swap2 ; peephole @@ peep2 opt_swap2 ;
] in ] in
let x = iterate_optimizer (sequence_optimizers optimizers) x in let x = iterate_optimizer (sequence_optimizers optimizers) x in
let x = iterate_optimizer (peephole @@ peep2 opt_combine_drops) x in let x = opt_combine_drops x in
x x