Skip to content

Commit 581ab14

Browse files
author
Derek Hower
committed
Merge branch 'main' into cpp_hart && get gen:html working again
2 parents aba713d + ce0dc0a commit 581ab14

File tree

342 files changed

+6318
-2755
lines changed

Some content is hidden

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

342 files changed

+6318
-2755
lines changed

‎.github/workflows/nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
outputs:
1414
should_run: ${{ steps.should_run.outputs.should_run }}
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: print latest_commit
1818
run: echo ${{ github.sha }}
1919

2020
- id: should_run
2121
continue-on-error: true
2222
name: check latest commit is less than a day
2323
if: ${{ github.event_name == 'schedule' }}
24-
run: test -z $(git rev-list --after="24 hours" ${{ github.sha }}) && echo "::set-output name=should_run::false"
24+
run: test -z "$(git rev-list --after='24 hours' ${{ github.sha }})" && echo "name=should_run::false" >> "$GITHUB_OUTPUT"
2525
nightly:
2626
needs: check_date
2727
if: ${{ needs.check_date.outputs.should_run != 'false' }}
@@ -35,13 +35,13 @@ jobs:
3535
uses: eWaterCycle/[email protected]
3636
- name: Get container from cache
3737
id: cache-sif
38-
uses: actions/cache@v3
38+
uses: actions/cache@v4
3939
with:
4040
path: .singularity/image.sif
4141
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
4242
- name: Get gems and node files from cache
4343
id: cache-bundle-npm
44-
uses: actions/cache@v3
44+
uses: actions/cache@v4
4545
with:
4646
path: |
4747
.home/.gems

‎.github/workflows/pages.yml‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ concurrency:
1414
jobs:
1515
pages:
1616
runs-on: ubuntu-latest
17+
env:
18+
SINGULARITY: 1
1719
environment:
1820
name: github-pages
1921
url: ${{ steps.deployment.outputs.page_url }}
@@ -24,13 +26,13 @@ jobs:
2426
uses: eWaterCycle/[email protected]
2527
- name: Get container from cache
2628
id: cache-sif
27-
uses: actions/cache@v3
29+
uses: actions/cache@v4
2830
with:
2931
path: .singularity/image.sif
3032
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
3133
- name: Get gems and node files from cache
3234
id: cache-bundle-npm
33-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3436
with:
3537
path: |
3638
.home/.gems
@@ -69,14 +71,22 @@ jobs:
6971
run: ./do gen:profile[RVI20]
7072
- name: Copy RVI20 Profile Release PDF
7173
run: cp gen/profile_doc/pdf/RVA20.pdf _site/pdfs/RVI20.pdf
72-
- name: Create MC100 PDF Spec
73-
run: ./do gen:cert_model_pdf[MC100]
74-
- name: Copy MC100 PDF
75-
run: cp gen/certificate_doc/pdf/MC100.pdf _site/pdfs/MC100.pdf
76-
- name: Create MC100 HTML Spec
77-
run: ./do gen:cert_model_html[MC100]
78-
- name: Copy MC100 HTML
79-
run: cp gen/certificate_doc/html/MC100.html _site/htmls/MC100.html
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
8090
- name: Copy manual html
8191
run: cp -R gen/manual/isa/top/all/html _site/manual
8292
- name: Setup Pages

‎.github/workflows/regress.yml‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
regress-pre-commit:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
12-
- uses: actions/setup-python@v3
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-python@v5
1313
- uses: pre-commit/[email protected]
1414
regress-smoke:
1515
runs-on: ubuntu-latest
@@ -22,13 +22,13 @@ jobs:
2222
uses: eWaterCycle/[email protected]
2323
- name: Get container from cache
2424
id: cache-sif
25-
uses: actions/cache@v3
25+
uses: actions/cache@v4
2626
with:
2727
path: .singularity/image.sif
2828
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
2929
- name: Get gems and node files from cache
3030
id: cache-bundle-npm
31-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3232
with:
3333
path: |
3434
.home/.gems
@@ -43,7 +43,6 @@ jobs:
4343
run: ./do test:smoke
4444
regress-gen-isa-manual:
4545
runs-on: ubuntu-latest
46-
needs: regress-smoke
4746
env:
4847
MANUAL_NAME: isa
4948
VERSIONS: all
@@ -55,13 +54,13 @@ jobs:
5554
uses: eWaterCycle/[email protected]
5655
- name: Get container from cache
5756
id: cache-sif
58-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5958
with:
6059
path: .singularity/image.sif
6160
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
6261
- name: Get gems and node files from cache
6362
id: cache-bundle-npm
64-
uses: actions/cache@v3
63+
uses: actions/cache@v4
6564
with:
6665
path: |
6766
.home/.gems
@@ -72,9 +71,36 @@ jobs:
7271
run: ./bin/build_container
7372
- name: Generate HTML ISA manual
7473
run: ./do gen:html_manual
74+
regress-cfg-manual:
75+
runs-on: ubuntu-latest
76+
env:
77+
SINGULARITY: 1
78+
steps:
79+
- name: Clone Github Repo Action
80+
uses: actions/checkout@v4
81+
- name: Setup apptainer
82+
uses: eWaterCycle/[email protected]
83+
- name: Get container from cache
84+
id: cache-sif
85+
uses: actions/cache@v4
86+
with:
87+
path: .singularity/image.sif
88+
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
89+
- name: Get gems and node files from cache
90+
id: cache-bundle-npm
91+
uses: actions/cache@v4
92+
with:
93+
path: |
94+
.home/.gems
95+
node_modules
96+
key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
97+
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
98+
name: Build container
99+
run: ./bin/build_container
100+
- name: Generate HTML ISA manual
101+
run: ./do gen:html[generic_rv64]
75102
regress-gen-ext-pdf:
76103
runs-on: ubuntu-latest
77-
needs: regress-smoke
78104
env:
79105
EXT: B
80106
VERSION: latest
@@ -86,13 +112,13 @@ jobs:
86112
uses: eWaterCycle/[email protected]
87113
- name: Get container from cache
88114
id: cache-sif
89-
uses: actions/cache@v3
115+
uses: actions/cache@v4
90116
with:
91117
path: .singularity/image.sif
92118
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
93119
- name: Get gems and node files from cache
94120
id: cache-bundle-npm
95-
uses: actions/cache@v3
121+
uses: actions/cache@v4
96122
with:
97123
path: |
98124
.home/.gems
@@ -105,7 +131,6 @@ jobs:
105131
run: ./do gen:ext_pdf
106132
regress-gen-certificate:
107133
runs-on: ubuntu-latest
108-
needs: regress-smoke
109134
env:
110135
SINGULARITY: 1
111136
steps:
@@ -115,13 +140,13 @@ jobs:
115140
uses: eWaterCycle/[email protected]
116141
- name: Get container from cache
117142
id: cache-sif
118-
uses: actions/cache@v3
143+
uses: actions/cache@v4
119144
with:
120145
path: .singularity/image.sif
121146
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
122147
- name: Get gems and node files from cache
123148
id: cache-bundle-npm
124-
uses: actions/cache@v3
149+
uses: actions/cache@v4
125150
with:
126151
path: |
127152
.home/.gems
@@ -134,7 +159,6 @@ jobs:
134159
run: ./do gen:cert_model_pdf[MockCertificateModel]
135160
regress-gen-profile:
136161
runs-on: ubuntu-latest
137-
needs: regress-smoke
138162
env:
139163
SINGULARITY: 1
140164
steps:
@@ -144,13 +168,13 @@ jobs:
144168
uses: eWaterCycle/[email protected]
145169
- name: Get container from cache
146170
id: cache-sif
147-
uses: actions/cache@v3
171+
uses: actions/cache@v4
148172
with:
149173
path: .singularity/image.sif
150174
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
151175
- name: Get gems and node files from cache
152176
id: cache-bundle-npm
153-
uses: actions/cache@v3
177+
uses: actions/cache@v4
154178
with:
155179
path: |
156180
.home/.gems

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ gen
1616
node_modules
1717
_site
1818
images
19+
*.log

