Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provide a NUM_DOMAINS test override #701

Merged
merged 4 commits into from
Dec 11, 2023
Merged

provide a NUM_DOMAINS test override #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08ff07f
cspec/c: provide NUM_DOMAINS build override option
lsf37 Dec 10, 2023
2114b79
github: add NUM_DOMAINS test matrix
lsf37 Dec 10, 2023
15c46e7
runtest: echo NUM_DOMAINS override
lsf37 Dec 10, 2023
d4a2878
Merge branch 'master' into num-domains-override
lsf37 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/proof-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
fail-fast: false
matrix:
arch: [ARM, ARM_HYP, AARCH64, RISCV64, X64]
num_domains: ['1', '']
# test only most recent push:
concurrency: l4v-regression-${{ github.ref }}-${{ strategy.job-index }}
steps:
Expand All @@ -45,6 +46,7 @@ jobs:
with:
L4V_ARCH: ${{ matrix.arch }}
xml: ${{ needs.code.outputs.xml }}
NUM_DOMAINS: ${{ matrix.num_domains }}
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/weekly-clean.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ jobs:
fail-fast: false
matrix:
arch: [ARM, ARM_HYP, AARCH64, RISCV64, X64]
num_domains: ['1', '7', '']
steps:
- name: Proofs
uses: seL4/ci-actions/aws-proofs@master
with:
L4V_ARCH: ${{ matrix.arch }}
NUM_DOMAINS: ${{ matrix.num_domains }}
cache_read: '' # start with empty cache, but write cache back (default)
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
4 changes: 3 additions & 1 deletion run_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ returncode = 0
for arch in archs:
features = os.environ.get("L4V_FEATURES", "")
plat = os.environ.get("L4V_PLAT", "")
print(f"Testing for L4V_ARCH='{arch}', L4V_FEATURES='{features}', L4V_PLAT='{plat}':")
num_domains = os.environ.get("INPUT_NUM_DOMAINS", "")
print(f"Testing for L4V_ARCH='{arch}', L4V_FEATURES='{features}', L4V_PLAT='{plat}', "
f"INPUT_NUM_DOMAINS='{num_domains}'")

os.environ["L4V_ARCH"] = arch
# Provide L4V_ARCH_IS_ARM for Corres_Test in lib/ROOT
Expand Down
4 changes: 4 additions & 0 deletions spec/cspec/c/kernel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ ${OVERLAY}: ${DEFAULT_OVERLAY}
@cp $< $@
endif

ifdef INPUT_NUM_DOMAINS
KERNEL_CMAKE_EXTRA_OPTIONS += -DKernelNumDomains=${INPUT_NUM_DOMAINS}
endif

# Initialize the CMake build. We purge the build directory and start again
# whenever any of the kernel sources change, so that we can reliably pick up
# changes to the build config.
Expand Down