Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSE review: small fixes #719

Merged
merged 1 commit into from
Jul 11, 2022
Merged

CSE review: small fixes #719

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
CSE review: small fixes
  • Loading branch information
@lthls
lthls committed Jul 8, 2022
commit a6405788a354bbbf6e3e64d9899f740f05075e87
19 changes: 10 additions & 9 deletions middle_end/flambda2/simplify/common_subexpression_elimination.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ let add t prim ~bound_to scope =
{ by_scope; combined }
| _bound_to -> t

let find t prim =
match EP.Map.find prim t.combined with
| exception Not_found -> None
| bound_to -> Some bound_to
let find t prim = EP.Map.find_opt prim t.combined

module Rhs_kind : sig
type t =
Expand Down Expand Up @@ -238,7 +235,10 @@ let join_one_cse_equation ~cse_at_each_use prim bound_to_map
(* For the primitives Is_int and Get_tag, they're strongly linked to
their argument: additional information on the cse parameter should
translate into additional information on the argument. This can be
done by giving them the appropriate type. *)
done by giving them the appropriate type. The same could be done for
a lot of the other non-arithmetic primitives, but in the other cases
the join of the types will usually give us the relevant equation
anyway. *)
match[@ocaml.warning "-fragile-match"] EP.to_primitive prim with
| Unary (Is_int, scrutinee) ->
Name.Map.add (Name.var var)
Expand Down Expand Up @@ -368,16 +368,17 @@ let join0 ~typing_env_at_fork ~cse_at_fork ~cse_at_each_use ~params
let join ~typing_env_at_fork ~cse_at_fork ~use_info ~get_typing_env
~get_rewrite_id ~get_cse ~params =
let scope_at_fork = TE.current_scope typing_env_at_fork in
let seen_equations = ref false in
let no_equations = ref false in
let cse_at_each_use =
List.map use_info ~f:(fun use ->
let t = get_cse use in
let cse_between_fork_and_use = cut_cse_environment t ~scope_at_fork in
if not (EP.Map.is_empty cse_between_fork_and_use)
then seen_equations := true;
(* If one branch doesn't have any equations, then the join is going to
be empty *)
if EP.Map.is_empty cse_between_fork_and_use then no_equations := true;
get_typing_env use, get_rewrite_id use, cse_between_fork_and_use)
in
if not !seen_equations
if !no_equations
then None
else
join0 ~typing_env_at_fork ~cse_at_fork ~cse_at_each_use ~params
Expand Down