Closed
Conversation
alainfrisch
reviewed
Jul 9, 2020
| | scopes -> String.concat "" (to_strings [] scopes) | ||
|
|
||
| let string_of_scopes = | ||
| let module StringSet = Set.Make (String) in |
Contributor
There was a problem hiding this comment.
What about using a Weak table here?
Contributor
Author
There was a problem hiding this comment.
My intuition is that it would make builds non deterministic.
Contributor
There was a problem hiding this comment.
I don't think so: you'll still have the guarantee that equal strings are physically equal.
Contributor
Author
There was a problem hiding this comment.
Sorry, I am confused: either strings may be removed from the set and some
sharing might be lost, or they are never removed and the nature of the
container does not matter.
Contributor
There was a problem hiding this comment.
By definition, all data marshaled to a given file remain alive until the marshaling happen (so, they won't go out of the weak table); since they will all have gone through the hash-consing (Weak.merge), sharing of equal strings is guaranteed.
Contributor
There was a problem hiding this comment.
Btw, are you confident that the calculation of string_of_scopes itself is not too costly?
Member
There was a problem hiding this comment.
Another, more standard approach would be to just memoize the function in a mutable map. If I understand correctly, this should give the same sharing-outputs benefits (as long as we are not sharing the same non-constant result among different strings, which I don't think we are?), and it avoids recomputing the function completely.
Contributor
Author
There was a problem hiding this comment.
For a sequential build of world.opt, I see an increase of about 10 seconds,
the baseline being 4 minutes.
Member
There was a problem hiding this comment.
@xclerc which version is giving this increase of 10 seconds compared to what? Are you comparing your PR to trunk, or Alain or my suggestion to your PR?
Contributor
Author
There was a problem hiding this comment.
It was with/without the diff in this PR.
gretay-js
added a commit
to janestreet/ocaml
that referenced
this pull request
Jul 9, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 16, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 20, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 20, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 21, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 21, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 30, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Jul 30, 2020
Ensure that string representations of scopes are shared.
hhugo
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Jul 31, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 3, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 4, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 5, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 7, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 10, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 10, 2020
Ensure that string representations of scopes are shared.
gretay-js
added a commit
to janestreet/ocaml
that referenced
this pull request
Aug 10, 2020
Ensure that string representations of scopes are shared.
hhugo
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Aug 13, 2020
Ensure that string representations of scopes are shared.
hhugo
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Aug 13, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 17, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 18, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 19, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 20, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Aug 28, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Sep 2, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Sep 2, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Sep 2, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to mshinwell/ocaml
that referenced
this pull request
Sep 7, 2020
Ensure that string representations of scopes are shared.
hhugo
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Sep 8, 2020
Ensure that string representations of scopes are shared.
Contributor
|
Looks like there is a real need to reshare those strings, but no agreement on how to do it. Could @xclerc , @alainfrisch and @gasche have a constructive discussion leading to an implementation we can actually merge? Or should we just wait for this PR to fall into oblivion like so many others? |
Member
|
The current implementation looks mergeable to me, although I would prefer to see a comment to explain why the code is doing what it is doing. I proposed a memoization approach that I think is more standard and may be more efficient -- with the current approach the function is recomputed each time and then the result is hash-consed. |
Contributor
|
Contributor
Author
|
I don't have a strong opinion on which variant should be implemented, (*) or any one addressing the size issue I think |
Member
|
Certainly, this is a regression that we want to fix. |
Contributor
|
If you prefer to have this fixed quickly with a minimal patch, I think defining: module WeakString = Weak.Make(struct include String let hash = Hashtbl.hash end)
let memo_str = WeakString.merge (WeakString.create 128)and applying |
Contributor
|
There is another alternative here: rather than a global, possibly-
|
mshinwell
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Sep 29, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Sep 30, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Sep 30, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Oct 1, 2020
Ensure that string representations of scopes are shared.
mshinwell
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Oct 1, 2020
Ensure that string representations of scopes are shared.
hhugo
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Oct 5, 2020
Ensure that string representations of scopes are shared.
hhugo
pushed a commit
to janestreet/ocaml
that referenced
this pull request
Nov 12, 2020
Ensure that string representations of scopes are shared.
Contributor
|
Gentle ping. I would be nice to include that fix in 4.12. |
Contributor
|
Fixed by #9896. |
gretay-js
added a commit
to gretay-js/ocaml
that referenced
this pull request
May 28, 2021
Ensure that string representations of scopes are shared.
poechsel
pushed a commit
to poechsel/ocaml
that referenced
this pull request
Jun 30, 2021
Ensure that string representations of scopes are shared.
poechsel
pushed a commit
to poechsel/ocaml
that referenced
this pull request
Jul 2, 2021
Ensure that string representations of scopes are shared.
poechsel
pushed a commit
to ocaml-flambda/ocaml
that referenced
this pull request
Sep 3, 2021
Ensure that string representations of scopes are shared.
stedolan
pushed a commit
to stedolan/ocaml
that referenced
this pull request
Dec 13, 2021
…e937fc) Ensure that string representations of scopes are shared.
chambart
pushed a commit
to chambart/ocaml-1
that referenced
this pull request
Feb 1, 2022
23a7f73 flambda-backend: Fix some Debuginfo.t scopes in the frontend (ocaml#248) 33a04a6 flambda-backend: Attempt to shrink the heap before calling the assembler (ocaml#429) 8a36a16 flambda-backend: Fix to allow stage 2 builds in Flambda 2 -Oclassic mode (ocaml#442) d828db6 flambda-backend: Rename -no-extensions flag to -disable-all-extensions (ocaml#425) 68c39d5 flambda-backend: Fix mistake with extension records (ocaml#423) 423f312 flambda-backend: Refactor -extension and -standard flags (ocaml#398) 585e023 flambda-backend: Improved simplification of array operations (ocaml#384) faec6b1 flambda-backend: Typos (ocaml#407) 8914940 flambda-backend: Ensure allocations are initialised, even dead ones (ocaml#405) 6b58001 flambda-backend: Move compiler flag -dcfg out of ocaml/ subdirectory (ocaml#400) 4fd57cf flambda-backend: Use ghost loc for extension to avoid expressions with overlapping locations (ocaml#399) 8d993c5 flambda-backend: Let's fix instead of reverting flambda_backend_args (ocaml#396) d29b133 flambda-backend: Revert "Move flambda-backend specific flags out of ocaml/ subdirectory (ocaml#382)" (ocaml#395) d0cda93 flambda-backend: Revert ocaml#373 (ocaml#393) 1c6eee1 flambda-backend: Fix "make check_all_arches" in ocaml/ subdirectory (ocaml#388) a7960dd flambda-backend: Move flambda-backend specific flags out of ocaml/ subdirectory (ocaml#382) bf7b1a8 flambda-backend: List and Array Comprehensions (ocaml#147) f2547de flambda-backend: Compile more stdlib files with -O3 (ocaml#380) 3620c58 flambda-backend: Four small inliner fixes (ocaml#379) 2d165d2 flambda-backend: Regenerate ocaml/configure 3838b56 flambda-backend: Bump Menhir to version 20210419 (ocaml#362) 43c14d6 flambda-backend: Re-enable -flambda2-join-points (ocaml#374) 5cd2520 flambda-backend: Disable inlining of recursive functions by default (ocaml#372) e98b277 flambda-backend: Import ocaml#10736 (stack limit increases) (ocaml#373) 82c8086 flambda-backend: Use hooks for type tree and parse tree (ocaml#363) 33bbc93 flambda-backend: Fix parsecmm.mly in ocaml subdirectory (ocaml#357) 9650034 flambda-backend: Right-to-left evaluation of arguments of String.get and friends (ocaml#354) f7d3775 flambda-backend: Revert "Magic numbers" (ocaml#360) 0bd2fa6 flambda-backend: Add [@inline ready] attribute and remove [@inline hint] (not [@inlined hint]) (ocaml#351) cee74af flambda-backend: Ensure that functions are evaluated after their arguments (ocaml#353) 954be59 flambda-backend: Bootstrap dd5c299 flambda-backend: Change prefix of all magic numbers to avoid clashes with upstream. c2b1355 flambda-backend: Fix wrong shift generation in Cmm_helpers (ocaml#347) 739243b flambda-backend: Add flambda_oclassic attribute (ocaml#348) dc9b7fd flambda-backend: Only speculate during inlining if argument types have useful information (ocaml#343) aa190ec flambda-backend: Backport fix from PR#10719 (ocaml#342) c53a574 flambda-backend: Reduce max inlining depths at -O2 and -O3 (ocaml#334) a2493dc flambda-backend: Tweak error messages in Compenv. 1c7b580 flambda-backend: Change Name_abstraction to use a parameterized type (ocaml#326) 07e0918 flambda-backend: Save cfg to file (ocaml#257) 9427a8d flambda-backend: Make inlining parameters more aggressive (ocaml#332) fe0610f flambda-backend: Do not cache young_limit in a processor register (upstream PR 9876) (ocaml#315) 56f28b8 flambda-backend: Fix an overflow bug in major GC work computation (ocaml#310) 8e43a49 flambda-backend: Cmm invariants (port upstream PR 1400) (ocaml#258) e901f16 flambda-backend: Add attributes effects and coeffects (#18) aaa1cdb flambda-backend: Expose Flambda 2 flags via OCAMLPARAM (ocaml#304) 62db54f flambda-backend: Fix freshening substitutions 57231d2 flambda-backend: Evaluate signature substitutions lazily (upstream PR 10599) (ocaml#280) a1a07de flambda-backend: Keep Sys.opaque_identity in Cmm and Mach (port upstream PR 9412) (ocaml#238) faaf149 flambda-backend: Rename Un_cps -> To_cmm (ocaml#261) ecb0201 flambda-backend: Add "-dcfg" flag to ocamlopt (ocaml#254) 32ec58a flambda-backend: Bypass Simplify (ocaml#162) bd4ce4a flambda-backend: Revert "Semaphore without probes: dummy notes (ocaml#142)" (ocaml#242) c98530f flambda-backend: Semaphore without probes: dummy notes (ocaml#142) c9b6a04 flambda-backend: Remove hack for .depend from runtime/dune (ocaml#170) 6e5d4cf flambda-backend: Build and install Semaphore (ocaml#183) 924eb60 flambda-backend: Special constructor for %sys_argv primitive (ocaml#166) 2ac6334 flambda-backend: Build ocamldoc (ocaml#157) c6f7267 flambda-backend: Add -mbranches-within-32B to major_gc.c compilation (where supported) a99fdee flambda-backend: Merge pull request ocaml#10195 from stedolan/mark-prefetching bd72dcb flambda-backend: Prefetching optimisations for sweeping (ocaml#9934) 27fed7e flambda-backend: Add missing index param for Obj.field (ocaml#145) cd48b2f flambda-backend: Fix camlinternalOO at -O3 with Flambda 2 (ocaml#132) 9d85430 flambda-backend: Fix testsuite execution (ocaml#125) ac964ca flambda-backend: Comment out `[@inlined]` annotation. (ocaml#136) ad4afce flambda-backend: Fix magic numbers (test suite) (ocaml#135) 9b033c7 flambda-backend: Disable the comparison of bytecode programs (`ocamltest`) (ocaml#128) e650abd flambda-backend: Import flambda2 changes (`Asmpackager`) (ocaml#127) 14dcc38 flambda-backend: Fix error with Record_unboxed (bug in block kind patch) (ocaml#119) 2d35761 flambda-backend: Resurrect [@inline never] annotations in camlinternalMod (ocaml#121) f5985ad flambda-backend: Magic numbers for cmx and cmxa files (ocaml#118) 0e8b9f0 flambda-backend: Extend conditions to include flambda2 (ocaml#115) 99870c8 flambda-backend: Fix Translobj assertions for Flambda 2 (ocaml#112) 5106317 flambda-backend: Minor fix for "lazy" compilation in Matching with Flambda 2 (ocaml#110) dba922b flambda-backend: Oclassic/O2/O3 etc (ocaml#104) f88af3e flambda-backend: Wire in the remaining Flambda 2 flags (ocaml#103) 678d647 flambda-backend: Wire in the Flambda 2 inlining flags (ocaml#100) 1a8febb flambda-backend: Formatting of help text for some Flambda 2 options (ocaml#101) 9ae1c7a flambda-backend: First set of command-line flags for Flambda 2 (ocaml#98) bc0bc5e flambda-backend: Add config variables flambda_backend, flambda2 and probes (ocaml#99) efb8304 flambda-backend: Build our own ocamlobjinfo from tools/objinfo/ at the root (ocaml#95) d2cfaca flambda-backend: Add mutability annotations to Pfield etc. (ocaml#88) 5532555 flambda-backend: Lambda block kinds (ocaml#86) 0c597ba flambda-backend: Revert VERSION, etc. back to 4.12.0 (mostly reverts 822d0a0 from upstream 4.12) (ocaml#93) 037c3d0 flambda-backend: Float blocks 7a9d190 flambda-backend: Allow --enable-middle-end=flambda2 etc (ocaml#89) 9057474 flambda-backend: Root scanning fixes for Flambda 2 (ocaml#87) 08e02a3 flambda-backend: Ensure that Lifthenelse has a boolean-valued condition (ocaml#63) 77214b7 flambda-backend: Obj changes for Flambda 2 (ocaml#71) ecfdd72 flambda-backend: Cherry-pick 9432cfdadb043a191b414a2caece3e4f9bbc68b7 (ocaml#84) d1a4396 flambda-backend: Add a `returns` field to `Cmm.Cextcall` (ocaml#74) 575dff5 flambda-backend: CMM traps (ocaml#72) 8a87272 flambda-backend: Remove Obj.set_tag and Obj.truncate (ocaml#73) d9017ae flambda-backend: Merge pull request ocaml#80 from mshinwell/fb-backport-pr10205 3a4824e flambda-backend: Backport PR#10205 from upstream: Avoid overwriting closures while initialising recursive modules f31890e flambda-backend: Install missing headers of ocaml/runtime/caml (ocaml#77) 83516f8 flambda-backend: Apply node created for probe should not be annotated as tailcall (ocaml#76) bc430cb flambda-backend: Add Clflags.is_flambda2 (ocaml#62) ed87247 flambda-backend: Preallocation of blocks in Translmod for value let rec w/ flambda2 (ocaml#59) a4b04d5 flambda-backend: inline never on Gc.create_alarm (ocaml#56) cef0bb6 flambda-backend: Config.flambda2 (ocaml#58) ff0e4f7 flambda-backend: Pun labelled arguments with type constraint in function applications (ocaml#53) d72c5fb flambda-backend: Remove Cmm.memory_chunk.Double_u (ocaml#42) 9d34d99 flambda-backend: Install missing artifacts 10146f2 flambda-backend: Add ocamlcfg (ocaml#34) 819d38a flambda-backend: Use OC_CFLAGS, OC_CPPFLAGS, and SHAREDLIB_CFLAGS for foreign libs (#30) f98b564 flambda-backend: Pass -function-sections iff supported. (#29) e0eef5e flambda-backend: Bootstrap (#11 part 2) 17374b4 flambda-backend: Add [@@Builtin] attribute to Primitives (#11 part 1) 85127ad flambda-backend: Add builtin, effects and coeffects fields to Cextcall (#12) b670bcf flambda-backend: Replace tuple with record in Cextcall (#10) db451b5 flambda-backend: Speedups in Asmlink (#8) 2fe489d flambda-backend: Cherry-pick upstream PR#10184 from upstream, dynlink invariant removal (rev 3dc3cd7 upstream) d364bfa flambda-backend: Local patch against upstream: enable function sections in the Dune build 886b800 flambda-backend: Local patch against upstream: remove Raw_spacetime_lib (does not build with -m32) 1a7db7c flambda-backend: Local patch against upstream: make dune ignore ocamldoc/ directory e411dd3 flambda-backend: Local patch against upstream: remove ocaml/testsuite/tests/tool-caml-tex/ 1016d03 flambda-backend: Local patch against upstream: remove ocaml/dune-project and ocaml/ocaml-variants.opam 93785e3 flambda-backend: To upstream: export-dynamic for otherlibs/dynlink/ via the natdynlinkops files (still needs .gitignore + way of generating these files) 63db8c1 flambda-backend: To upstream: stop using -O3 in otherlibs/Makefile.otherlibs.common eb2f1ed flambda-backend: To upstream: stop using -O3 for dynlink/ 6682f8d flambda-backend: To upstream: use flambda_o3 attribute instead of -O3 in the Makefile for systhreads/ de197df flambda-backend: To upstream: renamed ocamltest_unix.xxx files for dune bf3773d flambda-backend: To upstream: dune build fixes (depends on previous to-upstream patches) 6fbc80e flambda-backend: To upstream: refactor otherlibs/dynlink/, removing byte/ and native/ 71a03ef flambda-backend: To upstream: fix to Ocaml_modifiers in ocamltest 686d6e3 flambda-backend: To upstream: fix dependency problem with Instruct c311155 flambda-backend: To upstream: remove threadUnix 52e6e78 flambda-backend: To upstream: stabilise filenames used in backtraces: stdlib/, otherlibs/systhreads/, toplevel/toploop.ml 7d08e0e flambda-backend: To upstream: use flambda_o3 attribute in stdlib 403b82e flambda-backend: To upstream: flambda_o3 attribute support (includes bootstrap) 65032b1 flambda-backend: To upstream: use nolabels attribute instead of -nolabels for otherlibs/unix/ f533fad flambda-backend: To upstream: remove Compflags, add attributes, etc. 49fc1b5 flambda-backend: To upstream: Add attributes and bootstrap compiler a4b9e0d flambda-backend: Already upstreamed: stdlib capitalisation patch 4c1c259 flambda-backend: ocaml#9748 from xclerc/share-ev_defname (cherry-pick 3e937fc) 00027c4 flambda-backend: permanent/default-to-best-fit (cherry-pick 64240fd) 2561dd9 flambda-backend: permanent/reraise-by-default (cherry-pick 50e9490) c0aa4f4 flambda-backend: permanent/gc-tuning (cherry-pick e9d6d2f) git-subtree-dir: ocaml git-subtree-split: 23a7f73
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After #9096, we noticed that the total size of
cmoandcmafileswas up by 17% in our tree. This pull request tweaks
Debuginfoso that strings representing scopes (which are marshaled into
cmoandcmafiles) are shared.