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

Backport the main safepoints PRs #740

Merged
merged 14 commits into from
Oct 17, 2022
Merged

Backport the main safepoints PRs #740

merged 14 commits into from
Oct 17, 2022
+941 −77

Conversation

mshinwell
Copy link
Collaborator

This includes the main safepoints PR ocaml/ocaml#10404 plus the fixes from ocaml/ocaml#10498 (except the first part which is in #737 ) and ocaml/ocaml#10523.

I have provided an implementation of the Ipoll instruction in Cfg.

This PR does not include a backport of the [@poll error] attribute (ocaml/ocaml#10462) which involves threading a new flag through the middle end. I will work on this one next.

We will then need one or more attributes to selectively disable poll insertion for critical code.

As discussed these changes have not been applied to ocaml/asmcomp/ as those will be picked up when ocaml-jst is rebased to 4.14 soon.

This shouldn't be merged until we've finished #194 and also agreed on exactly how safepoints will be enabled/disabled for testing etc. (@lpw25 and I were discussing using a -extension flag but @stedolan was less keen on this.)

@mshinwell
Copy link
Collaborator Author

I forgot to say that this should be read commit by commit.

@mshinwell
Copy link
Collaborator Author

Additionally the strategy for having flambda2 work correctly with safepoints is described here: #213 (the change to liveness analysis etc. is included in this PR).

@mshinwell mshinwell marked this pull request as draft July 20, 2022 16:20
@mshinwell mshinwell force-pushed the port-safepoints branch 6 times, most recently from 3281623 to 8b55cf0 Compare July 22, 2022 16:00
@mshinwell mshinwell marked this pull request as ready for review July 22, 2022 16:15
@mshinwell
Copy link
Collaborator Author

This is ready for review but is not to be merged yet.

@mshinwell mshinwell mentioned this pull request Jul 25, 2022
Merged
xclerc
xclerc reviewed Jul 28, 2022
View reviewed changes
backend/cfg/cfg.ml Outdated Show resolved Hide resolved
backend/cfg/cfg_equivalence.ml Show resolved Hide resolved
backend/cfg/simplify_terminator.ml Show resolved Hide resolved
xclerc
xclerc reviewed Oct 12, 2022
View reviewed changes
backend/amd64/proc.ml Outdated Show resolved Hide resolved
xclerc
xclerc approved these changes Oct 12, 2022
View reviewed changes
Copy link
Contributor

@xclerc xclerc left a comment

Choose a reason for hiding this comment

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

We should discuss/address the comments
in the proc.ml files, but otherwise it seems
to be good to merge.

xclerc
xclerc reviewed Oct 14, 2022
View reviewed changes
backend/cfg/cfg.ml Outdated Show resolved Hide resolved
mshinwell and others added 5 commits October 17, 2022 09:53
@mshinwell
Cfg_equivalence missing case
3486686
@mshinwell
Code review fixes
956151c
@mshinwell
Checkmach change for Ipoll
014200d
@mshinwell @xclerc
Update backend/cfg/cfg.ml
1c9e7cf 
Co-authored-by: Xavier Clerc <xclerc@users.noreply.github.com>
@mshinwell @xclerc
Update backend/cfg/simplify_terminator.ml
36a0db5 
Co-authored-by: Xavier Clerc <xclerc@users.noreply.github.com>
gretay-js
gretay-js reviewed Oct 17, 2022
View reviewed changes
backend/asmgen.ml Outdated Show resolved Hide resolved
@gretay-js
Copy link
Contributor

This includes the main safepoints PR ocaml/ocaml#10404

It was probably supposed to be
ocaml/ocaml#10039

@gretay-js
Copy link
Contributor

I think 740f399 needs to be reverted: it causes CI failures, because Linear_from_cfg can be called after Linearize optimized Ipoll None followed by a jump to return_label into a Ipoll (Some return_label), so the successor of Ipoll need not always have a label in Linear representation.

@gretay-js
Copy link
Contributor

CI fix is in mshinwell#20

@mshinwell mshinwell merged commit 644ccab into ocaml-flambda:main Oct 17, 2022
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Dec 13, 2022
@mshinwell
Squashed 'ocaml/' changes from 5bf2820..06c189a
76de3ce 
06c189a flambda-backend: Make stack allocation the default (ocaml-flambda#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970)
8fb75bd flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943)
5f51f21 flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918)
6423d5e flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml-flambda#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml-flambda#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896)
7565915 flambda-backend: [@poll error] attribute (ocaml-flambda#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892)

git-subtree-dir: ocaml
git-subtree-split: 06c189a
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Dec 13, 2022
@mshinwell
Squashed 'ocaml/' changes from 5bf2820..06c189a
b273eee 
06c189a flambda-backend: Make stack allocation the default (ocaml-flambda#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970)
8fb75bd flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943)
5f51f21 flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918)
6423d5e flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml-flambda#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml-flambda#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896)
7565915 flambda-backend: [@poll error] attribute (ocaml-flambda#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892)

git-subtree-dir: ocaml
git-subtree-split: 06c189a
mshinwell added a commit to mshinwell/flambda-backend that referenced this pull request Dec 28, 2022
@mshinwell
Squashed 'ocaml/' changes from 5bf2820..b11eea1
f97a773 
b11eea1 flambda-backend: Introduce Import_info (ocaml-flambda#1036)
bc5b135 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml-flambda#1029)
c8babbd flambda-backend: Compilation_unit optimisations (ocaml-flambda#1035)
e8d3e22 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml-flambda#1030)
eb14a86 flambda-backend: Port PR81 from ocaml-jst (ocaml-flambda#1024)
131bc12 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml-flambda#1022)
06c189a flambda-backend: Make stack allocation the default (ocaml-flambda#1013)
98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946)
deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938)
d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967)
0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012)
27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997)
724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871)
396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983)
b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980)
7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970)
8fb75bd flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965)
fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948)
9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943)
5f51f21 flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade
841687d flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936)
72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff)
6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream
c86bf6e flambda-backend: Remove duplicate tests for polling
971dbeb flambda-backend: Testsuite fixes
32f8356 flambda-backend: Topeval fix for symbols patch
befea01 flambda-backend: Compilation fixes / rectify merge faults
a84543f flambda-backend: Merge ocaml-jst
8e65056 flambda-backend: Merge ocaml-jst
4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920)
5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918)
6423d5e flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24
ead605c flambda-backend: Add a missing Extract_exception (ocaml-flambda#916)
c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes
cf4d0d3 flambda-backend: Merge fixes (#21)
c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881)
3d38d13 flambda-backend: Long frames in frametable (ocaml-flambda#797)
85aec7b flambda-backend: Add loop attribute to Builtin_attributes
c0f16e3 flambda-backend: Compilation fixes
90dea23 flambda-backend: Merge flambda-backend/main
5acc6ea flambda-backend: Fixes after merge
e501946 flambda-backend: Merge ocaml-jst
115083b flambda-backend: Merge ocaml-jst
9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909)
ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902)
e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"
853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)
5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898)
7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889)
3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896)
7565915 flambda-backend: [@poll error] attribute (ocaml-flambda#745)
9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740)
689bdda flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892)

git-subtree-dir: ocaml
git-subtree-split: b11eea1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xclerc xclerc xclerc approved these changes

@gretay-js gretay-js gretay-js left review comments

@stedolan stedolan Awaiting requested review from stedolan

Assignees
No one assigned
Labels
4.13/4.14 merge Backports of 4.13 and 4.14 changes backend backport from upstream OCaml
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mshinwell @gretay-js @xclerc