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

Bump snitch #27

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .github/workflows/build-docker.yml

This file was deleted.

77 changes: 73 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,102 @@ name: ci
on: [push, pull_request]
jobs:

##########################
# Build Docker Container #
##########################

build-docker:
name: Deploy Docker image
runs-on: ubuntu-22.04
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
- name: GHCR Log-in
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v6
with:
context: .
cache-from: type=gha
cache-to: type=gha,mode=max`
file: util/container/Dockerfile
push: true
tags: ghcr.io/pulp-platform/occamy:${{ github.ref_name }}
build-args: |-
SNITCH_LLVM_VERSION=latest

########
# Docs #
########

docs:
name: Build documentation
runs-on: ubuntu-22.04
needs: build-docker
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
container:
image: ghcr.io/pulp-platform/occamy:main
image: ghcr.io/pulp-platform/occamy:${{ github.ref_name }}
steps:
- uses: actions/checkout@v2
- name: Build docs
run: |
bender update && bender checkout
bender checkout
mkdocs build

######################
# Clang-Format Check #
######################

clangfmt:
name: Lint C/C++ Sources
runs-on: ubuntu-22.04
needs: build-docker
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
container:
image: ghcr.io/pulp-platform/occamy:${{ github.ref_name }}
steps:
- name: Check out source repository
uses: actions/checkout@v2
# Re-use .clang-format from Snitch cluster
- name: Get snitch_cluster dependency
run: |
bender checkout
- name: Lint C sources
uses: DoozyX/clang-format-lint-action@v0.16.2
with:
clangFormatVersion: 10

#######################
# Build SW for Occamy #
#######################

occamy-sw:
name: Build SW for Occamy
runs-on: ubuntu-22.04
needs: build-docker
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
container:
image: ghcr.io/pulp-platform/occamy:main
image: ghcr.io/pulp-platform/occamy:${{ github.ref_name }}
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Build Software
run: |
bender checkout
make -C target/sim sw

###############################
Expand All @@ -47,8 +112,12 @@ jobs:
occamy-rtl:
name: Generate Occamy RTL sources
runs-on: ubuntu-22.04
needs: build-docker
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
container:
image: ghcr.io/pulp-platform/occamy:main
image: ghcr.io/pulp-platform/occamy:${{ github.ref_name }}
steps:
- uses: actions/checkout@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gitlab-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- name: Check Gitlab CI
uses: pulp-platform/pulp-actions/gitlab-ci@v2.1.0
# Skip on forks or pull requests from forks due to missing secrets.
if:
# yamllint disable rule:line-length
github.repository == 'pulp-platform/occamy' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
# yamllint enable rule:line-length
if: >
github.repository == 'pulp-platform/snitch_cluster' &&
(github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name == github.repository)
with:
domain: iis-git.ee.ethz.ch
repo: github-mirror/occamy
Expand Down
48 changes: 25 additions & 23 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ jobs:
################
# Verible Lint #
################

verible-lint:
name: Lint Verilog sources
runs-on: ubuntu-latest
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@v3
- uses: chipsalliance/verible-linter-action@main
Expand All @@ -31,19 +35,27 @@ jobs:
#####################
# Vendor Up-to-Date #
#####################

bender-vendor-up-to-date:
name: Check bender vendor up-to-date
runs-on: ubuntu-latest
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Check bender vendor up-to-date
uses: pulp-platform/pulp-actions/bender-vendor-up-to-date@v2.1.0

#################
# Check License #
#################

license-lint:
name: Check License headers
runs-on: ubuntu-latest
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Check License
uses: pulp-platform/pulp-actions/lint-license@v2.1.0
Expand All @@ -67,9 +79,13 @@ jobs:
##################
# Lint YML Files #
##################

yaml-lint:
name: Lint YAML Sources
runs-on: ubuntu-latest
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@v3
- name: yaml-lint
Expand All @@ -80,9 +96,13 @@ jobs:
########################
# Check Python Sources #
########################

python-lint:
runs-on: ubuntu-latest
name: Lint Python Sources
runs-on: ubuntu-latest
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Check out source repository
uses: actions/checkout@v3
Expand All @@ -95,34 +115,16 @@ jobs:
with:
max-line-length: "100"

######################
# Clang-Format Check #
######################
# Check C/C++ files for correct formatting.
clangfmt:
name: Lint C/C++ Sources
runs-on: ubuntu-latest
container:
image: ghcr.io/pulp-platform/occamy:main
steps:
- name: Check out source repository
uses: actions/checkout@v2
# Re-use .clang-format from Snitch cluster
- name: Get snitch_cluster dependency
run: |
bender update
- name: Lint C sources
uses: DoozyX/clang-format-lint-action@v0.16.2
with:
clangFormatVersion: 10

######################
# Lint Editor Config #
######################
# Detect trailing whitespaces, missing new lines and wrong file encodings.

editorconfig-lint:
name: Lint Editorconfig
runs-on: ubuntu-latest
if: >
github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@v3
- uses: editorconfig-checker/action-editorconfig-checker@main
Expand Down
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
variables:
GIT_STRATEGY: clone
GIT_SUBMODULE_STRATEGY: recursive
# Enable colors in CI terminal
TERM: ansi
FORCE_COLOR: 1

before_script:
source iis-setup.sh
Expand Down
18 changes: 9 additions & 9 deletions Bender.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ packages:
Git: /~https://github.com/pulp-platform/apb_uart.git
dependencies: []
axi:
revision: 587355b77b8ce94dcd600efbd5d5bd118ff913a7
version: 0.39.4
revision: 39f5f2d51c5e524f6fc5cf8b6e901f7dcc5622d7
version: 0.39.6
source:
Git: /~https://github.com/pulp-platform/axi.git
dependencies:
Expand Down Expand Up @@ -80,8 +80,8 @@ packages:
- common_verification
- tech_cells_generic
common_verification:
revision: 9c07fa860593b2caabd9b5681740c25fac04b878
version: 0.2.3
revision: fa2630f61666f61d9d78451c4d8b4d1ea403944e
version: 0.2.4
source:
Git: /~https://github.com/pulp-platform/common_verification.git
dependencies: []
Expand Down Expand Up @@ -111,8 +111,8 @@ packages:
dependencies:
- common_cells
idma:
revision: c12caf59bb482fe44b27361f6924ad346b2d22fe
version: 0.6.3
revision: d4010425e943c9845b8549b3c8f8cc8dba73ec47
version: null
source:
Git: /~https://github.com/pulp-platform/iDMA
dependencies:
Expand All @@ -139,8 +139,8 @@ packages:
- common_cells
- register_interface
register_interface:
revision: ae616e5a1ec2b41e72d200e5ab09c65e94aebd3d
version: 0.4.4
revision: 5daa85d164cf6b54ad061ea1e4c6f3624556e467
version: 0.4.5
source:
Git: /~https://github.com/pulp-platform/register_interface.git
dependencies:
Expand All @@ -163,7 +163,7 @@ packages:
Git: /~https://github.com/pulp-platform/scm.git
dependencies: []
snitch_cluster:
revision: da57b043dfe0ba563a55a9d83bf362873c713648
revision: 73d47eddf9a77798dd9f0da33a7a6e5d9afb626d
version: null
source:
Git: /~https://github.com/pulp-platform/snitch_cluster.git
Expand Down
2 changes: 1 addition & 1 deletion Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
snitch_cluster: { git: /~https://github.com/pulp-platform/snitch_cluster.git, rev: occamy }
tech_cells_generic: { git: /~https://github.com/pulp-platform/tech_cells_generic.git, rev: v0.2.11 }
cluster_icache: { git: /~https://github.com/pulp-platform/cluster_icache.git, version: 0.1.0 }
idma: { git: /~https://github.com/pulp-platform/iDMA, version: 0.6.0 }
idma: { git: /~https://github.com/pulp-platform/iDMA, rev: __deploy__110fd06__master }

workspace:
package_links:
Expand Down
2 changes: 1 addition & 1 deletion docs/publications.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
If you use Occamy in your work, you can cite us:

{%
include-markdown '../deps/snitch_cluster/docs/publications.md'
include-markdown '../deps/snitch_cluster/README.md'
start="<!--start-publications-->"
end="<!--end-publications-->"
%}
19 changes: 0 additions & 19 deletions docs/schema-doc/address_range-properties-address.md

This file was deleted.

19 changes: 0 additions & 19 deletions docs/schema-doc/address_range-properties-length.md

This file was deleted.

Loading
Loading