Skip to content

Cmm.value_kind cleanup #1091

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.

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

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Conversation

Ekdohibs
Copy link
Contributor

Currently, Cmm.value_kind is used only for unboxing code, when creating the Cmm. Besides, it adds a lot of information which is redundant (with the machtype) and sometimes simply incorrect (when it puts Vval Pgenval as a default value).
This is a first possibility for removing it without sacrificing optimisations, by replacing it with a simpler type that either says we have a value with Lambda.value_kind, or that it can be anything.
However, I still do not like this idea of having these value_kind nodes everywhere in the AST while they are used only for building the Cmm and never after. Another option would be to change the code building the Cmm to keep the information about unboxing, but it might be a far larger change.
Perhaps the simplest option would be to revert #295, but instead add kind annotations on Flambda lets (which are increasingly needed due to the layouts changes), and get unboxing to work as with closure.

@mshinwell mshinwell changed the title [Discussion] Removing Cmm.value_kind Cmm.value_kind cleanup Feb 7, 2023
Copy link
Contributor

@Gbury Gbury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. Just need some more comments (either in the .ml and/or the .mli) to clear any doubt a ready might have.

@Ekdohibs Ekdohibs force-pushed the cmm-value-kind branch 2 times, most recently from 2485669 to 4edf4ad Compare April 4, 2023 12:00
@Ekdohibs
Copy link
Contributor Author

Ekdohibs commented Apr 4, 2023

Note: there are very slight semantics changes, such as in this case:

type 'a t = A : float t | B : int t
let  f x =
  let[@local] aux (type a) (x : a t) : a =
    match x with
    | A -> 0.
    | B -> if opaque false then raise Exit else failwith ""
  in
  let y = aux x in
  t x +. 1.

Now, y is unboxed where it was not previously, because in the B case, we detect it is No_result, whereas it immediately returned No_unboxing before when encountering the if having a return type of int.

