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.

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

cargo: enable zlib-ng and fast sha1 in gix #4929

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Conversation

yuja
Copy link
Collaborator

@yuja yuja commented Nov 20, 2024

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@yuja yuja force-pushed the push-qspvmsmomnrs branch from fb6d225 to 5842530 Compare November 20, 2024 15:06
Cargo.toml Show resolved Hide resolved
@yuja yuja force-pushed the push-qspvmsmomnrs branch from 5842530 to e7450c3 Compare December 5, 2024 13:59
@thoughtpolice
Copy link
Collaborator

@yuja Actually I just tested this, and you need to add cmake in one more spot: please add it inside the devShell dependencies at the very end of the flake.nix. Otherwise, it breaks my ability to compile interactively. I can also do this as a follow up (and I should deduplicate this code a bit so it doesn't happen again...)

I noticed miniz_oxide appears in perf samples. While miniz_oxide is safer, I
think zlib-ng is pretty reliable.

https://docs.rs/gix/latest/gix/#performance

libz-ng-sys is downgraded to 1.1.16 due to the Windows linking issue. The
benchmark result is obtained with libz-ng-sys 1.1.20.

rust-lang/libz-sys#225

```
% hyperfine --sort command --warmup 3 --runs 10 -L bin jj-0,jj-1 \
  'target/release-with-debug/{bin} --ignore-working-copy log README.md'
Benchmark 1: target/release-with-debug/jj-0 ..
  Time (mean ± σ):     256.6 ms ±   4.3 ms    [User: 214.1 ms, System: 38.6 ms]
  Range (min … max):   245.4 ms … 261.2 ms    10 runs

Benchmark 2: target/release-with-debug/jj-1 ..
  Time (mean ± σ):     223.0 ms ±   4.2 ms    [User: 174.7 ms, System: 44.4 ms]
  Range (min … max):   212.4 ms … 225.8 ms    10 runs
```
@yuja yuja force-pushed the push-qspvmsmomnrs branch from e7450c3 to 2412fd4 Compare December 6, 2024 01:52
@yuja
Copy link
Collaborator Author

yuja commented Dec 6, 2024

@thoughtpolice

you need to add cmake in one more spot: please add it inside the devShell dependencies at the very end of the flake.nix.

Fixed. Can you take another look? I also added a TODO comment.

@thoughtpolice
Copy link
Collaborator

@thoughtpolice

you need to add cmake in one more spot: please add it inside the devShell dependencies at the very end of the flake.nix.

Fixed. Can you take another look? I also added a TODO comment.

WFM. Land when you're ready.

@yuja yuja merged commit f58145b into jj-vcs:main Dec 6, 2024
18 checks passed
@yuja yuja deleted the push-qspvmsmomnrs branch December 6, 2024 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants