Skip to content

Commit c8099be

Browse files
roypatroypat
authored
Merge branch 'main' into kani-timeout
2 parents db365d1 + 797faa8 commit c8099be

20 files changed

+75
-47
lines changed

‎.buildkite/pipeline_cpu_template.py‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,18 @@ def group_snapshot_restore(test_step):
8888
groups = []
8989

9090
groups.append(
91-
group(
92-
label=test_step["snapshot"][BkStep.LABEL],
93-
command=test_step["snapshot"][BkStep.COMMAND],
94-
instances=test_step["instances"],
95-
platforms=DEFAULT_PLATFORMS,
96-
timeout=test_step["snapshot"][BkStep.TIMEOUT],
97-
artifacts=test_step["snapshot"][BkStep.ARTIFACTS],
98-
)
91+
{
92+
"key": "snapshot",
93+
**group(
94+
label=test_step["snapshot"][BkStep.LABEL],
95+
command=test_step["snapshot"][BkStep.COMMAND],
96+
instances=test_step["instances"],
97+
platforms=DEFAULT_PLATFORMS,
98+
timeout=test_step["snapshot"][BkStep.TIMEOUT],
99+
artifacts=test_step["snapshot"][BkStep.ARTIFACTS],
100+
),
101+
}
99102
)
100-
groups.append("wait")
101103
snapshot_restore_combinations = []
102104
for dp in DEFAULT_PLATFORMS:
103105
for src_instance in test_step["instances"]:
@@ -137,7 +139,9 @@ def group_snapshot_restore(test_step):
137139
}
138140
)
139141

140-
groups.append({"group": "📸 restores snapshots", "steps": steps})
142+
groups.append(
143+
{"group": "📸 restores snapshots", "steps": steps, "depends_on": "snapshot"}
144+
)
141145
return groups
142146

143147

