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

benchexec: init at 3.21 #263375

Merged
merged 7 commits into from
May 18, 2024
Merged

benchexec: init at 3.21 #263375

merged 7 commits into from
May 18, 2024

Conversation

lorenzleutgeb
Copy link
Member

@lorenzleutgeb lorenzleutgeb commented Oct 25, 2023 •
edited
Loading

Description of changes

Packages three related programs, the main one being BenchExec. All three programs are maintained by @PhilippWendler at the Software and Computational Systems Lab at Ludwig-Maximilians-Universität München.

BenchExec (version 3.21)

A framework for reliable benchmarking and resource measurement. See also doi:10.1007/s10009-017-0469-y.

CPU Energy Meter (version 1.2)

A tool for measuring energy consumption of Intel CPUs. Requires reading msr(4) devices. See also doi:10.1007/978-3-030-45237-7_8.

PQoS Wrapper

Wrapper for Intel PQoS for the purpose of using it in BenchExec. Requires reading msr(4) devices.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 25, 2023
@lorenzleutgeb lorenzleutgeb force-pushed the benchexec branch 3 times, most recently from acb9a23 to 30f90dc Compare October 25, 2023 16:52
@PhilippWendler
Copy link

@globin ping because you may like to see this. And your work is included here, it was released as part of BenchExec 3.18.

@h7x4 h7x4 added the 8.has: module (new) This PR adds a module in `nixos/` label Oct 25, 2023
h7x4
h7x4 reviewed Oct 25, 2023
View reviewed changes
Copy link
Member

@h7x4 h7x4 left a comment

Choose a reason for hiding this comment

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

Haven't tested or went rigorously through this, these are just some initial comments

nixos/modules/programs/benchexec.nix Outdated Show resolved Hide resolved
nixos/modules/programs/benchexec.nix Outdated Show resolved Hide resolved
nixos/modules/programs/benchexec.nix Outdated Show resolved Hide resolved
nixos/modules/programs/benchexec.nix Outdated Show resolved Hide resolved
nixos/modules/programs/cpu-energy-meter.nix Show resolved Hide resolved
nixos/modules/programs/cpu-energy-meter.nix Outdated Show resolved Hide resolved
nixos/modules/programs/pqos-wrapper.nix Outdated Show resolved Hide resolved
pkgs/by-name/pq/pqos-wrapper/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/be/benchexec/package.nix Show resolved Hide resolved
pkgs/by-name/be/benchexec/package.nix Outdated Show resolved Hide resolved
@lorenzleutgeb lorenzleutgeb force-pushed the benchexec branch 5 times, most recently from 92de721 to 3331ee2 Compare October 26, 2023 12:11
@lorenzleutgeb

This comment was marked as resolved.

Sign in to view
@lorenzleutgeb lorenzleutgeb force-pushed the benchexec branch 2 times, most recently from 53eff86 to 29c5a47 Compare October 26, 2023 13:45
@lorenzleutgeb lorenzleutgeb requested a review from h7x4 October 26, 2023 13:45
@lorenzleutgeb lorenzleutgeb force-pushed the benchexec branch 3 times, most recently from c9db281 to 448116e Compare October 27, 2023 13:53
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Oct 27, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/1016/74

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2849

PhilippWendler added a commit to sosy-lab/cpu-energy-meter that referenced this pull request Nov 2, 2023
@PhilippWendler
Remove requirement on module cpuid from documentation
a8f665b 
It seems this is not necessary,
because it provides /dev/cpu/*/cpuid, which we do not use.

cf. NixOS/nixpkgs#263375 (comment)
@lorenzleutgeb
Copy link
Member Author

I have updated the PR after the release of 23.11. Kindly asking for further review by @h7x4, @SuperSandro2000 or @FliegendeWurst. Thanks!

@PhilippWendler PhilippWendler mentioned this pull request Dec 13, 2023
Merged
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@lorenzleutgeb lorenzleutgeb changed the title benchexec: init at 3.18 benchexec: init at 3.21 May 10, 2024
@lorenzleutgeb lorenzleutgeb added needs_reviewer (old Marvin label, do not use) and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels May 10, 2024
@lorenzleutgeb lorenzleutgeb force-pushed the benchexec branch 2 times, most recently from 5258562 to 897d4fa Compare May 10, 2024 18:33
@lorenzleutgeb
Copy link
Member Author

lorenzleutgeb commented May 10, 2024 •
edited
Loading

Bumped BenchExec to 3.21, fixed merge conflicts (trivial, just release notes), removed calls to lib.mdDoc, moved packages to pkgs/by-name, added some version tests to benchexec. Please review.

SuperSandro2000
SuperSandro2000 reviewed May 17, 2024
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

The module and package should get their own init commits.

nixos/modules/module-list.nix Show resolved Hide resolved
nixos/modules/programs/pqos-wrapper.nix Show resolved Hide resolved
nixos/modules/programs/pqos-wrapper.nix Outdated Show resolved Hide resolved
pkgs/by-name/be/benchexec/package.nix Outdated Show resolved Hide resolved
nixos/modules/programs/benchexec.nix Show resolved Hide resolved
@lorenzleutgeb
Copy link
Member Author

@SuperSandro2000 thanks for the review. I have addressed two of your remarks and split commits so that they do not mix changes to modules with changes to packages. Regarding the "-wrapper" suffix I asked for clarification

@SuperSandro2000 SuperSandro2000 merged commit c21d10b into NixOS:master May 18, 2024
24 of 25 checks passed
@lorenzleutgeb lorenzleutgeb mentioned this pull request May 18, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@PhilippWendler PhilippWendler PhilippWendler left review comments

@h7x4 h7x4 Awaiting requested review from h7x4

@FliegendeWurst FliegendeWurst Awaiting requested review from FliegendeWurst

@lilyinstarlight lilyinstarlight Awaiting requested review from lilyinstarlight

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes needs_reviewer (old Marvin label, do not use)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@lorenzleutgeb @PhilippWendler @nixos-discourse @SuperSandro2000 @FliegendeWurst @h7x4 @wegank