‎.pre-commit-config.yaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
---
22
exclude: ^docs/ruby/ # All generated code
3+
default_language_version:
4+
python: python3.12
35

46
repos:
57
- repo: https://github.com/pre-commit/pre-commit-hooks
68
rev: v5.0.0
79
hooks:
10+
- id: check-ast
11+
- id: check-builtin-literals
12+
- id: check-case-conflict
13+
- id: check-docstring-first
814
- id: check-symlinks
915
- id: end-of-file-fixer
1016
- id: trailing-whitespace
@@ -17,14 +23,14 @@ repos:
1723
- id: check-yaml
1824

1925
- repo: https://github.com/rbubley/mirrors-prettier
20-
rev: v3.3.3
26+
rev: v3.4.2
2127
hooks:
2228
- id: prettier
2329
files: \.(json|yml|yaml)$
2430
exclude: schemas/json-schema-draft-07.json
2531

2632
- repo: https://github.com/python-jsonschema/check-jsonschema
27-
rev: 0.29.4
33+
rev: 0.30.0
2834
hooks:
2935
- id: check-jsonschema
3036
alias: check-jsonschema-inst
@@ -58,3 +64,12 @@ repos:
5864
- id: clang-format
5965
types_or: [c++, c]
6066
files: \.(hpp|cpp)$
67+
- repo: https://github.com/psf/black-pre-commit-mirror
68+
rev: 24.8.0
69+
hooks:
70+
- id: black
71+
72+
- repo: https://github.com/asottile/pyupgrade
73+
rev: v3.19.1
74+
hooks:
75+
- id: pyupgrade

‎.vscode/launch.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,25 @@
33
"configurations": [
44
{
55
"type": "rdbg",
6-
"name": "RVA20 Profile",
6+
"name": "MC100-32",
7+
"request": "launch",
8+
"command": "bundle exec rake",
9+
"script": "gen:cert_model_pdf[MC100-32]",
10+
"args": [],
11+
"askParameters": false
12+
},
13+
{
14+
"type": "rdbg",
15+
"name": "MC200-32",
16+
"request": "launch",
17+
"command": "bundle exec rake",
18+
"script": "gen:cert_model_pdf[MC200-32]",
19+
"args": [],
20+
"askParameters": false
21+
},
22+
{
23+
"type": "rdbg",
24+
"name": "RVA20",
725
"request": "launch",
826
"command": "bundle exec rake",
927
"script": "gen:profile[RVA20]",

‎README.adoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The following artifacts have been generated from the top of the `main` branch:
1111
* https://riscv-software-src.github.io/riscv-unified-db/pdfs/RVI20.pdf[RVI20 Profile Release]
1212
* https://riscv-software-src.github.io/riscv-unified-db/pdfs/RVA20.pdf[RVA20 Profile Release]
1313
* https://riscv-software-src.github.io/riscv-unified-db/pdfs/RVA22.pdf[RVA22 Profile Release]
14-
* https://riscv-software-src.github.io/riscv-unified-db/pdfs/MC100.pdf[MC100 Certification Requirements Document]
14+
* https://riscv-software-src.github.io/riscv-unified-db/pdfs/MC100-32.pdf[MC100-32 Certification Requirements Document]
15+
* https://riscv-software-src.github.io/riscv-unified-db/pdfs/MC100-64.pdf[MC100-64 Certification Requirements Document]
1516

1617
== Overview
1718

0 commit comments

Comments
 (0)