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

[WIP] Use newer C++, target IMC platform, fix Ubuntu image version #9

Closed
wants to merge 4 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build-spike.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
verilator:
name: Build Spike
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
TOOL_NAME: spike
TOOL_VERSION: d70ea67d
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-verilator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
verilator:
name: Build Verilator
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-pr-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: PR Remove
concurrency:
group: gh-pages
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-pr-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
comment:
name: PR Comment
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
pull-requests: write
if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-pr-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: PR Deploy
concurrency:
group: gh-pages
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: write
if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-pr-remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: PR Remove Deploy
concurrency:
group: gh-pages
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-webpage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build and Main Deploy
concurrency:
group: gh-pages
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

coverage-report:
name: Coverage report
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
DEBIAN_FRONTEND: "noninteractive"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

regression-tests:
name: Regression tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
bus: ["axi", "ahb"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-riscof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

tests:
name: Run RISCOF tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-riscv-dv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
#--------------#
renode:
name: Download Renode
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
CCACHE_DIR: "/opt/veer-el2/.cache/"
DEBIAN_FRONTEND: "noninteractive"
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
#--------------#
veer-iss:
name: Build VeeR-ISS
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
CCACHE_DIR: "/opt/veer-el2/.cache/"
DEBIAN_FRONTEND: "noninteractive"
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
#--------------#
generate-config:
name: Generate configs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
test-types: ${{ steps.test-types.outputs.tests }}
test-include-generate: ${{ steps.test-types.outputs.include-generate }}
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:

run-tests:
name: Run RISC-V DV tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [ veer-iss, renode, generate-config, generate-code ]
strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-uarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
jobs:
lint:
name: Lint microarchitectural tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Setup repository
uses: actions/checkout@v3
Expand All @@ -34,7 +34,7 @@ jobs:
popd
tests:
name: Microarchitectural tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-uvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
tests:
name: UVM tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
CCACHE_DIR: "/opt/uvm/.cache/"
VERILATOR_VERSION: uvm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
jobs:
tests:
name: Verification tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
test: ["test_pyuvm"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verible-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
format-review:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
checks: write
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verible-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
lint-review:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
checks: write
contents: read
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ installed so that it can be used to prepare RISCV binaries to run.
## Quickstart guide

1. Clone the repository, clone submodules with `git submodule update --init --recursive`
1. Setup `RV_ROOT` to point to the path in your local filesystem
1. Determine your configuration (optional)
1. Set `RV_ROOT` to the root path of this repository in your filesystem
1. Apply optional configuration (see _Configurations_ section)
1. Run `make` with `tools/Makefile`

## Release Notes for this version
Expand Down
5 changes: 2 additions & 3 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,8 @@ defines += ${RV_ROOT}/design/include/el2_def.sv
defines += $(BUILD_DIR)/el2_pdef.vh
includes = -I${BUILD_DIR}

# CFLAGS for verilator generated Makefiles. Without -std=c++11 it
# complains for `auto` variables
CFLAGS += -std=c++11
# Verilator supports only C++14 and newer
CFLAGS += -std=c++14

# Optimization for better performance; alternative is nothing for
# slower runtime (faster compiles) -O2 for faster runtime (slower
Expand Down
2 changes: 1 addition & 1 deletion tools/picolibc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $(INSTALL_PATH)/picolibc.specs: $(BUILD_PATH)/cross.txt | $(BUILD_PATH)

cd $(PICOLIBC_PATH) && meson $(BUILD_PATH) \
-Dmultilib=true \
-Dmultilib-list=rv32imac/ilp32 \
-Dmultilib-list=rv32imc/ilp32 \
-Dpicocrt=false \
-Datomic-ungetc=false \
-Dthread-local-storage=false \
Expand Down
Loading