Skip to content

fvp-aemva: bump shrinkwrap to 2026.3.0 and target Armv9.7#29

Open
bhcopeland wants to merge 1 commit into
kernelci:mainfrom
bhcopeland:fvp-aemva-shrinkwrap-2026.3.0-v9.7
Open

fvp-aemva: bump shrinkwrap to 2026.3.0 and target Armv9.7#29
bhcopeland wants to merge 1 commit into
kernelci:mainfrom
bhcopeland:fvp-aemva-shrinkwrap-2026.3.0-v9.7

Conversation

@bhcopeland

Copy link
Copy Markdown
Member

Update the boot template to base-slim:2026.3.0 and bring the FVP model arguments up to Arm's v9.7 architecture overlay: add has_lsfe, the v9.6 and v9.7 feature flags (has_arm_v9-6, has_arm_v9-7, sve/sme2 version 3, f16 matmul, b16mm) for both clusters, and regenerate the golden refs.

@roxell

roxell commented Jun 2, 2026

Copy link
Copy Markdown
Collaborator

I gave this a spin, I think we need to change too:

diff --git a/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2 b/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
index 3d89edbbc3b1..8f52609471b3 100644
--- a/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
+++ b/tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
@@ -75,7 +75,7 @@ actions:
       name: "docker.io/shrinkwraptool/base-slim:2026.3.0"
       local: false
       container_name: "{{ tmpdir.name }}"
-    image: "/tools/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA"
+    image: "/tools/FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA"
     version_string: "Fast Models [^\\n]+"
     timeout:
       minutes: {{ boot_timeout }}

@bhcopeland bhcopeland force-pushed the fvp-aemva-shrinkwrap-2026.3.0-v9.7 branch 2 times, most recently from 23b7f4a to 1410191 Compare June 4, 2026 07:36
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2 Outdated
@bhcopeland bhcopeland force-pushed the fvp-aemva-shrinkwrap-2026.3.0-v9.7 branch from 1410191 to 60bb9a7 Compare June 4, 2026 09:36
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2 Outdated
@bhcopeland bhcopeland force-pushed the fvp-aemva-shrinkwrap-2026.3.0-v9.7 branch from 60bb9a7 to da4860d Compare June 4, 2026 10:28
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2
@bhcopeland bhcopeland force-pushed the fvp-aemva-shrinkwrap-2026.3.0-v9.7 branch 2 times, most recently from b233003 to 47e206a Compare June 5, 2026 13:05
Comment thread tuxlava/templates/jobs/fvp-aemva.yaml.jinja2 Outdated
Bump the shrinkwrap base-slim image to 2026.3.0 and update the FVP
binary path to FVP_Base_RevC_AEMvA_11.31_28, exposing Armv9.6/v9.7
hardware features (SVE2 v3, SME2 v3, has_lsfe, f16f32dot/mm, has_b16mm)
for modern kernel testing.

That breaks boot for kernels older than v6.5. They hang early on the
v9.6 model, before any console output: v6.6 boots, v6.1 and v5.15 do
not. The kernel sets up the SVE and SME EL2 traps with the wrong
register on VHE, so it traps and hangs once the v9.6 model turns on
SME2 and SVE2. This was fixed in v6.5 by the hVHE rework, for example
commit 45a3681a10ff ("KVM: arm64: Use the appropriate feature trap
register for SVE at EL2 setup"). v6.1 and v5.15 do not have it and it
cannot be backported cleanly.

Default to Armv9.7. Pass --parameters FVP_ARM_ARCH_VERSION=9.5 to clamp
the model to Armv9.5 so old kernels still boot. The same knob extends
naturally as Arm publishes new versions: gate each new feature on its
own version threshold and let callers select the latest version their
kernel supports.

Signed-off-by: Ben Copeland <ben.copeland@linaro.org>
@bhcopeland bhcopeland force-pushed the fvp-aemva-shrinkwrap-2026.3.0-v9.7 branch from 47e206a to 5194c01 Compare June 5, 2026 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants