Skip to content

Commit c698f65

Browse files
ShashankVMShashankVM
authored
Merge branch 'main' into main
Signed-off-by: Shashank V M <[email protected]>
2 parents 087a085 + dbaf530 commit c698f65

File tree

1,206 files changed

+24757
-4342
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,206 files changed

+24757
-4342
lines changed

‎.clang-format‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
BasedOnStyle: Google
3+
IndentWidth: 2
4+
Language: Cpp
5+
# AlignConsecutiveAssignments: true
6+
# AlignConsecutiveDeclarations: true
7+
# AlignEscapedNewlines: Right
8+
# AlignOperands: true
9+
# AlignTrailingComments: true
10+
# AllowShortBlocksOnASingleLine: false
11+
# AllowShortCaseLabelsOnASingleLine: true
12+
# AlwaysBreakTemplateDeclarations: Yes
13+
14+
FixNamespaceComments: true
15+
NamespaceIndentation: All

‎.devcontainer/Dockerfile‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +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 gh
10-
RUN apt-get install -y --no-install-recommends less
11-
RUN apt-get install -y --no-install-recommends python3
12-
RUN apt-get install -y --no-install-recommends python3.12-venv
13-
RUN apt-get install -y --no-install-recommends python3-pip
14-
RUN apt-get install -y --no-install-recommends build-essential
15-
RUN apt-get install -y --no-install-recommends ruby
16-
RUN apt-get install -y --no-install-recommends ruby-dev
17-
RUN apt-get install -y --no-install-recommends bundler
18-
RUN apt-get install -y --no-install-recommends nodejs
19-
RUN apt-get install -y --no-install-recommends npm
20-
RUN apt-get install -y --no-install-recommends ditaa
21-
RUN apt-get install -y --no-install-recommends libyaml-dev
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+
2238
RUN apt-get clean autoclean
2339
RUN apt-get autoremove -y
2440
RUN rm -rf /var/lib/{apt,dpkg,cache,log}/*

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"zhwu95.riscv",
3232
"mathematic.vscode-pdf",
3333
"CraigMaslowski.erb",
34-
"HowerLimited.idl-vscode"
34+
"HowerLimited.udb-extension-pack-vscode"
3535
]
3636
}
3737
},

‎.github/workflows/container.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Publish container
2+
on:
3+
push:
4+
branches:
5+
- main
6+
workflow_dispatch:
7+
jobs:
8+
publish-singularity-container:
9+
runs-on: ubuntu-latest
10+
env:
11+
SINGULARITY: 1
12+
steps:
13+
- name: Clone Github Repo Action
14+
uses: actions/checkout@v4
15+
16+
- name: Setup apptainer
17+
uses: eWaterCycle/[email protected]
18+
with:
19+
apptainer-version: 1.4.0
20+
21+
- name: Get container tag
22+
run: |
23+
TAG=$(cat bin/.container-tag)
24+
echo "TAG=$TAG" >> $GITHUB_ENV
25+
26+
- name: Get container from cache
27+
id: cache-sif
28+
uses: actions/cache@v4
29+
with:
30+
path: .singularity/image.sif
31+
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
32+
33+
- name: Get gems and node files from cache
34+
id: cache-bundle-npm
35+
uses: actions/cache@v4
36+
with:
37+
path: |
38+
.home/.gems
39+
node_modules
40+
key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
41+
42+
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
43+
name: Build container
44+
run: ./bin/build_container
45+
46+
- name: Upload singularity container
47+
run: |
48+
apptainer registry login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} oras://docker.io
49+
apptainer push .singularity/image.sif oras://docker.io/riscvintl/spec-generator:${{ env.TAG }}
50+
51+
publish-docker-container:
52+
runs-on: ubuntu-latest
53+
env:
54+
DOCKER: 1
55+
steps:
56+
- name: Clone Github Repo Action
57+
uses: actions/checkout@v4
58+
59+
- name: Get container tag
60+
run: |
61+
TAG=$(cat bin/.container-tag)
62+
echo "TAG=$TAG" >> $GITHUB_ENV
63+
64+
- name: Login to Docker Hub
65+
uses: docker/login-action@v3
66+
with:
67+
username: ${{ secrets.DOCKERHUB_USERNAME }}
68+
password: ${{ secrets.DOCKERHUB_TOKEN }}
69+
70+
- name: Set up QEMU
71+
uses: docker/setup-qemu-action@v3
72+
73+
- name: Set up Docker Buildx
74+
uses: docker/setup-buildx-action@v3
75+
76+
- name: Build and push
77+
uses: docker/build-push-action@v6
78+
with:
79+
push: true
80+
file: ./.devcontainer/Dockerfile
81+
platforms: linux/amd64,linux/arm64
82+
tags: riscvintl/udb:${{ env.TAG }}

‎.github/workflows/pages.yml‎

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,52 +43,8 @@ jobs:
4343
run: ./bin/build_container
4444
- name: Setup project
4545
run: ./bin/setup
46-
- name: Build manual
47-
run: ./do gen:html_manual MANUAL_NAME=isa VERSIONS=all
48-
- name: Build html documentation for generic_rv64
49-
run: ./do gen:html[generic_rv64]
50-
- name: Generate YARD docs
51-
run: ./do gen:tool_doc
52-
- name: Create _site/example_cfg
53-
run: mkdir -p _site/example_cfg
54-
- name: Create _site/manual
55-
run: mkdir -p _site/manual
56-
- name: Create _site/pdfs
57-
run: mkdir -p _site/pdfs
58-
- name: Create _site/htmls
59-
run: mkdir -p _site/htmls
60-
- name: Copy cfg html
61-
run: cp -R gen/cfg_html_doc/generic_rv64/html _site/example_cfg
62-
- name: Create RVA20 Profile Release PDF Spec
63-
run: ./do gen:profile[RVA20]
64-
- name: Copy RVA20 Profile Release PDF
65-
run: cp gen/profile_doc/pdf/RVA20.pdf _site/pdfs/RVA20.pdf
66-
- name: Create RVA22 Profile Release PDF Spec
67-
run: ./do gen:profile[RVA22]
68-
- name: Copy RVA22 Profile Release PDF
69-
run: cp gen/profile_doc/pdf/RVA22.pdf _site/pdfs/RVA22.pdf
70-
- name: Create RVI20 Profile Release PDF Spec
71-
run: ./do gen:profile[RVI20]
72-
- name: Copy RVI20 Profile Release PDF
73-
run: cp gen/profile_doc/pdf/RVA20.pdf _site/pdfs/RVI20.pdf
74-
- name: Create MC100-32 PDF Spec
75-
run: ./do gen:cert_model_pdf[MC100-32]
76-
- name: Copy MC100-32 PDF
77-
run: cp gen/certificate_doc/pdf/MC100-32.pdf _site/pdfs/MC100-32.pdf
78-
- name: Create MC100-32 HTML Spec
79-
run: ./do gen:cert_model_html[MC100-32]
80-
- name: Copy MC100-32 HTML
81-
run: cp gen/certificate_doc/html/MC100-32.html _site/htmls/MC100-32.html
82-
- name: Create MC100-64 PDF Spec
83-
run: ./do gen:cert_model_pdf[MC100-64]
84-
- name: Copy MC100-64 PDF
85-
run: cp gen/certificate_doc/pdf/MC100-64.pdf _site/pdfs/MC100-64.pdf
86-
- name: Create MC100-64 HTML Spec
87-
run: ./do gen:cert_model_html[MC100-64]
88-
- name: Copy MC100-64 HTML
89-
run: cp gen/certificate_doc/html/MC100-64.html _site/htmls/MC100-64.html
90-
- name: Copy manual html
91-
run: cp -R gen/manual/isa/top/all/html _site/manual
46+
- name: Create deploy dir
47+
run: /bin/bash lib/deploy.sh
9248
- name: Setup Pages
9349
uses: actions/configure-pages@v5
9450
- name: Upload artifact

‎.github/workflows/regress.yml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: Regression test
22
on:
3+
push:
4+
branches:
5+
- main
6+
merge_group: # this is a new line
7+
types: [checks_requested] # this is a new line
38
pull_request:
49
branches:
510
- main
@@ -98,13 +103,14 @@ jobs:
98103
name: Build container
99104
run: ./bin/build_container
100105
- name: Generate HTML ISA manual
101-
run: ./do gen:html[generic_rv64]
106+
run: ./do gen:html[example_rv64_with_overlay]
102107
regress-gen-ext-pdf:
103108
runs-on: ubuntu-latest
104109
env:
105110
EXT: B
106111
VERSION: latest
107112
SINGULARITY: 1
113+
PSEUDO: both
108114
steps:
109115
- name: Clone Github Repo Action
110116
uses: actions/checkout@v4
@@ -185,3 +191,31 @@ jobs:
185191
run: ./bin/build_container
186192
- name: Generate extension PDF
187193
run: ./do gen:profile[MockProfileRelease]
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

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
.stamps
88
.venv
99
.asciidoctor
10+
.vscode/*
11+
!.vscode/launch.json
1012
.container-type
1113
diag-ditaa-*
1214
arch/manual/isa/**/riscv-isa-manual

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "ext/riscv-isa-manual"]
88
path = ext/riscv-isa-manual
99
url = https://github.com/riscv/riscv-isa-manual
10+
[submodule "ext/riscv-tests"]
11+
path = ext/riscv-tests
12+
url = https://github.com/riscv-software-src/riscv-tests.git

‎.pre-commit-config.yaml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ repos:
2323
- id: check-yaml
2424

2525
- repo: https://github.com/rbubley/mirrors-prettier
26-
rev: v3.4.2
26+
rev: v3.5.3
2727
hooks:
2828
- id: prettier
2929
files: \.(json|yml|yaml)$
3030
exclude: schemas/json-schema-draft-07.json
3131

3232
- repo: https://github.com/python-jsonschema/check-jsonschema
33-
rev: 0.30.0
33+
rev: 0.32.1
3434
hooks:
3535
- id: check-jsonschema
3636
alias: check-jsonschema-inst
@@ -58,12 +58,36 @@ repos:
5858
# files: ^arch/manual/.*\.(yaml|yml)$
5959
# args: ["--schemafile", "schemas/manual_version_schema.json"]
6060

61+
- repo: https://github.com/pre-commit/mirrors-clang-format
62+
rev: "v20.1.0"
63+
hooks:
64+
- id: clang-format
65+
types_or: [c++, c]
66+
files: \.(hpp|cpp)$
6167
- repo: https://github.com/psf/black-pre-commit-mirror
62-
rev: 24.8.0
68+
rev: 25.1.0
6369
hooks:
6470
- id: black
6571

6672
- repo: https://github.com/asottile/pyupgrade
6773
rev: v3.19.1
6874
hooks:
6975
- id: pyupgrade
76+
77+
- repo: local
78+
hooks:
79+
- id: shellcheck
80+
name: shellcheck
81+
types: [shell]
82+
language: system
83+
entry: shellcheck
84+
args: ["--severity=error"]
85+
86+
- repo: https://github.com/scop/pre-commit-shfmt
87+
rev: v3.11.0-1
88+
hooks:
89+
- id: shfmt
90+
args:
91+
- --indent
92+
- "2"
93+
- --case-indent