@mshinwell mshinwell merged commit 6fbe831 into ocaml-flambda:main Apr 12, 2023
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Apr 28, 2023
a7d005a flambda-backend: Lazy deserialization of cmi files (ocaml-flambda#1322)
aa83fa3 flambda-backend: Reinstate previous API for Env.lookup_value (ocaml-flambda#1323)
e4007a4 flambda-backend: Lazy substitution into value_declaration (ocaml-flambda#1320)
634b607 flambda-backend: Merge Types.* and Subst.Lazy.* types (ocaml-flambda#1312)
cf82708 flambda-backend: Bump magic numbers for 4.14.1-7 (ocaml-flambda#1317)
6470400 flambda-backend: zero_alloc attribute payload "assert all" and "ignore" (ocaml-flambda#1296)
bba5248 flambda-backend: Teach `ocamldep` about all the language extensions (ocaml-flambda#1303)
33e97b0 flambda-backend: Change Includemod to work on lazy modtypes (ocaml-flambda#1228)
16e5002 flambda-backend: zero_alloc new warning for unchecked functions (ocaml-flambda#1302)
36b4626 flambda-backend: Attribute [@@@zero_alloc check] to turn the check on (ocaml-flambda#1294)
3b524c6 flambda-backend: Cmm.value_kind cleanup (ocaml-flambda#1091)
ec99505 flambda-backend: Fix failure of `check_all_arches` on RISCV (ocaml-flambda#1300)
450bc58 flambda-backend: Backend changes for multiple returns (ocaml-flambda#1268)
84a7a26 flambda-backend: Static check for zero_alloc: ignore allocation that lead to exceptional return (ocaml-flambda#1157)
1723728 flambda-backend: Re-enable parallel build of the runtime (ocaml-flambda#1287)
26ea7f3 flambda-backend: Fix closure marshalling when not in NNP mode (ocaml-flambda#1286)
9b91f2e flambda-backend: Reduce number of caml_apply functions taking/returning "I" and "V" (ocaml-flambda#1272)
1686928 flambda-backend: Restore Cmm unboxing behaviour inside regions (ocaml-flambda#1285)
cf9be42 flambda-backend: Fix all the no-naked-pointers problems (ocaml-flambda#1282)
8fe089e flambda-backend: Unrevert ocaml-flambda#1131 and fix a Cmm unboxing bug (ocaml-flambda#1284)
c4143c3 flambda-backend: Revert "Make Selectgen treat region boundaries more precisely" (ocaml-flambda#1283)
2078dce flambda-backend: Add some -dtimings output for the typechecker (ocaml-flambda#1245)
273a7f9 flambda-backend: Make Selectgen treat region boundaries more precisely (ocaml-flambda#1131)
47610e6 flambda-backend: Bump magic numbers for 4.14.1-6 (ocaml-flambda#1274)
fd53d38 flambda-backend: Generate *.cms files for merlin (ocaml-flambda#1232)
853f95f flambda-backend: Add tail_mod_const to builtin_attrs (ocaml-flambda#1265)
f9ef051 flambda-backend: Fix issue caused by effects of gadt expansion in mode cross check (ocaml-flambda#1263)
e9ffcf8 flambda-backend: Fix dependencies for regenerating Flambda2 parser, tests (ocaml-flambda#1255)
6f1cd1f flambda-backend: Restore a lost location, needed for merlin (ocaml-flambda#1242)
009332b flambda-backend: Fix merge from ocaml-jst

git-subtree-dir: ocaml
git-subtree-split: a7d005a
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Apr 29, 2023
a7d005a flambda-backend: Lazy deserialization of cmi files (ocaml-flambda#1322)
aa83fa3 flambda-backend: Reinstate previous API for Env.lookup_value (ocaml-flambda#1323)
e4007a4 flambda-backend: Lazy substitution into value_declaration (ocaml-flambda#1320)
634b607 flambda-backend: Merge Types.* and Subst.Lazy.* types (ocaml-flambda#1312)
cf82708 flambda-backend: Bump magic numbers for 4.14.1-7 (ocaml-flambda#1317)
6470400 flambda-backend: zero_alloc attribute payload "assert all" and "ignore" (ocaml-flambda#1296)
bba5248 flambda-backend: Teach `ocamldep` about all the language extensions (ocaml-flambda#1303)
33e97b0 flambda-backend: Change Includemod to work on lazy modtypes (ocaml-flambda#1228)
16e5002 flambda-backend: zero_alloc new warning for unchecked functions (ocaml-flambda#1302)
36b4626 flambda-backend: Attribute [@@@zero_alloc check] to turn the check on (ocaml-flambda#1294)
3b524c6 flambda-backend: Cmm.value_kind cleanup (ocaml-flambda#1091)
ec99505 flambda-backend: Fix failure of `check_all_arches` on RISCV (ocaml-flambda#1300)
450bc58 flambda-backend: Backend changes for multiple returns (ocaml-flambda#1268)
84a7a26 flambda-backend: Static check for zero_alloc: ignore allocation that lead to exceptional return (ocaml-flambda#1157)
1723728 flambda-backend: Re-enable parallel build of the runtime (ocaml-flambda#1287)
26ea7f3 flambda-backend: Fix closure marshalling when not in NNP mode (ocaml-flambda#1286)
9b91f2e flambda-backend: Reduce number of caml_apply functions taking/returning "I" and "V" (ocaml-flambda#1272)
1686928 flambda-backend: Restore Cmm unboxing behaviour inside regions (ocaml-flambda#1285)
cf9be42 flambda-backend: Fix all the no-naked-pointers problems (ocaml-flambda#1282)
8fe089e flambda-backend: Unrevert ocaml-flambda#1131 and fix a Cmm unboxing bug (ocaml-flambda#1284)
c4143c3 flambda-backend: Revert "Make Selectgen treat region boundaries more precisely" (ocaml-flambda#1283)
2078dce flambda-backend: Add some -dtimings output for the typechecker (ocaml-flambda#1245)
273a7f9 flambda-backend: Make Selectgen treat region boundaries more precisely (ocaml-flambda#1131)
47610e6 flambda-backend: Bump magic numbers for 4.14.1-6 (ocaml-flambda#1274)
fd53d38 flambda-backend: Generate *.cms files for merlin (ocaml-flambda#1232)
853f95f flambda-backend: Add tail_mod_const to builtin_attrs (ocaml-flambda#1265)
f9ef051 flambda-backend: Fix issue caused by effects of gadt expansion in mode cross check (ocaml-flambda#1263)
e9ffcf8 flambda-backend: Fix dependencies for regenerating Flambda2 parser, tests (ocaml-flambda#1255)
6f1cd1f flambda-backend: Restore a lost location, needed for merlin (ocaml-flambda#1242)
009332b flambda-backend: Fix merge from ocaml-jst

git-subtree-dir: ocaml
git-subtree-split: a7d005a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants