Skip to content

Commit

Permalink
Merge branch 'dev' into top_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dpetrisko committed Mar 16, 2021
2 parents 62462ae + 378c46a commit 4a12047
Show file tree
Hide file tree
Showing 163 changed files with 608 additions and 9,744 deletions.
30 changes: 5 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,8 @@
.DS_STORE
bsg_cadenv
external/*
*.swp
*.pyc
*.log
*.s
*.bin
*.hex
*.mem
*.nbf
*.elf
*.riscv
*.s
*.dump
*.pl
*_gendata.pl
*.o
*.a
*.png
results/
reports/
logs/
bp_common/test/bin/
bp_common/test/lib/
bp_common/test/include/
spec2000/
reports/
DVEfiles/
*.tr
*.pyc
external/
regress_logs/
120 changes: 48 additions & 72 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
variables:
GIT_STRATEGY: clone
GIT_SUBMODULE_STRATEGY: none
GIT_SUBMODULE_STRATEGY: normal

## CI Stages:
# manual: Manual jobs used to do CI maintainance, like wiping the directory or clearing cache
# prep : Jobs to ensure the repo is up to date with tools and progs
# prep : Jobs to ensure the repo is up to date with tools, prog and ucode
# check : Sanity checks of RTL quality
# test-short :
# test-medium:
Expand Down Expand Up @@ -37,16 +37,12 @@ bleach_all:
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- $CI_PROJECT_DIR/bp_common/test/mem
- $CI_PROJECT_DIR/external/bin
- $CI_PROJECT_DIR/external/lib
- $CI_PROJECT_DIR/external/lib64
- $CI_PROJECT_DIR/external/lib-linux64
- $CI_PROJECT_DIR/external/libexec
- $CI_PROJECT_DIR/external/include
- $CI_PROJECT_DIR/external/riscv64-unknown-elf-dramfs
- $CI_PROJECT_DIR/external/share
- $CI_PROJECT_DIR/external/touchfiles
- $CI_PROJECT_DIR/tools/install
- $CI_PROJECT_DIR/sdk/install
- $CI_PROJECT_DIR/sdk/include
- $CI_PROJECT_DIR/sdk/lib
- $CI_PROJECT_DIR/sdk/prog
- $CI_PROJECT_DIR/sdk/ucode
policy: push

update-cache: &update-cache-manual
Expand All @@ -58,21 +54,22 @@ update-cache: &update-cache-manual
- git submodule deinit -f .
- git submodule sync
- make prep -j $CI_CORES > make_prep.log
- make tidy_tools > make_tidy_tools.log
- make -C sdk prog -j $CI_CORES > make_prog.log
- make tidy > make_tidy.log
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- $CI_PROJECT_DIR/bp_common/test/mem
- $CI_PROJECT_DIR/external/bin
- $CI_PROJECT_DIR/external/lib
- $CI_PROJECT_DIR/external/lib64
- $CI_PROJECT_DIR/external/lib-linux64
- $CI_PROJECT_DIR/external/libexec
- $CI_PROJECT_DIR/external/include
- $CI_PROJECT_DIR/external/riscv64-unknown-elf-dramfs
- $CI_PROJECT_DIR/external/share
- $CI_PROJECT_DIR/external/touchfiles
- $CI_PROJECT_DIR/tools/install
- $CI_PROJECT_DIR/sdk/install
- $CI_PROJECT_DIR/sdk/include
- $CI_PROJECT_DIR/sdk/lib
- $CI_PROJECT_DIR/sdk/prog
- $CI_PROJECT_DIR/sdk/ucode
policy: push
artifacts:
when: always
paths:
- "*.log"

.job_template: &job_definition
only:
Expand All @@ -87,8 +84,6 @@ update-cache: &update-cache-manual
- echo "Updating hardware libraries"
- git submodule update --init --recursive external/basejump_stl
- git submodule update --init --recursive external/HardFloat
- echo "Making CCE ucode"
- make ucode > make_ucode.log
artifacts:
when: always
paths:
Expand All @@ -98,16 +93,12 @@ update-cache: &update-cache-manual
cache: &global_cache
key: $CI_COMMIT_REF_SLUG
paths:
- $CI_PROJECT_DIR/bp_common/test/mem
- $CI_PROJECT_DIR/external/bin
- $CI_PROJECT_DIR/external/lib
- $CI_PROJECT_DIR/external/lib64
- $CI_PROJECT_DIR/external/lib-linux64
- $CI_PROJECT_DIR/external/libexec
- $CI_PROJECT_DIR/external/include
- $CI_PROJECT_DIR/external/riscv64-unknown-elf-dramfs
- $CI_PROJECT_DIR/external/share
- $CI_PROJECT_DIR/external/touchfiles
- $CI_PROJECT_DIR/tools/install
- $CI_PROJECT_DIR/sdk/install
- $CI_PROJECT_DIR/sdk/include
- $CI_PROJECT_DIR/sdk/lib
- $CI_PROJECT_DIR/sdk/prog
- $CI_PROJECT_DIR/sdk/ucode
policy: pull
dependencies: []
retry:
Expand All @@ -116,51 +107,35 @@ update-cache: &update-cache-manual
- script_failure

prep:
<<: *job_definition
stage: prep
only:
- master
- dev
- fe_dev
- be_dev
- me_dev
- top_dev
- sw_dev
tags:
- bsg
script:
- make prep -j $CI_CORES > make_prep.log
- make -C sdk prog -j $CI_CORES > make_prog.log
- make tidy > make_tidy.log
cache: &global_cache
key: $CI_COMMIT_REF_SLUG
paths:
- $CI_PROJECT_DIR/bp_common/test/mem
- $CI_PROJECT_DIR/external/bin
- $CI_PROJECT_DIR/external/lib
- $CI_PROJECT_DIR/external/libexec
- $CI_PROJECT_DIR/external/lib64
- $CI_PROJECT_DIR/external/lib-linux64
- $CI_PROJECT_DIR/external/libexec
- $CI_PROJECT_DIR/external/include
- $CI_PROJECT_DIR/external/riscv64-unknown-elf-dramfs
- $CI_PROJECT_DIR/external/share
- $CI_PROJECT_DIR/external/touchfiles
- $CI_PROJECT_DIR/tools/install
- $CI_PROJECT_DIR/sdk/install
- $CI_PROJECT_DIR/sdk/include
- $CI_PROJECT_DIR/sdk/lib
- $CI_PROJECT_DIR/sdk/prog
- $CI_PROJECT_DIR/sdk/ucode
policy: pull-push

## This job runs on fix branches only. We generally assume fix branches do not have major
# architectural changes that need to be thoroughly tested. Simply checking synthesizability
# susses out most typos.
# TODO: This target is not super useful, but consumes a lot of CI cycles...
#fix_job:
# only:
# - /^.*fix.*$/
# stage: check
# tags:
# - bsg
# - vcs
# script:
# - $CI_PROJECT_DIR/ci/check_design.sh
# - make -C bp_top/syn clean
# cache:
# key: "dev"
# paths:
# - $CI_PROJECT_DIR/external/
# policy: pull
# artifacts:
# when: always
# paths:
# - "bp_top/syn/reports/"
artifacts:
when: always
paths:
- "*.log"

check-design:
<<: *job_definition
Expand Down Expand Up @@ -363,11 +338,12 @@ top-misc-verilator:

top-riscvdv-vcs:
<<: *job_definition
when: manual
stage: test-medium
allow_failure: true
tags:
- vcs
script:
- make -C sdk riscv-dv
- $CI_PROJECT_DIR/ci/single_core_testlist.sh vcs RISCVDV_TESTLIST $CI_CORES

# Verilator 4.104 "internal error"
Expand Down
166 changes: 43 additions & 123 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,127 +1,47 @@
[submodule "external/axe"]
path = external/axe
url = https://github.com/black-parrot/axe
branch = blackparrot_mods
ignore = dirty

[submodule "external/riscv-gnu-toolchain"]
path = external/riscv-gnu-toolchain
url = https://github.com/black-parrot/riscv-gnu-toolchain
branch = blackparrot_mods
ignore = dirty

[submodule "external/verilator"]
path = external/verilator
url = http://git.veripool.org/git/verilator
branch = master
ignore = dirty
[submodule "sdk"]
path = sdk
url = https://github.com/black-parrot-sdk/black-parrot-sdk
branch = master
update = checkout

[submodule "hdk"]
path = hdk
url = https://github.com/black-parrot-hdk/black-parrot-hdk
branch = master
update = checkout

[submodule "tools/systemc"]
path = tools/systemc
url = https://github.com/bsg-external/systemc
branch = master
ignore = dirty
update = none
[submodule "tools/verilator"]
path = tools/verilator
url = https://github.com/verilator/verilator
branch = master
ignore = untracked
update = none
[submodule "tools/bsg_sv2v"]
path = tools/bsg_sv2v
url = https://github.com/bespoke-silicon-group/bsg_sv2v
branch = master
ignore = untracked
update = none

[submodule "external/basejump_stl"]
path = external/basejump_stl
url = https://github.com/bespoke-silicon-group/basejump_stl.git
branch = master
ignore = dirty

[submodule "bp_common/test/src/riscv-tests"]
path = bp_common/test/src/riscv-tests
url = https://github.com/black-parrot/riscv-tests.git
branch = blackparrot_mods
ignore = dirty

[submodule "bp_common/test/src/coremark"]
path = bp_common/test/src/coremark
url = https://github.com/black-parrot/coremark.git
branch = blackparrot_mods
ignore = dirty

[submodule "bp_common/test/src/opensbi"]
path = bp_common/test/src/opensbi
url = https://github.com/black-parrot/opensbi.git
branch = blackparrot_mods
ignore = dirty

[submodule "bp_common/test/src/riscv-pk"]
path = bp_common/test/src/riscv-pk
url = https://github.com/black-parrot/riscv-pk.git
branch = blackparrot_mods
ignore = dirty

[submodule "bp_common/test/src/beebs"]
path = bp_common/test/src/beebs
url = https://github.com/black-parrot/beebs.git
branch = blackparrot_mods
ignore = dirty

[submodule "bp_common/test/src/riscv-dv"]
path = bp_common/test/src/riscv-dv
url = https://github.com/black-parrot/riscv-dv.git
branch = blackparrot_mods
ignore = dirty

[submodule "external/cmurphi"]
path = external/cmurphi
url = https://github.com/black-parrot/cmurphi.git
branch = master
ignore = dirty

[submodule "external/dromajo"]
path = external/dromajo
url = https://github.com/bsg-external/dromajo.git
branch = blackparrot_mods
ignore = dirty

[submodule "external/dtc"]
path = external/dtc
url = https://git.kernel.org/pub/scm/utils/dtc/dtc.git
branch = master
ignore = dirty

[submodule "external/bsg_sv2v"]
path = external/bsg_sv2v
url = https://github.com/bespoke-silicon-group/bsg_sv2v.git
branch = master
ignore = dirty

[submodule "external/systemc"]
path = external/systemc
url = https://github.com/bsg-external/systemc.git
branch = master
ignore = dirty

[submodule "bp_common/test/src/bp_tests"]
path = bp_common/test/src/bp_tests
url = https://github.com/black-parrot/bp_tests.git
branch = master
ignore = dirty

[submodule "bp_common/test/src/linux"]
path = bp_common/test/src/linux
url = https://github.com/torvalds/linux
branch = master
ignore = dirty

[submodule "bp_common/test/src/buildroot"]
path = bp_common/test/src/buildroot
url = https://github.com/buildroot/buildroot
branch = master
ignore = dirty

path = external/basejump_stl
url = https://github.com/bespoke-silicon-group/basejump_stl.git
branch = master
update = checkout
[submodule "external/HardFloat"]
path = external/HardFloat
url = https://github.com/bsg-external/HardFloat.git
branch = master
ignore = dirty

[submodule "bp_common/test/src/spec/spec2000"]
path = bp_common/test/src/spec/spec2000
url = https://github.com/black-parrot/spec2000
branch = blackparrot_mods
update = none
ignore = dirty

[submodule "bp_common/test/src/riscv-opcodes"]
path = bp_common/test/src/riscv-opcodes
url = https://github.com/riscv/riscv-opcodes.git
branch = master
ignore = dirty

path = external/HardFloat
url = https://github.com/bsg-external/HardFloat.git
branch = master
update = checkout
[submodule "external/bsg_cadenv"]
path = external/bsg_cadenv
url = https://github.com/bespoke-silicon-group/bsg_cadenv
branch = master
update = none
Loading

0 comments on commit 4a12047

Please sign in to comment.