Skip to content

Commit ad273ed

Browse files
dhower-qcdhower-qc
committed
Merge remote-tracking branch 'origin/main' into sorbet
2 parents 4a17390 + 1c52fbf commit ad273ed

File tree

910 files changed

+11154
-3861
lines changed

Some content is hidden

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

910 files changed

+11154
-3861
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +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 \
29-
shellcheck
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+
3038
RUN apt-get clean autoclean
3139
RUN apt-get autoremove -y
3240
RUN rm -rf /var/lib/{apt,dpkg,cache,log}/*

‎.github/actions/singularity-setup/action.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Singularity Setup
2+
description: All steps to use/build Singularity container
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Setup apptainer
7+
uses: eWaterCycle/[email protected]
8+
- name: Get container from cache
9+
id: cache-sif
10+
uses: actions/cache@v4
11+
with:
12+
path: .singularity/image.sif
13+
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
14+
- name: Get gems and node files from cache
15+
id: cache-bundle-npm
16+
uses: actions/cache@v4
17+
with:
18+
path: |
19+
.home/.gems
20+
node_modules
21+
key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
22+
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
23+
name: Build container
24+
run: ./bin/build_container
25+
shell: bash
26+
- name: Setup project
27+
run: ./bin/setup
28+
shell: bash

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,7 @@ jobs:
3131
steps:
3232
- name: Clone Github Repo Action
3333
uses: actions/checkout@v4
34-
- name: Setup apptainer
35-
uses: eWaterCycle/[email protected]
36-
- name: Get container from cache
37-
id: cache-sif
38-
uses: actions/cache@v4
39-
with:
40-
path: .singularity/image.sif
41-
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
42-
- name: Get gems and node files from cache
43-
id: cache-bundle-npm
44-
uses: actions/cache@v4
45-
with:
46-
path: |
47-
.home/.gems
48-
node_modules
49-
key: ${{ hashFiles('Gemfile.lock') }}-${{ hashFiles('package-lock.json') }}
50-
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
51-
name: Build container
52-
run: ./bin/build_container
53-
- name: Setup project
54-
run: ./bin/setup
34+
- name: singularity setup
35+
uses: ./.github/actions/singularity-setup
5536
- name: Run regression
5637
run: ./do test:nightly

‎.github/workflows/pages.yml‎

Lines changed: 92 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,100 @@ jobs:
2222
steps:
2323
- name: Clone Github Repo Action
2424
uses: actions/checkout@v4
25-
- name: Setup apptainer
26-
uses: eWaterCycle/[email protected]
27-
- name: Get container from cache
28-
id: cache-sif
29-
uses: actions/cache@v4
30-
with:
31-
path: .singularity/image.sif
32-
key: ${{ hashFiles('container.def', 'bin/.container-tag') }}
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-
- if: ${{ steps.cache-sif.outputs.cache-hit != 'true' }}
42-
name: Build container
43-
run: ./bin/build_container
44-
- name: Setup project
45-
run: ./bin/setup
25+
- name: singularity setup
26+
uses: ./.github/actions/singularity-setup
4627
- name: Create deploy dir
4728
run: /bin/bash lib/deploy.sh
29+
- name: Create _site/isa_explorer
30+
run: mkdir -p _site/isa_explorer
31+
- name: Create isa_explorer_browser
32+
run: ./do gen:isa_explorer_browser
33+
- name: Copy isa_explorer_browser
34+
run: cp -R gen/isa_explorer/browser _site/isa_explorer
35+
- name: Create isa_explorer_spreadsheet
36+
run: ./do gen:isa_explorer_spreadsheet
37+
- name: Copy isa_explorer_spreadsheet
38+
run: cp -R gen/isa_explorer/spreadsheet _site/isa_explorer
39+
- name: Build manual
40+
run: ./do gen:html_manual MANUAL_NAME=isa VERSIONS=all
41+
- name: Build html documentation for generic_rv64
42+
run: ./do gen:html[generic_rv64]
43+
- name: Generate YARD docs
44+
run: ./do gen:tool_doc
45+
- name: Create _site/example_cfg
46+
run: mkdir -p _site/example_cfg
47+
- name: Create _site/manual
48+
run: mkdir -p _site/manual
49+
- name: Create _site/pdfs
50+
run: mkdir -p _site/pdfs
51+
- name: Create _site/htmls
52+
run: mkdir -p _site/htmls
53+
- name: Copy cfg html
54+
run: cp -R gen/cfg_html_doc/generic_rv64/html _site/example_cfg
55+
- name: Copy top-level index.html with links to portfolio artifacts
56+
run: cp index.html _site
57+
- name: Create RVI20 Profile Release PDF Spec
58+
run: ./do gen:profile_release_pdf[RVI20]
59+
- name: Copy RVI20 Profile Release PDF
60+
run: cp gen/profile/pdf/RVI20ProfileRelease.pdf _site/pdfs
61+
- name: Create RVA20 Profile Release PDF Spec
62+
run: ./do gen:profile_release_pdf[RVA20]
63+
- name: Copy RVA20 Profile Release PDF
64+
run: cp gen/profile/pdf/RVA20ProfileRelease.pdf _site/pdfs
65+
- name: Create RVA22 Profile Release PDF Spec
66+
run: ./do gen:profile_release_pdf[RVA22]
67+
- name: Copy RVA22 Profile Release PDF
68+
run: cp gen/profile/pdf/RVA22ProfileRelease.pdf _site/pdfs
69+
- name: Create RVA23 Profile Release PDF Spec
70+
run: ./do gen:profile_release_pdf[RVA23]
71+
- name: Copy RVA23 Profile Release PDF
72+
run: cp gen/profile/pdf/RVA23ProfileRelease.pdf _site/pdfs
73+
- name: Create RVB23 Profile Release PDF Spec
74+
run: ./do gen:profile_release_pdf[RVB23]
75+
- name: Copy RVB23 Profile Release PDF
76+
run: cp gen/profile/pdf/RVB23ProfileRelease.pdf _site/pdfs
77+
- name: Create AC100-CRD PDF Spec
78+
run: ./do gen:proc_crd_pdf[AC100]
79+
- name: Copy AC100-CRD PDF
80+
run: cp gen/proc_crd/pdf/AC100-CRD.pdf _site/pdfs
81+
- name: Create AC200-CRD PDF Spec
82+
run: ./do gen:proc_crd_pdf[AC200]
83+
- name: Copy AC200-CRD PDF
84+
run: cp gen/proc_crd/pdf/AC200-CRD.pdf _site/pdfs
85+
- name: Create MC100-32-CRD PDF Spec
86+
run: ./do gen:proc_crd_pdf[MC100-32]
87+
- name: Copy MC100-32-CRD PDF
88+
run: cp gen/proc_crd/pdf/MC100-32-CRD.pdf _site/pdfs
89+
- name: Create MC100-64-CRD PDF Spec
90+
run: ./do gen:proc_crd_pdf[MC100-64]
91+
- name: Copy MC100-64-CRD PDF
92+
run: cp gen/proc_crd/pdf/MC100-64-CRD.pdf _site/pdfs
93+
- name: Create MC200-32-CRD PDF Spec
94+
run: ./do gen:proc_crd_pdf[MC200-32]
95+
- name: Copy MC200-32-CRD PDF
96+
run: cp gen/proc_crd/pdf/MC200-32-CRD.pdf _site/pdfs
97+
- name: Create MC200-64-CRD PDF Spec
98+
run: ./do gen:proc_crd_pdf[MC200-64]
99+
- name: Copy MC200-64-CRD PDF
100+
run: cp gen/proc_crd/pdf/MC200-64-CRD.pdf _site/pdfs
101+
- name: Create MC300-32-CRD PDF Spec
102+
run: ./do gen:proc_crd_pdf[MC300-32]
103+
- name: Copy MC300-32-CRD PDF
104+
run: cp gen/proc_crd/pdf/MC300-32-CRD.pdf _site/pdfs
105+
- name: Create MC300-64-CRD PDF Spec
106+
run: ./do gen:proc_crd_pdf[MC300-64]
107+
- name: Copy MC300-64-CRD PDF
108+
run: cp gen/proc_crd/pdf/MC300-64-CRD.pdf _site/pdfs
109+
- name: Create MC100-32-CTP PDF Spec
110+
run: ./do gen:proc_ctp_pdf[MC100-32]
111+
- name: Copy MC100-32-CTP PDF
112+
run: cp gen/proc_ctp/pdf/MC100-32-CTP.pdf _site/pdfs
113+
- name: Create MockProcessor-CTP PDF Spec
114+
run: ./do gen:proc_ctp_pdf[MockProcessor]
115+
- name: Copy MockProcessor-CTP PDF
116+
run: cp gen/proc_ctp/pdf/MockProcessor-CTP.pdf _site/pdfs
117+
- name: Copy manual html
118+
run: cp -R gen/manual/isa/top/all/html _site/manual
48119
- name: Setup Pages
49120
uses: actions/configure-pages@v5
50121
- name: Upload artifact

0 commit comments

Comments
 (0)