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

Jump to bottom

verilog: cleanup & test #97613

Merged
merged 2 commits into from Sep 25, 2020
Merged

verilog: cleanup & test #97613

merged 2 commits into from Sep 25, 2020

Conversation

drewrisinger
Copy link
Contributor

Motivation for this change

Independently from #97513, I was working on cleaning up the package for ZHF, and didn't see that PR before merging.

This cleans up the derivation and adds self-tests along the lines of what is done in CI. https://github.com/steveicarus/iverilog/blob/07bbf4ce0f1aeb6dcfbabe239514c55822779fd9/.travis.yml

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.

@drewrisinger drewrisinger force-pushed the zhf/verilog branch 2 times, most recently from 292b7b2 to 475ee02 Compare September 10, 2020 01:03
cole-h
cole-h approved these changes Sep 10, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM. Maybe this should be 2 commits, though: verilog: cleanup, and verilog: add tests or something.

Result of nixpkgs-review pr 97613 1

4 packages failed to build:
  • bluespec
  • python27Packages.cocotb
  • python37Packages.cocotb
  • python38Packages.cocotb
13 packages built:
  • glasgow (python38Packages.glasgow)
  • mcy
  • python37Packages.glasgow
  • python37Packages.nmigen
  • python37Packages.nmigen-boards
  • python37Packages.nmigen-soc
  • python38Packages.nmigen
  • python38Packages.nmigen-boards
  • python38Packages.nmigen-soc
  • symbiyosys
  • verilog
  • vhd2vl
  • yosys

@drewrisinger
Copy link
Contributor Author

Diff LGTM. Maybe this should be 2 commits, though: verilog: cleanup, and verilog: add tests or something.

Fair. That's what I'd originally had but decided to squash it. Oh well. Will do

@drewrisinger drewrisinger changed the title verilog: cleanup verilog: cleanup & test Sep 10, 2020
@drewrisinger
Copy link
Contributor Author

Looks like build is failing on aarch64 due to floating point issues. Trying to get failure log. I think it's probably down to floating point errors in the br1029[a,b] tests: steveicarus/ivtest@8ef8d1c#diff-c4613803e21f6123e3fc555f27a80c13

@drewrisinger
Copy link
Contributor Author

@GrahamcOfBorg build verilog

@drewrisinger
Copy link
Contributor Author

@GrahamcOfBorg build verilog

@drewrisinger
Copy link
Contributor Author

Failing on OfBorg due to OfBorg not evaluating due to not having #97807. Once OfBorg has that, I can track down the aarch64 build failure b/c I don't have a system to test that on.

@cole-h
Copy link
Member

cole-h commented Sep 14, 2020 •
edited

You could try asking for access to https://github.com/nix-community/aarch64-build-box (instructions in the README) -- unfortunately, ofborg deployment has been broken for a while, and we need Graham to fix it (who is unavailable on account of having a newborn to help take care of). It's been fixed, but to get three evaluators back, we need to deploy down to 1 evaluator, and then back up, which I don't currently have the time to do.

@drewrisinger
Copy link
Contributor Author

Ok, my workaround is to disable the failing tests on aarch64. We'll see if OfBorg passes, but then we should be good to merge.

@drewrisinger
verilog: cleanup
0d9a6e2 
Meta attributes were out of date or not in current style,
and some attributes of derivation were redundant.
@drewrisinger
verilog: add tests
ba886f7 
Run recommended self-tests from iverilog's CI.

Tests add about a minute to the build time on local machine
(2 -> 3 mins).
@drewrisinger
Copy link
Contributor Author

@GrahamcOfBorg build verilog

veprbl
veprbl approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

LGTM

@veprbl veprbl merged commit 7867aaf into NixOS:master Sep 25, 2020
@veprbl veprbl added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 25, 2020
@veprbl veprbl self-assigned this Sep 25, 2020
@drewrisinger
Copy link
Contributor Author

drewrisinger commented Sep 25, 2020 •
edited

@veprbl are you saying you want me to backport these tests to the release-20.09 branch? That wasn't my original intention since it's building fine on that channel currently.

@drewrisinger drewrisinger deleted the zhf/verilog branch September 25, 2020 16:43
@veprbl
Copy link
Member

veprbl commented Sep 25, 2020

@drewrisinger I thought we would want to run tests on release-20.09 as well, this would be nice if we need to do any fixes for verilog there.

@drewrisinger drewrisinger mentioned this pull request Sep 25, 2020
Merged
10 tasks
@veprbl veprbl added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Sep 25, 2020
@veprbl veprbl removed their assignment Sep 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 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
@drewrisinger @cole-h @veprbl