‎.vscode/launch.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,46 @@
2727
"script": "gen:profile[RVA20]",
2828
"args": [],
2929
"askParameters": false
30+
},
31+
{
32+
"type": "cppdbg",
33+
"name": "Run MC100-32 iss",
34+
"request": "launch",
35+
"program": "${workspaceFolder}/gen/cpp_hart_gen/MC100-32_Debug/build/iss",
36+
"setupCommands": [
37+
{
38+
"text": "set output-radix 16",
39+
"description": "Display hex by default"
40+
}
41+
],
42+
"cwd": "${workspaceFolder}",
43+
"args": [
44+
"-m", "MC100-32", "-c",
45+
"${workspaceFolder}/cfgs/mc100-32-full-example.yaml",
46+
"ext/riscv-tests/isa/rv32mi-p-mcsr"
47+
],
48+
"linux": {
49+
"MIMode": "gdb",
50+
"miDebuggerPath": "${workspaceFolder}/bin/gdb"
51+
}
52+
},
53+
{
54+
"type": "cppdbg",
55+
"name": "Run MC100-32 coremark",
56+
"request": "launch",
57+
"program": "${workspaceFolder}/gen/cpp_hart_gen/MC100-32_Debug/build/iss",
58+
"setupCommands": [
59+
{
60+
"text": "set output-radix 16",
61+
"description": "Display hex by default"
62+
}
63+
],
64+
"cwd": "${workspaceFolder}",
65+
"args": ["-m", "MC100-32", "-c", "${workspaceFolder}/cfgs/mc100-32-full-example.yaml", "ext/riscv-coremark/coremark/coremark.bare.riscv"],
66+
"linux": {
67+
"MIMode": "gdb",
68+
"miDebuggerPath": "${workspaceFolder}/bin/gdb"
69+
}
3070
}
3171
]
3272
}

0 commit comments

Comments
 (0)