Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d0e10e5d2ad8
Choose a base ref
...
head repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f83b95231f95
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 22, 2019

  1. Travis: build Yosys and nextpnr.

    @whitequark
    whitequark committed Sep 22, 2019
    Copy the full SHA
    22e8bc9 View commit details

  2. target.hardware: force use of abc9 and HeAP. 

    This significantly improves QoS and reduces time spent in placement.
    @whitequark
    whitequark committed Sep 22, 2019
    Copy the full SHA
    f83b952 View commit details
Showing with 10 additions and 1 deletion.
  1. +4 −0 .travis.yml
  2. +6 −1 software/glasgow/target/hardware.py
4 changes: 4 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@ before_install:
- sudo apt install sdcc
install:
- "(cd vendor/libfx2/software && SDAR='sdcclib r' python setup.py install)"
- git clone https://github.com/YosysHQ/yosys
- (cd yosys && if ! yosys -V || [ $(git rev-parse HEAD $(yosys -V | awk 'match($0,/sha1 ([0-9a-f]+)/,m) { print m[1] }') | uniq | wc -l) != 1 ]; then make CONFIG=gcc ENABLE_ABC=0 PREFIX=$HOME/.local install; fi)
- git clone https://github.com/YosysHQ/nextpnr
- (cd nextpnr && if ! nextpnr-ice40 --version || [ $(git rev-parse HEAD $(nextpnr-ice40 --version | awk 'match($0,/sha1 ([0-9a-f]+)/,m) { print m[1] }') | uniq | wc -l) != 1 ]; then sudo apt install libeigen3-dev python3-dev libboost-all-dev && mkdir build-ice40 && cd build-ice40 && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DBUILD_GUI=OFF && make install; fi)
script:
- "(cd software && python setup.py install)"
- "(cd software && python setup.py test)"
7 changes: 6 additions & 1 deletion software/glasgow/target/hardware.py
View file
Original file line number Diff line number Diff line change
@@ -85,7 +85,12 @@ def finalize(self, *args, **kwargs):
super().finalize(*args, **kwargs)

def build_plan(self, **kwargs):
return GlasgowBuildPlan(self.platform.prepare(self, **kwargs))
overrides = {
"synth_opts": ["-abc9"],
"nextpnr_opts": ["--placer", "heap"],
}
overrides.update(kwargs)
return GlasgowBuildPlan(self.platform.prepare(self, **overrides))


class GlasgowBuildPlan: