Skip to content

Commit 075728f

Browse files
committed
Merge branch 'riscv-software-src:main' into H_CSRs
2 parents 0e1a7fb + 6e7c74c commit 075728f

File tree

1,243 files changed

+50236
-3713
lines changed

Some content is hidden

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

1,243 files changed

+50236
-3713
lines changed

.devcontainer/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ ENV DEBIAN_FRONTEND=noninteractive
55
WORKDIR /workspace
66

77
RUN export DEBIAN_FRONTEND=noninteractive
8-
RUN apt-get update
98

109
# please keep pkgs sorted
11-
RUN apt-get install -y --no-install-recommends \
10+
RUN \
11+
apt-get update && \
12+
apt-get install -y --no-install-recommends --fix-missing \
1213
build-essential \
1314
bundler \
1415
clang-format \
@@ -28,6 +29,7 @@ RUN apt-get install -y --no-install-recommends \
2829
libyaml-dev \
2930
nodejs \
3031
npm \
32+
parallel \
3133
python3 \
3234
python3-pip \
3335
python3.12-venv \

.devcontainer/devcontainer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"asciidoc.antora.showEnableAntoraPrompt": true
2626
},
2727
"extensions": [
28-
"castwide.solargraph",
29-
"redhat.vscode-yaml",
3028
"asciidoctor.asciidoctor-vscode",
31-
"zhwu95.riscv",
32-
"mathematic.vscode-pdf",
29+
"castwide.solargraph",
3330
"CraigMaslowski.erb",
34-
"HowerLimited.udb-extension-pack-vscode"
31+
"HowerLimited.udb-extension-pack-vscode",
32+
"mathematic.vscode-pdf",
33+
"redhat.vscode-yaml",
34+
"zhwu95.riscv"
3535
]
3636
}
3737
},

.github/workflows/regress.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
with:
3737
path: ext/llvm-project/riscv.json
3838
key: ${{ runner.os }}-riscv-json-${{ env.LLVM_SHA }}
39-
restore-keys: |
40-
${{ runner.os }}-riscv-json-
4139
- name: singularity setup
4240
uses: ./.github/actions/singularity-setup
4341
- name: Run smoke
@@ -64,8 +62,10 @@ jobs:
6462
uses: actions/checkout@v4
6563
- name: singularity setup
6664
uses: ./.github/actions/singularity-setup
67-
- name: Generate instruction appendix
68-
run: ./do gen:instruction_appendix
65+
- name: Generate instruction appendix asciidoc
66+
run: ./do gen:instruction_appendix_adoc
67+
- name: Check instruction appendix result
68+
run: ./do test:instruction_appendix
6969
regress-cfg-manual:
7070
runs-on: ubuntu-latest
7171
env:
@@ -130,14 +130,12 @@ jobs:
130130
with:
131131
path: ext/llvm-project/riscv.json
132132
key: ${{ runner.os }}-riscv-json-${{ env.LLVM_SHA }}
133-
restore-keys: |
134-
${{ runner.os }}-riscv-json-
135133
- name: Initialize LLVM submodule (shallow + sparse)
136134
if: ${{ steps.cache-riscv.outputs.cache-hit != 'true' }}
137135
run: |
136+
rm -rf ext/llvm-project
138137
git submodule sync --recursive
139138
git submodule update --init --recursive --depth=1 ext/llvm-project
140-
141139
- name: Check for required directories and files
142140
if: ${{ steps.cache-riscv.outputs.cache-hit != 'true' }}
143141
run: |
@@ -161,6 +159,11 @@ jobs:
161159
-o ext/llvm-project/riscv.json
162160
- name: Show riscv.json output
163161
run: ls -l ext/llvm-project/riscv.json
162+
- name: Upload RISC-V JSON as Artifact
163+
uses: actions/upload-artifact@v4
164+
with:
165+
name: riscv-json
166+
path: ext/llvm-project/riscv.json
164167
regress-gen-go:
165168
runs-on: ubuntu-latest
166169
env:
@@ -172,6 +175,17 @@ jobs:
172175
uses: ./.github/actions/singularity-setup
173176
- name: Generate Go code
174177
run: ./do gen:go
178+
regress-gen-c-header:
179+
runs-on: ubuntu-latest
180+
env:
181+
SINGULARITY: 1
182+
steps:
183+
- name: Clone Github Repo Action
184+
uses: actions/checkout@v4
185+
- name: singularity setup
186+
uses: ./.github/actions/singularity-setup
187+
- name: Generate c_header code
188+
run: ./do gen:c_header
175189
regress-cpp-unit:
176190
runs-on: ubuntu-latest
177191
env:
@@ -182,4 +196,4 @@ jobs:
182196
- name: singularity setup
183197
uses: ./.github/actions/singularity-setup
184198
- name: Run cpp unit tests
185-
run: ./do test:cpp_hart CONFIG=rv64
199+
run: ./do test:cpp_hart CONFIG=rv64 JOBS=4

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
.asciidoctor
1010
.vscode/*
1111
!.vscode/launch.json
12+
!.vscode/extensions.json
1213
.container-type
1314
diag-ditaa-*
1415
arch/manual/isa/**/riscv-isa-manual
@@ -21,3 +22,4 @@ __pycache__/
2122
.pytest_cache/
2223
*.bak
2324
*.log
25+
sorbet

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@
1414
[submodule "ext/riscv-tests"]
1515
path = ext/riscv-tests
1616
url = https://github.com/riscv-software-src/riscv-tests.git
17+
[submodule "ext/rbi-central"]
18+
path = ext/rbi-central
19+
url = https://github.com/Shopify/rbi-central

