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

FOSS FPGA toolchain: bump versions and enable tests #68107

Merged
merged 12 commits into from Sep 28, 2019
Merged

FOSS FPGA toolchain: bump versions and enable tests #68107

merged 12 commits into from Sep 28, 2019

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Sep 4, 2019 •
edited by thoughtpolice

Motivation for this change

This gets the tests working and passing. Needed to bump nextpnr to fix a broken test and yosys to eliminate an unnecessary use of which, and bumped nmigen while I'm at it.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@emilazy emilazy requested a review from FRidh as a code owner September 4, 2019 15:07
@ofborg ofborg bot requested a review from thoughtpolice September 4, 2019 15:19
thoughtpolice
thoughtpolice approved these changes Sep 4, 2019
View reviewed changes
Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

lgtm

pkgs/development/compilers/yosys/default.nix
# checkPhase defaults to VERBOSE=y, which gets passed down to abc,
# which then does $(VERBOSE)gcc, which then complains about not
# being able to find ygcc. Life is pain.
checkFlags = [ " " ];
Copy link
Member

Choose a reason for hiding this comment

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

lol

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build yosys

@emilazy
Copy link
Member Author

emilazy commented Sep 4, 2019

(oops, hope that didn't cancel the build on linux)

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build yosys

@emilazy
Copy link
Member Author

emilazy commented Sep 4, 2019

Looks like I missed a few uses of which; waiting on YosysHQ/yosys#1354.

@emilazy
Copy link
Member Author

emilazy commented Sep 4, 2019

should hopefully build on macOS now!

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build yosys

@emilazy
Copy link
Member Author

emilazy commented Sep 4, 2019

Not sure if the make: command: Command not found is the cause of the Darwin timeout or just a red herring, but I'm considering giving up on computers and moving into the woods after diagnosing YosysHQ/yosys#1356.

@thoughtpolice thoughtpolice self-assigned this Sep 5, 2019
@emilazy emilazy mentioned this pull request Sep 6, 2019
Closed
@emilazy emilazy changed the title {yosys,nextpnr}: enable tests {yosys,nextpnr,glasgow}: enable tests Sep 27, 2019
@emilazy emilazy changed the title {yosys,nextpnr,glasgow}: enable tests FOSS FPGA toolchain: bump versions and enable tests Sep 27, 2019
@emilazy
Copy link
Member Author

emilazy commented Sep 27, 2019

All tests should be passing now, including on Darwin, and Glasgow's tests should now run successfully too, thanks to some more version bumps. Having now received my Glasgow revC1, I can confirm that the toolchain works end-to-end :)

[emily@yukari:~/src/nixpkgs]$ sudo glasgow run benchmark
Please touch the device.
I: g.device.hardware: building bitstream ID a92c784613f4e3ff9d79b5a993b0ef4b
I: g.cli: running handler for applet 'benchmark'
I: g.applet.internal.benchmark: running benchmark mode source for 8.000 MiB
I: g.applet.internal.benchmark: mode source: 43.18 MiB/s (345.47 Mb/s)
I: g.applet.internal.benchmark: running benchmark mode sink for 8.000 MiB
I: g.applet.internal.benchmark: mode sink: 38.17 MiB/s (305.36 Mb/s)
I: g.applet.internal.benchmark: running benchmark mode loopback for 8.000 MiB
I: g.applet.internal.benchmark: mode loopback: 44.33 MiB/s (354.64 Mb/s)
I: g.applet.internal.benchmark: running benchmark mode latency for 8.000 MiB
I: g.applet.internal.benchmark: mode latency: 457.55 µs stddev: 111.84 µs

@emilazy
Copy link
Member Author

emilazy commented Sep 27, 2019

(ah right, need someone to kick off the Darwin yosys/nextpnr/glasgow builds for me)

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build libfx2, nextpnr, trellis, verilog, yosys

@emilazy
Copy link
Member Author

emilazy commented Sep 27, 2019

(@thoughtpolice commas broke it and you missed off glasgow ^^; )

@emilazy emilazy force-pushed the enable-yosys-nextpnr-tests branch 2 times, most recently from 7426b63 to 9cf3632 Compare September 28, 2019 10:00
@thoughtpolice
Copy link
Member

@GrahamcOfBorg build nextpnr trellis verilog yosys glasgow

@thoughtpolice
Copy link
Member

NextPNR is simply too much to build on probably ~all of the macOS builders within the timeout window, so we'll go ahead and merge and flush out Darwin builds as needed. Thank you @emilazy!

@thoughtpolice thoughtpolice merged commit 67393f6 into NixOS:master Sep 28, 2019
@emilazy emilazy mentioned this pull request Feb 10, 2020
Merged
10 tasks
@emilazy emilazy deleted the enable-yosys-nextpnr-tests branch February 10, 2020 19:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@thoughtpolice thoughtpolice thoughtpolice approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees

@thoughtpolice thoughtpolice

Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@emilazy @thoughtpolice @jonringer