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

Jump to bottom

Restore Cmm unboxing behaviour inside regions #1285

Merged
merged 3 commits into from
Apr 4, 2023
Merged

Restore Cmm unboxing behaviour inside regions #1285

merged 3 commits into from
Apr 4, 2023

Conversation

stedolan
Copy link
Contributor

@stedolan stedolan commented Apr 4, 2023

PR #1284 fixed a Cmm unboxing bug, in which Cmmgen would generate invalid Cmm by pushing unboxing operations inside Cregion, potentially moving tail calls out of tail position.

However, the fix was overly broad, making Cmm unboxing weaker in a way that broke some tests. So, this patch restores the Cmm unboxing in cases where it is safe to push the unboxing into a region (i.e. when there are no tail calls to disrupt).

(A more advanced implementation might convert the tail calls to use the Ctail constructor, but that doesn't seem to be necessary in the cases of interest)

@stedolan stedolan force-pushed the restore-cmm-float-unboxing-in-regions branch from a3679f4 to adaa176 Compare April 4, 2023 13:13
@mshinwell
Copy link
Collaborator

Two Ctail cases to add as discussed with @stedolan offline

@mshinwell mshinwell merged commit 3023aa1 into ocaml-flambda:main Apr 4, 2023
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Apr 4, 2023
@ccasin
Squashed 'ocaml/' changes from ea89813..1686928
23164ba 
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: 1686928
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Apr 17, 2023
@ccasin
Squashed 'ocaml/' changes from ea89813..1686928
a7abece 
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: 1686928
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Apr 26, 2023
@ccasin
Squashed 'ocaml/' changes from ea89813..1686928
74d3a31 
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: 1686928
ccasin added a commit to ccasin/flambda-backend that referenced this pull request Apr 27, 2023
@ccasin
Squashed 'ocaml/' changes from ea89813..1686928
c4bc96c 
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: 1686928
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Apr 28, 2023
@mshinwell
Squashed 'ocaml/' changes from ea89813..a7d005a
4d0fa29 
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
@ccasin
Squashed 'ocaml/' changes from ea89813..a7d005a
35bb136 
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
Reviewers

@mshinwell mshinwell mshinwell approved these changes

@gretay-js gretay-js Awaiting requested review from gretay-js

@xclerc xclerc Awaiting requested review from xclerc

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@stedolan @mshinwell