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

Ocaml spacetime support #93347

Merged
merged 2 commits into from Aug 22, 2020
Merged

Ocaml spacetime support #93347

merged 2 commits into from Aug 22, 2020

Conversation

symphorien
Copy link
Member

Motivation for this change

spacetime support for ocaml:

  • spacetime enabled compiler
  • prof_spacetime to visualise results
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@symphorien symphorien requested a review from vbgl July 20, 2020 07:04
@vbgl
Copy link
Contributor

vbgl commented Aug 12, 2020

Merged the fix of spacetime_lib into master as 15d2b21 and the addition of prof_spacetime as 5810d66

vbgl
vbgl reviewed Aug 13, 2020
View reviewed changes
pkgs/development/tools/ocaml/camlp4/default.nix Outdated
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
dontAddPrefix = true;

preConfigure = ''
# increase stack space for spacetime variant of the compiler
# https://github.com/ocaml/ocaml/issues/7435
ulimit -s unlimited
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this work on all platforms?

Could this change be made only when “spacetime” support is enabled? (To this end, it might be useful to inherit spaceTimeSupport in the passthru attribute of the ocaml derivation.)

Copy link
Member Author

Choose a reason for hiding this comment

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

I expect so, because this is a bash builtin.

Copy link
Contributor

Choose a reason for hiding this comment

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

CI just failed on darwin:

/nix/store/mmv9acmxa9g4p9fk3ck2kh4hii7ym48f-stdenv-darwin/setup: line 91: ulimit: stack size: cannot modify limit: Operation not permitted

@vbgl
Copy link
Contributor

vbgl commented Aug 13, 2020 •
edited

@GrahamcOfBorg build fstar jackline mldonkey orpie sks wyrd

vbgl
vbgl requested changes Aug 15, 2020
View reviewed changes
pkgs/development/tools/ocaml/camlp4/default.nix Outdated
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
dontAddPrefix = true;

preConfigure = ''
# increase stack space for spacetime variant of the compiler
# https://github.com/ocaml/ocaml/issues/7435
ulimit -s unlimited
Copy link
Contributor

Choose a reason for hiding this comment

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

CI just failed on darwin:

/nix/store/mmv9acmxa9g4p9fk3ck2kh4hii7ym48f-stdenv-darwin/setup: line 91: ulimit: stack size: cannot modify limit: Operation not permitted

@symphorien
Copy link
Member Author

I allowed the ulimit to fail.

@infinisil infinisil closed this Aug 22, 2020
@infinisil infinisil reopened this Aug 22, 2020
@infinisil infinisil merged commit 1fe7fee into NixOS:master Aug 22, 2020
@infinisil
Copy link
Member

(misclicked at first)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbgl vbgl vbgl requested changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@symphorien @vbgl @infinisil