Skip to content

CI testing ZCU102 SMP #72

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

Closed
axel-h wants to merge 4 commits into from
Closed

CI testing ZCU102 SMP #72

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
977022b
vm_minimal, QEMU: block aarch32 build
axel-h Feb 1, 2024
fb4ea97
use axel-h/ci-actions@patch-axel-7
axel-h Jan 28, 2024
b1539bc
test vm.pcpus[]
axel-h Feb 1, 2024
0ea6601
dummy commit
axel-h Jan 26, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/test-hw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: HW

on:
# needs PR target for secrets access; guard by requiring label
pull_request_target:
pull_request_target: # !! dummy
types: [opened, reopened, synchronize, labeled]

# downgrade permissions to read-only as you would have in a standard PR action
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
xml: ${{ steps.repo.outputs.xml }}
steps:
- id: repo
uses: seL4/ci-actions/repo-checkout@master
uses: axel-h/ci-actions/repo-checkout@patch-axel-7
with:
manifest_repo: camkes-vm-examples-manifest
manifest: master.xml
Expand All @@ -62,7 +62,7 @@ jobs:
matrix:
march: [nehalem, armv7a, armv8a]
steps:
- uses: seL4/ci-actions/camkes-vm@master
- uses: axel-h/ci-actions/camkes-vm@patch-axel-7
with:
xml: ${{ needs.code.outputs.xml }}
march: ${{ matrix.march }}
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
with:
name: images-${{ matrix.march }}
- name: Run
uses: seL4/ci-actions/camkes-vm-hw@master
uses: axel-h/ci-actions/camkes-vm-hw@patch-axel-7
with:
march: ${{ matrix.march }}
index: $${{ strategy.job-index }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
matrix:
march: [nehalem, armv7a, armv8a]
steps:
- uses: seL4/ci-actions/camkes-vm@master
- uses: axel-h/ci-actions/camkes-vm@patch-axel-7
with:
march: ${{ matrix.march }}
8 changes: 8 additions & 0 deletions apps/Arm/vm_minimal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ elseif("${KernelARMPlatform}" STREQUAL "tx2")
AddToFileServer("linux-dtb" "${output_dtb_location}" DEPENDS dtb_gen_target)

elseif("${KernelARMPlatform}" STREQUAL "qemu-arm-virt")

# QEMU supports ARMv7/aarch32 and ARMv8/aarch32, but currently there are
# Linux images for aarch64 only. However, it is unclear if that is the only
# blocker to get this example run in QEMU on aarch32.
if(NOT KernelSel4ArchAarch64)
message(FATAL_ERROR "Only AARCH64 is supported")
endif()

find_package(camkes-vm-linux REQUIRED)
include(${CAMKES_VM_LINUX_HELPERS_PATH})
set(cpp_flags "-DKERNELARMPLATFORM_QEMU-ARM-VIRT")
Expand Down
3 changes: 2 additions & 1 deletion apps/Arm/vm_minimal/zcu102/2022_1/devices.camkes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ assembly {
"initrd_addr" : VAR_STRINGIZE(VM_INITRD_ADDR),
"kernel_entry_addr" : VAR_STRINGIZE(VM_ENTRY_ADDR),
};
vm0.num_vcpus = 4;
vm0.num_vcpus = 2;
vm0.pcpus = [2, 3];

/* Extra untyped pool to allow for 256MB of RAM */
vm0.simple_untyped28_pool = 1;
Expand Down