Skip to content

Commit 9cd9a45

Browse files
Merge branch 'main' into merge-before-isolation
Signed-off-by: james-ball-qualcomm <[email protected]>
2 parents 5fc7458 + dbaf530 commit 9cd9a45

File tree

623 files changed

+3227
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

623 files changed

+3227
-87
lines changed

.devcontainer/Dockerfile

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,35 @@ WORKDIR /workspace
66

77
RUN export DEBIAN_FRONTEND=noninteractive
88
RUN apt-get update
9-
RUN apt-get install -y --no-install-recommends git \
10-
gh \
11-
less \
12-
python3 \
13-
python3.12-venv \
14-
python3-pip \
15-
build-essential \
16-
ruby \
17-
ruby-dev \
18-
bundler \
19-
nodejs \
20-
npm \
21-
ditaa \
22-
libyaml-dev \
23-
cmake \
24-
g++ \
25-
clang-format \
26-
clang-tidy \
27-
libelf-dev \
28-
gcc-riscv64-unknown-elf
9+
10+
# please keep pkgs sorted
11+
RUN apt-get install -y --no-install-recommends \
12+
build-essential \
13+
bundler \
14+
clang-format \
15+
clang-tidy \
16+
cmake \
17+
ditaa \
18+
g++ \
19+
gcc-riscv64-linux-gnu \
20+
gcc-riscv64-unknown-elf \
21+
gdb \
22+
gh \
23+
git \
24+
less \
25+
libc6-dev-riscv64-cross \
26+
libelf-dev \
27+
libgmp-dev \
28+
libyaml-dev \
29+
nodejs \
30+
npm \
31+
python3 \
32+
python3-pip \
33+
python3.12-venv \
34+
ruby \
35+
ruby-dev \
36+
shellcheck
37+
2938
RUN apt-get clean autoclean
3039
RUN apt-get autoremove -y
3140
RUN rm -rf /var/lib/{apt,dpkg,cache,log}/*

.github/workflows/regress.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,3 +191,31 @@ jobs:
191191
run: ./bin/build_container
192192
- name: Generate extension PDF
193193
run: ./do gen:profile_release_pdf[Mock]
194+
regress-gen-go:
195+
runs-on: ubuntu-latest
196+
env:
197+
SINGULARITY: 1
198+
steps:
199+
- name: Clone Github Repo Action
200+
uses: actions/checkout@v4
201+
- name: Setup apptainer
202+
uses: eWaterCycle/[email protected]
203+
- name: Get container from cache
204+
id: cache-sif
205+
uses: actions/cache@v4
206+
with:
207+
path: .singularity/image.sif
208+
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
209+
- name: Get gems and node files from cache
210+
id: cache-bundle-npm
211+
uses: actions/cache@v4
212+
with:
213+
path: |
214+
.home/.gems
215+
node_modules
216+
key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
217+
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
218+
name: Build container
219+
run: ./bin/build_container
220+
- name: Generate Go code
221+
run: ./do gen:go

.pre-commit-config.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
exclude: schemas/json-schema-draft-07.json
3131

3232
- repo: https://github.com/python-jsonschema/check-jsonschema
33-
rev: 0.31.3
33+
rev: 0.32.1
3434
hooks:
3535
- id: check-jsonschema
3636
alias: check-jsonschema-inst
@@ -59,7 +59,7 @@ repos:
5959
# args: ["--schemafile", "schemas/manual_version_schema.json"]
6060

6161
- repo: https://github.com/pre-commit/mirrors-clang-format
62-
rev: "v18.1.3"
62+
rev: "v20.1.0"
6363
hooks:
6464
- id: clang-format
6565
types_or: [c++, c]
@@ -74,11 +74,14 @@ repos:
7474
hooks:
7575
- id: pyupgrade
7676

77-
# - repo: https://github.com/koalaman/shellcheck-precommit
78-
# rev: v0.10.0
79-
# hooks:
80-
# - id: shellcheck
81-
# args: ["--severity=error"]
77+
- repo: local
78+
hooks:
79+
- id: shellcheck
80+
name: shellcheck
81+
types: [shell]
82+
language: system
83+
entry: shellcheck
84+
args: ["--severity=error"]
8285

8386
- repo: https://github.com/scop/pre-commit-shfmt
8487
rev: v3.11.0-1

Rakefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,10 @@ namespace :test do
468468
puts "UPDATE: Generating MockProfileRelease.pdf"
469469
Rake::Task["#{$root}/gen/profile/pdf/MockProfileRelease.pdf"].invoke
470470

471+
puts "UPDATE: Generating Go Language Support"
472+
Rake::Task["gen:go"].invoke
473+
471474
puts "UPDATE: Done test:regress"
472-
puts "Regression test PASSED"
473475
end
474476

475477
desc <<~DESC

arch/inst/A/amoadd.d.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ operation(): |
4444
4545
X[rd] = amo<64>(virtual_address, X[rs2], AmoOperation::Add, aq, rl, $encoding);
4646
47+
# SPDX-SnippetBegin
48+
# SPDX-FileCopyrightText: 2017-2025 Contributors to the RISCV Sail Model <https://github.com/riscv/sail-riscv/blob/master/LICENCE>
49+
# SPDX-License-Identifier: BSD-2-Clause
4750
sail(): |
4851
{
4952
if extension("A") then {
@@ -134,3 +137,5 @@ sail(): |
134137
RETIRE_FAIL
135138
}
136139
}
140+
141+
# SPDX-SnippetEnd

arch/inst/A/amoadd.w.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ operation(): |
4343
4444
X[rd] = amo<32>(virtual_address, X[rs2][31:0], AmoOperation::Add, aq, rl, $encoding);
4545
46+
# SPDX-SnippetBegin
47+
# SPDX-FileCopyrightText: 2017-2025 Contributors to the RISCV Sail Model <https://github.com/riscv/sail-riscv/blob/master/LICENCE>
48+
# SPDX-License-Identifier: BSD-2-Clause
4649
sail(): |
4750
{
4851
if extension("A") then {
@@ -133,3 +136,5 @@ sail(): |
133136
RETIRE_FAIL
134137
}
135138
}
139+
140+
# SPDX-SnippetEnd

arch/inst/A/amoand.d.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ operation(): |
4444
4545
X[rd] = amo<64>(virtual_address, X[rs2], AmoOperation::And, aq, rl, $encoding);
4646
47+
# SPDX-SnippetBegin
48+
# SPDX-FileCopyrightText: 2017-2025 Contributors to the RISCV Sail Model <https://github.com/riscv/sail-riscv/blob/master/LICENCE>
49+
# SPDX-License-Identifier: BSD-2-Clause
4750
sail(): |
4851
{
4952
if extension("A") then {
@@ -134,3 +137,5 @@ sail(): |
134137
RETIRE_FAIL
135138
}
136139
}
140+
141+
# SPDX-SnippetEnd

arch/inst/A/amoand.w.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ operation(): |
4343
4444
X[rd] = amo<32>(virtual_address, X[rs2][31:0], AmoOperation::And, aq, rl, $encoding);
4545
46+
# SPDX-SnippetBegin
47+
# SPDX-FileCopyrightText: 2017-2025 Contributors to the RISCV Sail Model <https://github.com/riscv/sail-riscv/blob/master/LICENCE>
48+
# SPDX-License-Identifier: BSD-2-Clause
4649
sail(): |
4750
{
4851
if extension("A") then {
@@ -133,3 +136,5 @@ sail(): |
133136
RETIRE_FAIL
134137
}
135138
}
139+
140+
# SPDX-SnippetEnd

arch/inst/A/amomax.d.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ operation(): |
4444
4545
X[rd] = amo<64>(virtual_address, X[rs2], AmoOperation::Max, aq, rl, $encoding);
4646
47+
# SPDX-SnippetBegin
48+
# SPDX-FileCopyrightText: 2017-2025 Contributors to the RISCV Sail Model <https://github.com/riscv/sail-riscv/blob/master/LICENCE>
49+
# SPDX-License-Identifier: BSD-2-Clause
4750
sail(): |
4851
{
4952
if extension("A") then {
@@ -134,3 +137,5 @@ sail(): |
134137
RETIRE_FAIL
135138
}
136139
}
140+
141+
# SPDX-SnippetEnd

arch/inst/A/amomax.w.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ operation(): |
4343
4444
X[rd] = amo<32>(virtual_address, X[rs2][31:0], AmoOperation::Max, aq, rl, $encoding);
4545
46+
# SPDX-SnippetBegin
47+
# SPDX-FileCopyrightText: 2017-2025 Contributors to the RISCV Sail Model <https://github.com/riscv/sail-riscv/blob/master/LICENCE>
48+
# SPDX-License-Identifier: BSD-2-Clause
4649
sail(): |
4750
{
4851
if extension("A") then {
@@ -133,3 +136,5 @@ sail(): |
133136
RETIRE_FAIL
134137
}
135138
}
139+
140+
# SPDX-SnippetEnd

0 commit comments

Comments
 (0)