‎.buildkite/pipeline_perf.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,41 @@
1818
perf_test = {
1919
"virtio-block-sync": {
2020
"label": "💿 Virtio Sync Block Performance",
21-
"tests": "integration_tests/performance/test_block_ab.py::test_block_performance -k 'not Async'",
21+
"tests": "integration_tests/performance/test_block.py::test_block_performance -k 'not Async'",
2222
"devtool_opts": "-c 1-10 -m 0",
2323
},
2424
"virtio-block-async": {
2525
"label": "💿 Virtio Async Block Performance",
26-
"tests": "integration_tests/performance/test_block_ab.py::test_block_performance -k Async",
26+
"tests": "integration_tests/performance/test_block.py::test_block_performance -k Async",
2727
"devtool_opts": "-c 1-10 -m 0",
2828
},
2929
"vhost-user-block": {
3030
"label": "💿 vhost-user Block Performance",
31-
"tests": "integration_tests/performance/test_block_ab.py::test_block_vhost_user_performance",
31+
"tests": "integration_tests/performance/test_block.py::test_block_vhost_user_performance",
3232
"devtool_opts": "-c 1-10 -m 0",
3333
"ab_opts": "--noise-threshold 0.1",
3434
},
3535
"network": {
3636
"label": "📠 Network Latency and Throughput",
37-
"tests": "integration_tests/performance/test_network_ab.py",
37+
"tests": "integration_tests/performance/test_network.py",
3838
"devtool_opts": "-c 1-10 -m 0",
3939
# Triggers if delta is > 0.01ms (10µs) or default relative threshold (5%)
4040
# only relevant for latency test, throughput test will always be magnitudes above this anyway
4141
"ab_opts": "--absolute-strength 0.010",
4242
},
4343
"snapshot-latency": {
4444
"label": "📸 Snapshot Latency",
45-
"tests": "integration_tests/performance/test_snapshot_ab.py::test_restore_latency integration_tests/performance/test_snapshot_ab.py::test_post_restore_latency",
45+
"tests": "integration_tests/performance/test_snapshot.py::test_restore_latency integration_tests/performance/test_snapshot.py::test_post_restore_latency integration_tests/performance/test_snapshot.py::test_snapshot_create_latency",
4646
"devtool_opts": "-c 1-12 -m 0",
4747
},
4848
"population-latency": {
4949
"label": "📸 Memory Population Latency",
50-
"tests": "integration_tests/performance/test_snapshot_ab.py::test_population_latency",
50+
"tests": "integration_tests/performance/test_snapshot.py::test_population_latency",
5151
"devtool_opts": "-c 1-12 -m 0",
5252
},
5353
"vsock-throughput": {
5454
"label": "🧦 Vsock Throughput",
55-
"tests": "integration_tests/performance/test_vsock_ab.py",
55+
"tests": "integration_tests/performance/test_vsock.py",
5656
"devtool_opts": "-c 1-10 -m 0",
5757
},
5858
"memory-overhead": {

‎tests/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ BUILDKITE_PULL_REQUEST=true BUILDKITE_PULL_REQUEST_BASE_BRANCH=main ./tools/devt
162162
Firecracker has a special framework for orchestrating long-running A/B-tests
163163
which run outside the pre-PR CI. Instead, these tests are scheduled to run
164164
post-merge. Specific tests, such as our
165-
[snapshot restore latency tests](integration_tests/performance/test_snapshot_ab.py)
165+
[snapshot restore latency tests](integration_tests/performance/test_snapshot.py)
166166
contain no assertions themselves, but rather they emit data series using the
167167
`aws_embedded_metrics` library. When executed by the
168168
[`tools/ab_test.py`](../tools/ab_test.py) orchestration script, these data

‎tests/conftest.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from framework import defs, utils
3535
from framework.artifacts import disks, kernel_params
3636
from framework.defs import DEFAULT_BINARY_DIR
37-
from framework.microvm import MicroVMFactory
37+
from framework.microvm import MicroVMFactory, SnapshotType
3838
from framework.properties import global_props
3939
from framework.utils_cpu_templates import (
4040
custom_cpu_templates_params,
@@ -411,6 +411,12 @@ def io_engine(request):
411411
return request.param
412412

413413

414+
@pytest.fixture(params=[SnapshotType.DIFF, SnapshotType.FULL])
415+
def snapshot_type(request):
416+
"""All possible snapshot types"""
417+
return request.param
418+
419+
414420
@pytest.fixture
415421
def results_dir(request, pytestconfig):
416422
"""

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V2_6.1host.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.12.0-dev",
3-
"kernel_version": "6.1.129-138.220.amzn2023.aarch64",
2+
"firecracker_version": "1.13.0-dev",
3+
"kernel_version": "6.1.140-154.222.amzn2023.aarch64",
44
"microcode_version": "0x0000000000000017",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -834,7 +834,7 @@
834834
},
835835
{
836836
"addr": "0x6030000000140003",
837-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010"
837+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001"
838838
},
839839
{
840840
"addr": "0x6030000000160000",

‎tests/data/cpu_template_helper/fingerprint_INTEL_SAPPHIRE_RAPIDS_6.1host.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.12.0-dev",
3-
"kernel_version": "6.1.129-138.220.amzn2023.x86_64",
4-
"microcode_version": "0x2b000620",
2+
"firecracker_version": "1.13.0-dev",
3+
"kernel_version": "6.1.140-154.222.amzn2023.x86_64",
4+
"microcode_version": "0x2b000639",
55
"bios_version": "1.0",
6-
"bios_revision": "3.3",
6+
"bios_revision": "3.10",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1431,7 +1431,7 @@
14311431
},
14321432
{
14331433
"addr": "0x10a",
1434-
"bitmap": "0b0000000000000000000000000000000000001100000010001110000011101011"
1434+
"bitmap": "0b0100000000000000000000000000000000001100000010001110000011101011"
14351435
},
14361436
{
14371437
"addr": "0x140",

‎tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_6.1host.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"firecracker_version": "1.12.0-dev",
3-
"kernel_version": "6.1.129-138.220.amzn2023.x86_64",
2+
"firecracker_version": "1.13.0-dev",
3+
"kernel_version": "6.1.140-154.222.amzn2023.x86_64",
44
"microcode_version": "0x2007006",
55
"bios_version": "1.0",
6-
"bios_revision": "4.11",
6+
"bios_revision": "4.13",
77
"guest_cpu_config": {
88
"kvm_capabilities": [],
99
"cpuid_modifiers": [
@@ -1128,7 +1128,7 @@
11281128
},
11291129
{
11301130
"addr": "0x10a",
1131-
"bitmap": "0b0000000000000000000000000000000000001100000000000000000001001100"
1131+
"bitmap": "0b0100000000000000000000000000000000001100000000000000000001001100"
11321132
},
11331133
{
11341134
"addr": "0x140",

‎tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_5.10guest.csv‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MSR_ADDR,VALUE
22
0x0,0x0
33
0x1,0x0
4-
0x10,0xbae96682
4+
0x10,0x7c90dcf2
55
0x11,0x24a1008
66
0x12,0x24a2001
77
0x17,0x0
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
1818
0xcd,0x3
1919
0xce,0x80000000
2020
0xfe,0x508
21-
0x10a,0xc08e0eb
21+
0x10a,0x400000000c08e0eb
2222
0x11e,0xbe702111
2323
0x122,0x3
2424
0x140,0x0
@@ -200,7 +200,7 @@ MSR_ADDR,VALUE
200200
0x619,0x0
201201
0x639,0x0
202202
0x641,0x0
203-
0x6e0,0x18e92c0b0
203+
0x6e0,0x7d409184
204204
0x800,0x0
205205
0x801,0x0
206206
0x802,0x0
@@ -462,7 +462,7 @@ MSR_ADDR,VALUE
462462
0xc0000082,0xffffffff81a00080
463463
0xc0000083,0xffffffff81a015c0
464464
0xc0000084,0x47700
465-
0xc0000100,0x7f1687b37740
465+
0xc0000100,0x3d11f380
466466
0xc0000101,0xffff88803ec00000
467467
0xc0000102,0x0
468468
0xc0000103,0x0

‎tests/data/msr/msr_list_SPR_TO_T2_6.1_INTEL_SAPPHIRE_RAPIDS_6.1host_6.1guest.csv‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MSR_ADDR,VALUE
22
0x0,0x0
33
0x1,0x0
4-
0x10,0x7b423550
4+
0x10,0x6f38b066
55
0x11,0x25cb008
66
0x12,0x25cc001
77
0x17,0x0
@@ -18,7 +18,7 @@ MSR_ADDR,VALUE
1818
0xcd,0x3
1919
0xce,0x80000000
2020
0xfe,0x508
21-
0x10a,0xc08e0eb
21+
0x10a,0x400000000c08e0eb
2222
0x11e,0xbe702111
2323
0x122,0x3
2424
0x140,0x0
@@ -200,7 +200,7 @@ MSR_ADDR,VALUE
200200
0x619,0x0
201201
0x639,0x0
202202
0x641,0x0
203-
0x6e0,0x162fb7dfe
203+
0x6e0,0x6f8e7c12
204204
0x800,0x0
205205
0x801,0x0
206206
0x802,0x0
@@ -462,7 +462,7 @@ MSR_ADDR,VALUE
462462
0xc0000082,0xffffffff81a00080
463463
0xc0000083,0x0
464464
0xc0000084,0x257fd5
465-
0xc0000100,0x7fbb7b0e1740
465+
0xc0000100,0x14cb9380
466466
0xc0000101,0xffff88803ec00000
467467
0xc0000102,0x0
468468
0xc0000103,0x0

‎tests/integration_tests/build/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
# SPDX-License-Identifier: Apache-2.0

0 commit comments

Comments
 (0)