Skip to content

Commit

Permalink
Switch to using git submodules for Verilator and the compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
jbush001 committed Jan 9, 2016
1 parent f0a22fc commit f794aa4
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 16 deletions.
10 changes: 2 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.DS_Store
*.traceconfig
*.vcd
*.pyc
*.lst
Expand All @@ -10,12 +9,11 @@
*.d
*.a
*.bin
doom1.wad
pak0.pak
*.WAD
*.pak
statetrace.txt
a.out
output.png
diff.png
repak

CLASSDIR
Expand All @@ -25,7 +23,3 @@ hardware/fpga/de2-115/db/
hardware/fpga/de2-115/incremental_db/
hardware/fpga/de2-115/output_files/

tools/NyuziToolchain
tools/verilator


6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "tools/verilator"]
path = tools/verilator
url = http://git.veripool.org/git/verilator
[submodule "tools/NyuziToolchain"]
path = tools/NyuziToolchain
url = https://github.com/jbush001/NyuziToolchain.git
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
sudo: required

language: c

services:
- docker

# Don't download the compiler and Verilator (which aren't built here and
# are large)
git:
submodules: false

# Dockerfile is here: https://github.com/jbush001/NyuziBuildContainer
before_install:
- docker pull jeffbush001/nyuzi-build
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ includes an LLVM-based C++ toolchain, tests, and other tools. It is useful
for microarchitecture experimentation, performance modeling, and parallel
software development.

**Documentation:** https://github.com/jbush001/NyuziProcessor/wiki
**Mailing list:** https://groups.google.com/forum/#!forum/nyuzi-processor-dev
**License:** Apache 2.0
**Blog:** http://latchup.blogspot.com/
**Documentation:** https://github.com/jbush001/NyuziProcessor/wiki<br/>
**Mailing list:** https://groups.google.com/forum/#!forum/nyuzi-processor-dev<br/>
**License:** Apache 2.0<br/>
**Blog:** http://latchup.blogspot.com/<br/>

# Getting Started

Expand Down
9 changes: 5 additions & 4 deletions build/setup_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
# limitations under the License.
#

git submodule init
git submodule update

#
# Download and build the latest version of Verilator
# Build Verilator
#
(
git clone http://git.veripool.org/git/verilator tools/verilator
cd tools/verilator
git checkout -b verilator_3_880
autoconf
Expand All @@ -29,9 +31,8 @@ sudo make install
)

#
# Download and build the compiler
# Build the compiler toolchain
#
git clone https://github.com/jbush001/NyuziToolchain.git tools/NyuziToolchain
mkdir tools/NyuziToolchain/build
cd tools/NyuziToolchain/build
cmake ..
Expand Down
1 change: 1 addition & 0 deletions tools/NyuziToolchain
Submodule NyuziToolchain added at 46fdc4
1 change: 1 addition & 0 deletions tools/verilator
Submodule verilator added at 29daa5

0 comments on commit f794aa4

Please sign in to comment.