Skip to content

Conversation

fbq815
Copy link
Contributor

@fbq815 fbq815 commented Sep 19, 2025

CPU: add new subfunctions msa13,msa11,msa10 to tests on s390x, remove the unsupported gen16 cpu model on RHEL7

ID: 3939

Signed-off-by: bfu [email protected]

CPU: add new subfunctions msa13,msa11,msa10 to tests on s390x, remove
the unsupported gen16 cpu model on RHEL7

Signed-off-by: bfu [email protected]
@fbq815
Copy link
Contributor Author

fbq815 commented Sep 19, 2025

RHEL9:
JOB ID : 4f1cc0f1d4ccc121577fee259938f0ffbc77334e
JOB LOG : /root/avocado/job-results/job-2025-09-19T07.58-4f1cc0f/job.log
(01/10)s390x_cpu_model.expansion.model_type_z196_z196_2_z114.s390-virtio: PASS (30.78 s)
(02/10)s390x_cpu_model.expansion.model_type_zEC12_zEC12_2_zBC12.s390-virtio: PASS (31.77 s)
(03/10)s390x_cpu_model.expansion.model_type_z13_z13_2_z13s.s390-virtio: PASS (26.79 s)
(04/10)s390x_cpu_model.expansion.model_type_z14_z14_2_z14ZR1.s390-virtio: PASS (27.16 s)
(05/10)s390x_cpu_model.expansion.model_type_gen15a_gen15b.s390-virtio: PASS (26.85 s)
(06/10)s390x_cpu_model.expansion.model_type_gen16a_gen16b.s390-virtio: CANCEL: Got host qemu version:9.1.0-26, which is not in (,7.1.0] (2.85 s)
(07/10)s390x_cpu_model.expansion.model_type_gen16a_gen16b_with_paie.s390-virtio: PASS (26.28 s)
(08/10)s390x_cpu_model.expansion.model_type_gen17a_gen17b_with_paie.s390-virtio: PASS (26.98 s)
(09/10)s390x_cpu_model.boot_cpu_models.s390-virtio: PASS (194.02 s)
(10/10)s390x_cpu_model.cpu_baseline.s390-virtio: PASS (26.50 s)
RESULTS : PASS 9 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1
JOB HTML : /root/avocado/job-results/job-2025-09-19T07.58-4f1cc0f/results.html
JOB TIME : 425.70 s

RHEL10:
JOB ID : f092889e278cd8633ef0411012ed5eb63407fbe0
JOB LOG : /root/avocado/job-results/job-2025-09-19T07.59-f092889/job.log
(1/9)s390x_cpu_model.expansion.model_type_zEC12_zEC12_2_zBC12.s390-virtio: PASS (28.19 s)
(2/9)s390x_cpu_model.expansion.model_type_z13_z13_2_z13s.s390-virtio: PASS (26.60 s)
(3/9)s390x_cpu_model.expansion.model_type_z14_z14_2_z14ZR1.s390-virtio: PASS (27.40 s)
(4/9)s390x_cpu_model.expansion.model_type_gen15a_gen15b.s390-virtio: PASS (27.37 s)
(5/9)s390x_cpu_model.expansion.model_type_gen16a_gen16b.s390-virtio: CANCEL: Got host qemu version:10.0.0-12, which is not in (,7.1.0] (2.08 s)
(6/9)s390x_cpu_model.expansion.model_type_gen16a_gen16b_with_paie.s390-virtio: PASS (27.34 s)
(7/9)s390x_cpu_model.expansion.model_type_gen17a_gen17b_with_paie.s390-virtio: PASS (27.39 s)
(8/9)s390x_cpu_model.boot_cpu_models.s390-virtio: PASS (153.51 s)
(9/9)s390x_cpu_model.cpu_baseline.s390-virtio: PASS (26.88 s)
RESULTS : PASS 8 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1
JOB HTML : /root/avocado/job-results/job-2025-09-19T07.59-f092889/results.html
JOB TIME : 354.61 s

@PaulYuuu please help me review this patch
@smitterl FYI

Copy link
Contributor

@smitterl smitterl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @fbq815 Thanks for this.
Your commit message says "add new subfunctions msa13,msa11,msa10 to tests on s390x" but I don't see any change about this specifically. Can you please clarify?

There are also some minor nitpicks, please check my comments. Please keep also in mind the avocado styleguide for your commit message and header - https://avocado-framework.readthedocs.io/en/latest/guides/contributor/chapters/styleguides.html#commit-style-guide

Rest LGTM, thanks.

cpu_model_check_args = '{"type": "static", "model": {"name": "host"}}'
RHEL.7:
boot_cpu_models = 'z196,z196.2,z114;zEC12,zEC12.2,zBC12;z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
boot_cpu_models = 'z196,z196.2,z114;zEC12,zEC12.2,zBC12;z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a native English speaker but I think your commit message can be misunderstood

remove the unsupported gen16 cpu model on RHEL7

I think it would be clearer to say something like

RHEL 7 doesn't support cpu models after gen15, remove gen16.

required_qemu = (7.1.0,)
cpu_models = "gen16a gen16b"
props = 'nnpa=True aen=True vxpdeh=True aefsi=True mepoch=True msa9=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True deflate=True edat2=True etoken=True vx=True ipter=True pai=True paie=True mepochptff=True vxeh=True vxpd=True esop=True msa9_pckmo=True vxeh2=True iep=True cte=True gs=True ppa15=True zpci=True rdp=True sea_esop2=True beareh=True te=True cmm=True vxpdeh2=True'
- model_type_gen17a_gen17b_with_paie:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this called with_paie, is there an alternative, does gen17a/b work without pai? What does that mean? Can you add the answer to your commit message?

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.

3 participants