Flambda 2 patches to the Lambda types #69

lthls · 2021-06-30T11:44:31Z

The first commit combines several modifications to the Pfield primitive, plus a change to Lswitch structures (that I could split if needed).
The second commit handles the addition of Immutable_unique to Lmbda.mutable_flag, used for extension constructors.

git-subtree-dir: ocaml git-subtree-split: ae3e5528f45f084a5f2984d81ecc635ba8c38f31

…ac3c)

…d81d)

…74322eefd9af8)

…b6f1a67704cdec) Change the default policy to best-fit and space overhead to 100

Ensure that string representations of scopes are shared.

…s/unix/

…bs/systhreads/, toplevel/toploop.ml

…for systhreads/

…ops files (still needs .gitignore + way of generating these files)

…ml-variants.opam

…tex/

…d with -m32)

…ambda#23)

Used `replace` instead of `add` on the interfaces Hash table (which is being used as a set), to avoid duplicate entries. The duplicate entries lead to enormous `caml_globals_map` values. Also use `replace` instead of `add` on another hash table usage, not because it was causing any problems but because it seems like `add` should be avoided outside unusual situations.

git-subtree-dir: external/memtrace git-subtree-split: ad4099fd60562dc3e1d9a33812da54491f9dbadc

…memtrace'

…aml-flambda#30) Use the same options as in the upstream Makefiles, based on ocaml/Makefile.config This fixes the missing -ffunction-sections in compilation of C stubs. We should disable dune behavior of taking C compiler options from "ocamlc -config" when we move to dune 2.8.

) Refactor all .sexp targets into flags.sexp.

* Add intrinsics for ext_pointer and native_pointer * Add two_args * remove XCR * Add intrinisics for storing and loading int64,int32,nativeint Fix up names * Remove "unsafe" from the name of one of the intrinsics * Address review comments Use Word_int instead of Word_val for {load,store}_immediate intrinsics Co-authored-by: Mark Shinwell <[email protected]>

Reduces peak memory usage, which is important when a build system tries to run many large links in parallel.

* Import the code of ocamlcfg. * Fix imported code. * Optionally go through ocamlcfg. * Merge in the latest CFG version * Fix compilation warning 18. * Add copyright header to cfg files. The head is a copy of the LICENSE file at the root of ocamlcfg library Co-authored-by: xclerc <[email protected]>

…ambda#37)

…ml-flambda#38)

) Fix error "integer literal exceeds the range of representable integers of type nativeint" in the code that runs only on 64-bit targets, but need to compile on 32-bit target.

- Mutability on field reads - Tag and size (if known) on field reads - Tag and size on switch block branches

mshinwell · 2021-06-30T11:58:44Z

I was envisaging only trying to upstream the Pfield mutability annotation changes at the present time. Those were needed for multicore, but probably aren't any longer (since there is no longer a read barrier) -- however, they do solve the remaining problems in ocaml/ocaml#9562. As such I think they will likely be acceptable.

However I fear that the remainder of this patch won't be acceptable upstream at the present time, although it looks like a lot less work to submit these changes together. @lthls @stedolan what do you both think?

c703f5f Incorporate upstream comments into type-variable refactor (ocaml-flambda#121) 362ba23 Constrain curry modes to increase along applications (ocaml-flambda#108) b1f0cf9 Simplify the extension handling (ocaml-flambda#114) 4fd53a1 Remove pat_mode from typedtree (ocaml-flambda#105) cf6fcbc Handle attributes on lambdas with locally abstract types (ocaml-flambda#120) 5fa80fe Don't track attributes inside attributes for warning 53 (ocaml-flambda#115) 8a69777 Handle unclosed `[: ... :]` patterns (via `Generic_array` machinery) (ocaml-flambda#117) b0737f4 Add promote-one Makefile target (ocaml-flambda#118) c6ad684 Refactoring and fixes around module lookup (ocaml-flambda#107) b0a6495 Add documentation for global constructor arguments (ocaml-flambda#69) dd79aec Print `nlocal` in the `-d(raw)lambda` output (ocaml-flambda#112) 8035026 Fix `nlocal` in the generated Lambda for list comprehensions (ocaml-flambda#113) afbcdf0 Immutable arrays (ocaml-flambda#47) bfe1490 fix several issues when removing exp_mode (ocaml-flambda#110) 8f46060 Better error message for under-applied functions (ocaml-flambda#74) 27331d8 Consistently use Lmutvar or Lvar in comprehensions (ocaml-flambda#111) 01e965b Skip failing test for now 0131357 Fix test case to use comprehensions_experimental 22a7368 Temporarily disable list comprehensions tests due to locals bug e08377d Make `comprehensions` into `comprehensions_experimental` for now (ocaml-flambda#109) 947cf89 List and array comprehensions (ocaml-flambda#46) bd9e051 remove exp_mode from typedtree (ocaml-flambda#100) a9268d2 Fix misplaced attribute warning when using external parser (and some cleanup) (ocaml-flambda#101) 2b33f24 Refactor toplevel local escape check (ocaml-flambda#104) ed2aec6 Comment functions exported from TyVarEnv. 87838ba Move new variable creation into TyVarEnv. a3f60ab Encapsulate functions that work with tyvars 43d83a6 Prevent possibility of forgetting to re-widen 2f3dd34 Encapsulate context when narrowing type env't d78ff6d Make immediate64 things mode cross (ocaml-flambda#97) aa25ab9 Fix version number (ocaml-flambda#94) d01ffa0 Fix .depend file (ocaml-flambda#93) 942f2ab Bootstrap (ocaml-flambda#92) 05f7e38 Check Menhir version (ocaml-flambda#91) 1569b58 Move the CI jobs from 4.12 to 4.14. (ocaml-flambda#90) git-subtree-dir: ocaml git-subtree-split: c703f5f

mshinwell and others added 30 commits April 13, 2021 19:26

Initial commit

a2ed4f1

Squashed 'ocaml/' content from commit ae3e5528f4

ddc44dd

git-subtree-dir: ocaml git-subtree-split: ae3e5528f45f084a5f2984d81ecc635ba8c38f31

Merge commit 'ddc44ddc482a8f48bdd65daf990b1b7a889039c6' as 'ocaml'

f6ee7a4

permanent/js-config (cherry-pick 288028727b68c7e6c30587727ce888b75f65…

4d117ad

…ac3c)

permanent/gc-tuning (cherry-pick e9d6d2f145438dd6a82b56e9b41c8a01e752…

face980

…d81d)

permanent/reraise-by-default (cherry-pick 50e94902ca6bb84c33982db858b…

cea083a

…74322eefd9af8)

permanent/default-to-best-fit (cherry-pick 64240fd716a9d0db57d779ebe5…

e333789

…b6f1a67704cdec) Change the default policy to best-fit and space overhead to 100

ocaml#9748 from xclerc/share-ev_defname (cherry-pick 3e937fcb562)

37729aa

Ensure that string representations of scopes are shared.

Already upstreamed: stdlib capitalisation patch

0ed3371

To upstream: Add attributes and bootstrap compiler

09ead1f

To upstream: remove Compflags, add attributes, etc.

470a53d

To upstream: use nolabels attribute instead of -nolabels for otherlib…

1017726

…s/unix/

To upstream: flambda_o3 attribute support (includes bootstrap)

9caae62

To upstream: use flambda_o3 attribute in stdlib

9ac3d44

To upstream: stabilise filenames used in backtraces: stdlib/, otherli…

934917a

…bs/systhreads/, toplevel/toploop.ml

To upstream: remove threadUnix

707ad5d

To upstream: fix dependency problem with Instruct

87d633f

To upstream: fix to Ocaml_modifiers in ocamltest

c7b0365

To upstream: refactor otherlibs/dynlink/, removing byte/ and native/

6820979

To upstream: dune build fixes (depends on previous to-upstream patches)

a1593c3

To upstream: renamed ocamltest_unix.xxx files for dune

58f0c6a

To upstream: use flambda_o3 attribute instead of -O3 in the Makefile …

050e1e1

…for systhreads/

To upstream: stop using -O3 for dynlink/

d8cd7c3

To upstream: stop using -O3 in otherlibs/Makefile.otherlibs.common

0f12621

To upstream: export-dynamic for otherlibs/dynlink/ via the natdynlink…

5fa67c0

…ops files (still needs .gitignore + way of generating these files)

Local patch against upstream: remove ocaml/dune-project and ocaml/oca…

bb229b0

…ml-variants.opam

Local patch against upstream: remove ocaml/testsuite/tests/tool-caml-…

bdf51ed

…tex/

Local patch against upstream: make dune ignore ocamldoc/ directory

73d7efd

Local patch against upstream: remove Raw_spacetime_lib (does not buil…

1a06cb6

…d with -m32)

Remove Spacetime from build_ocaml_compiler.sexp

9575f0a

gretay-js and others added 24 commits May 27, 2021 13:57

Check in Proc if a Cmm.operation is supported by the target (ocaml-fl…

776a609

…ambda#23)

Add intrinsics for clz, ctz, popcnt (ocaml-flambda#17)

3b93210

Add intrinsics for rdtsc, rdpmc, crc32 (amd64) (ocaml-flambda#20)

5b771b2

Squashed 'external/memtrace/' content from commit ad4099f

dbadbff

git-subtree-dir: external/memtrace git-subtree-split: ad4099fd60562dc3e1d9a33812da54491f9dbadc

Merge commit 'dbadbff1dd3e6ddbb5211f8d3a86ff0d3aeee917' as 'external/…

7a11b23

…memtrace'

Add memtrace support (ocaml-flambda#26)

36d6b8b

Pass -function-sections iff supported. (ocaml-flambda#29)

0e361d5

Amd64 emit tweaks (ocaml-flambda#25)

2ece91d

Add HACKING.md (ocaml-flambda#13)

e1ad38f

Fix race in Makefile caused by flags.sexp dependencies (ocaml-flambda#32

0a05a36

) Refactor all .sexp targets into flags.sexp.

Compact heap before calling C linker (ocaml-flambda#33)

5c840b7

Reduces peak memory usage, which is important when a build system tries to run many large links in parallel.

Install cfg files in lib/ocaml for compiler-libs (ocaml-flambda#35)

777f8bf

Fix typo in Cpopcnt constructor in Proc.operation_supported (ocaml-fl…

ae6257e

…ambda#37)

Replace tuple with record in Cextcall (targets other than amd64) (oca…

c509969

…ml-flambda#38)

Fix integer literal that is too big for 32-bit targets (ocaml-flambda#39

2d6da49

) Fix error "integer literal exceeds the range of representable integers of type nativeint" in the code that runs only on 64-bit targets, but need to compile on 32-bit target.

Set CAML_LD_LIBRARY_PATH to load stublibs

b4eff81

Install missing artifacts

ebce94c

Fix parallel make (ocaml-flambda#64)

2846c72

Patches related to additional info on Pfield:

c30e8fe

- Mutability on field reads - Tag and size (if known) on field reads - Tag and size on switch block branches

Add Immutable_unique mode for extension constructors

4934a5b

mshinwell added the flambda2 Prerequisite for, or part of, flambda2 label Jun 30, 2021

poechsel closed this Jul 1, 2021

poechsel force-pushed the 4.12 branch from 2846c72 to aec9e2f Compare July 1, 2021 10:04

lthls mentioned this pull request Jul 1, 2021

Flambda 2 patches to the Lambda types #70

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Flambda 2 patches to the Lambda types #69

Flambda 2 patches to the Lambda types #69

Uh oh!

lthls commented Jun 30, 2021

Uh oh!

mshinwell commented Jun 30, 2021

Uh oh!

Uh oh!

Flambda 2 patches to the Lambda types #69

Flambda 2 patches to the Lambda types #69

Uh oh!

Conversation

lthls commented Jun 30, 2021

Uh oh!

mshinwell commented Jun 30, 2021

Uh oh!

Uh oh!