.pre-commit-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ repos:
1919
stages: [pre-commit]
2020
- id: end-of-file-fixer
2121
stages: [pre-commit]
22+
exclude: \.golden.adoc$
2223
- id: trailing-whitespace
2324
stages: [pre-commit]
2425
args: [--markdown-linebreak-ext=md]
@@ -119,6 +120,7 @@ repos:
119120
rev: v5.0.2
120121
hooks:
121122
- id: reuse-lint-file
123+
exclude: COMMIT_EDITMSG|MERGE_MSG
122124

123125
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
124126
rev: v9.22.0

.sorbet-config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--dir
2+
.
3+
--ignore
4+
ext
5+
--ignore
6+
.home/.gems
7+
--ignore
8+
node_modules

.tapioca-config.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
gem:
2+
outdir: .home/.sorbet/rbi/gems
3+
file_header: true
4+
exclude:
5+
[
6+
rdoc,
7+
asciidoctor-pdf,
8+
solargraph,
9+
webrick,
10+
ttfunk,
11+
tapioca,
12+
rubocop,
13+
rubocop-minitest,
14+
spoom,
15+
rdbg,
16+
parser,
17+
]
18+
dsl:
19+
outdir: .home/.sorbet/rbi/dsl
20+
# Add your `dsl` command parameters here:
21+
#
22+
# exclude:
23+
# - SomeGeneratorName
24+
# workers: 5
25+
annotations:
26+
sources:
27+
- ext/rbi-central

.vscode/extensions.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"recommendations": [
3+
"asciidoctor.asciidoctor-vscode",
4+
"castwide.solargraph",
5+
"CraigMaslowski.erb",
6+
"HowerLimited.udb-extension-pack-vscode",
7+
"mathematic.vscode-pdf",
8+
"redhat.vscode-yaml",
9+
"zhwu95.riscv"
10+
]
11+
}

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ gem "pygments.rb"
1616
gem "rake", "~> 13.0"
1717
gem "rouge"
1818
gem "ruby-progressbar", "~> 1.13"
19+
gem "sorbet-runtime"
1920
gem "treetop", "1.6.12"
2021
gem "ttfunk", "1.7" # needed to avoid having asciidoctor-pdf dependencies pulling in a buggy version of ttunk (1.8)
2122
gem "webrick"
@@ -31,4 +32,7 @@ group :development do
3132
gem "ruby-prof"
3233
gem "ruby-prof-flamegraph", git: "https://github.com/oozou/ruby-prof-flamegraph.git", ref: "fc3c437", require: false
3334
gem "solargraph"
35+
gem "sorbet"
36+
gem "spoom"
37+
gem "tapioca", require: false
3438
end

0 commit comments

Comments
 (0)