-
Notifications
You must be signed in to change notification settings - Fork 76
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
Transform tail-recursive functions into recursive continuations #893
Conversation
When this is finalised, a short description in a Github comment on this PR would be useful, so we can communicate to users exactly when this transformation will take effect. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All seems good (modulo a few comments here and there). There's one thing that I wonder about: how hard would it be, when simplifying an apply_expr
, to make the decision to loopify a particular call after the decision of whether to inline/unroll the call ?
773339f
to
3debab7
Compare
3debab7
to
77fd60f
Compare
Rebased for the conflict with poll attributes. |
77fd60f
to
e2545ad
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Gbury reviewed the core algorithm in simplify/
; the rest looks fine.
…tinuations (ocaml-flambda#893)"" This reverts commit 41454a0.
… inside the handler of a recursive continuation (#905) * Revert "Revert "Transform tail-recursive functions into recursive continuations (#893)"" This reverts commit 41454a0. * Increase occurrence counts within recursive continuation handlers * Set inner continuations uses of let rec to non-inlinable * Remove freshening of params inside recursive handler Co-authored-by: Vincent Laviron <vincent.laviron@gmail.com>
…tinuations (ocaml-flambda#893)"" This reverts commit 41454a0.
06c189a4c5 flambda-backend: Make stack allocation the default (ocaml-flambda#1013) 98debd51d5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946) deb1714de3 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938) d07fce15aa flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967) 0f1ce0eeab flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012) 27132d8005 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997) 724fb68074 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871) 396d5b8837 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983) b73ab126cf flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980) 7c7d75a6b1 flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970) 8fb75bd345 flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965) fdb79872c6 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948) 9745cdb28a flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943) 5f51f2124f flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade 841687d523 flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936) 72a7658a4b flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff) 6d758cd63c flambda-backend: Revert whitespace changes in dune files, to match upstream c86bf6e035 flambda-backend: Remove duplicate tests for polling 971dbeb55b flambda-backend: Testsuite fixes 32f835689b flambda-backend: Topeval fix for symbols patch befea0169e flambda-backend: Compilation fixes / rectify merge faults a84543f6a6 flambda-backend: Merge ocaml-jst 8e65056085 flambda-backend: Merge ocaml-jst 4d70045a5e flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920) 5e57b7d80d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918) 6423d5e8ce flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24 ead605caf3 flambda-backend: Add a missing Extract_exception (ocaml-flambda#916) c8f1481246 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes cf4d0d34a8 flambda-backend: Merge fixes (#21) c2f742fca7 flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881) 3d38d13bea flambda-backend: Long frames in frametable (ocaml-flambda#797) 85aec7bb78 flambda-backend: Add loop attribute to Builtin_attributes c0f16e325b flambda-backend: Compilation fixes 90dea23141 flambda-backend: Merge flambda-backend/main 5acc6eaf90 flambda-backend: Fixes after merge e5019466b5 flambda-backend: Merge ocaml-jst 115083b765 flambda-backend: Merge ocaml-jst 9943b2ecc2 flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909) ce339f19f5 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902) e6a317c866 flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)" 853c4884fd flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893) 5a977e4483 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898) 7fa7f9dd96 flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889) 3cd36f0058 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896) 75659153a1 flambda-backend: [@poll error] attribute (ocaml-flambda#745) 9eb9448e6d flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740) 689bddabd9 flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892) git-subtree-dir: ocaml git-subtree-split: 06c189a4c5505be62c8c658eee186a7aa6ba4c68
06c189a4c5 flambda-backend: Make stack allocation the default (ocaml-flambda#1013) 98debd51d5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946) deb1714de3 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938) d07fce15aa flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967) 0f1ce0eeab flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012) 27132d8005 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997) 724fb68074 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871) 396d5b8837 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983) b73ab126cf flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980) 7c7d75a6b1 flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970) 8fb75bd345 flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965) fdb79872c6 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948) 9745cdb28a flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943) 5f51f2124f flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade 841687d523 flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936) 72a7658a4b flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff) 6d758cd63c flambda-backend: Revert whitespace changes in dune files, to match upstream c86bf6e035 flambda-backend: Remove duplicate tests for polling 971dbeb55b flambda-backend: Testsuite fixes 32f835689b flambda-backend: Topeval fix for symbols patch befea0169e flambda-backend: Compilation fixes / rectify merge faults a84543f6a6 flambda-backend: Merge ocaml-jst 8e65056085 flambda-backend: Merge ocaml-jst 4d70045a5e flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920) 5e57b7d80d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918) 6423d5e8ce flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24 ead605caf3 flambda-backend: Add a missing Extract_exception (ocaml-flambda#916) c8f1481246 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes cf4d0d34a8 flambda-backend: Merge fixes (#21) c2f742fca7 flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881) 3d38d13bea flambda-backend: Long frames in frametable (ocaml-flambda#797) 85aec7bb78 flambda-backend: Add loop attribute to Builtin_attributes c0f16e325b flambda-backend: Compilation fixes 90dea23141 flambda-backend: Merge flambda-backend/main 5acc6eaf90 flambda-backend: Fixes after merge e5019466b5 flambda-backend: Merge ocaml-jst 115083b765 flambda-backend: Merge ocaml-jst 9943b2ecc2 flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909) ce339f19f5 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902) e6a317c866 flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)" 853c4884fd flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893) 5a977e4483 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898) 7fa7f9dd96 flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889) 3cd36f0058 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896) 75659153a1 flambda-backend: [@poll error] attribute (ocaml-flambda#745) 9eb9448e6d flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740) 689bddabd9 flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892) git-subtree-dir: ocaml git-subtree-split: 06c189a4c5505be62c8c658eee186a7aa6ba4c68
b11eea1fae flambda-backend: Introduce Import_info (ocaml-flambda#1036) bc5b135137 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml-flambda#1029) c8babbdaf4 flambda-backend: Compilation_unit optimisations (ocaml-flambda#1035) e8d3e22320 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml-flambda#1030) eb14a86db9 flambda-backend: Port PR81 from ocaml-jst (ocaml-flambda#1024) 131bc12b53 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml-flambda#1022) 06c189a4c5 flambda-backend: Make stack allocation the default (ocaml-flambda#1013) 98debd51d5 flambda-backend: Initial support for value slots not of value kind (ocaml-flambda#946) deb1714de3 flambda-backend: Add is_last flag to closinfo words (ocaml-flambda#938) d07fce15aa flambda-backend: Disable poll insertion in Configure (ocaml-flambda#967) 0f1ce0eeab flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml-flambda#1012) 27132d8005 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml-flambda#997) 724fb68074 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml-flambda#871) 396d5b8837 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml-flambda#983) b73ab126cf flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml-flambda#980) 7c7d75a6b1 flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml-flambda#970) 8fb75bd345 flambda-backend: Port ocaml/ocaml#11727 and ocaml/ocaml#11732 (ocaml-flambda#965) fdb79872c6 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml-flambda#948) 9745cdb28a flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml-flambda#943) 5f51f2124f flambda-backend: Merge pull request ocaml-flambda#932 from mshinwell/4.14-upgrade 841687d523 flambda-backend: Run make alldepend in ocaml/ (ocaml-flambda#936) 72a7658a4b flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff) 6d758cd63c flambda-backend: Revert whitespace changes in dune files, to match upstream c86bf6e035 flambda-backend: Remove duplicate tests for polling 971dbeb55b flambda-backend: Testsuite fixes 32f835689b flambda-backend: Topeval fix for symbols patch befea0169e flambda-backend: Compilation fixes / rectify merge faults a84543f6a6 flambda-backend: Merge ocaml-jst 8e65056085 flambda-backend: Merge ocaml-jst 4d70045a5e flambda-backend: Remove filename from system frametable (amd64) (ocaml-flambda#920) 5e57b7d80d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml-flambda#918) 6423d5e8ce flambda-backend: Merge pull request ocaml-flambda#914 from mshinwell/merge-ocaml-jst-2022-10-24 ead605caf3 flambda-backend: Add a missing Extract_exception (ocaml-flambda#916) c8f1481246 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes cf4d0d34a8 flambda-backend: Merge fixes (#21) c2f742fca7 flambda-backend: Re-enable some tests for Flambda2 (ocaml-flambda#881) 3d38d13bea flambda-backend: Long frames in frametable (ocaml-flambda#797) 85aec7bb78 flambda-backend: Add loop attribute to Builtin_attributes c0f16e325b flambda-backend: Compilation fixes 90dea23141 flambda-backend: Merge flambda-backend/main 5acc6eaf90 flambda-backend: Fixes after merge e5019466b5 flambda-backend: Merge ocaml-jst 115083b765 flambda-backend: Merge ocaml-jst 9943b2ecc2 flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)"" (ocaml-flambda#909) ce339f19f5 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml-flambda#902) e6a317c866 flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml-flambda#893)" 853c4884fd flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml-flambda#893) 5a977e4483 flambda-backend: Fix missing End_region primitives on switch arms (ocaml-flambda#898) 7fa7f9dd96 flambda-backend: Add missing dependencies to Dune files (ocaml-flambda#889) 3cd36f0058 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml-flambda#896) 75659153a1 flambda-backend: [@poll error] attribute (ocaml-flambda#745) 9eb9448e6d flambda-backend: Backport the main safepoints PRs (ocaml-flambda#740) 689bddabd9 flambda-backend: Add strict mode for ocamldep (ocaml-flambda#892) git-subtree-dir: ocaml git-subtree-split: b11eea1fae9ed1661d61ab41e0ed84099c9d0de2
This pull request introduces the transformation of tail-recursive calls in functions to a recursive continuation call, effectively transforming the function into a loop at the flambda2 stage and allowing further simplifications to be done (such as unboxing). By default, this transformation only happens if the function is purely tail-recursive as written (no instance of the function exists other than in a tail call in the body).
The
[@loop]
and[@loop never]
attributes are added to control the transformation, the first by forcing the transformation to happen even if the function is not detected to be tail-recursive (for instance, if some calls are hidden behind inlining), while the second prevents the transformation from ever happening.Since loop unrolling is not yet supported, the
[@unrolled]
attributes are incompatible with loopified functions, and the optimizer will warn about impossible inlining. If unrolling is important in those situations, the function can be marked with[@loop never]
to present its transformation.--
This is a rebase of #836 on top of all the parts that were split from it.