ci: replace instance m5d with instances c5n and m5n

c5n allows us to get a Skylake CPU consistently
m5n allows us to get a Cascade Lake CPU consistently

Update Skylake fingerprint baseline as the Skylake CPU used in c5n is
slightly different. The changes are:

    CPUID.(EAX=04H,ECX=3):ECX is "Number of Sets" of "Deterministic
    Cache".

    CPUID.80000003H is "Processor Branch String", which makes sense
    since the model string differs by 2 characters.

Signed-off-by: Pablo Barbáchano <pablob@amazon.com>

Author: pb8o

.buildkite/common.py

@@ -11,11 +11,12 @@
 from pathlib import Path
 
 DEFAULT_INSTANCES = [
-    "m5d.metal",
-    "m6i.metal",
-    "m6a.metal",
-    "m6g.metal",
-    "m7g.metal",
+    "c5n.metal",  # Intel Skylake
+    "m5n.metal",  # Intel Cascade Lake
+    "m6i.metal",  # Intel Icelake
+    "m6a.metal",  # AMD Milan
+    "m6g.metal",  # Graviton2
+    "m7g.metal",  # Graviton3
 ]
 
 DEFAULT_PLATFORMS = [

.buildkite/pipeline_cpu_template.py

@@ -27,7 +27,7 @@ class BkStep(str, Enum):
             "tools/devtool -y test -- -s -ra -m nonci -n4 --log-cli-level=INFO integration_tests/functional/test_cpu_features.py -k 'test_cpu_rdmsr' "
         ],
         BkStep.LABEL: "📖 rdmsr",
-        "instances": ["m5d.metal", "m6a.metal", "m6i.metal"],
+        "instances": ["c5n.metal", "m5n.metal", "m6a.metal", "m6i.metal"],
         "platforms": DEFAULT_PLATFORMS,
     },
     "cpuid_wrmsr": {
@@ -51,10 +51,11 @@ class BkStep(str, Enum):
             BkStep.TIMEOUT: 30,
         },
         "cross_instances": {
-            "m5d.metal": ["m6i.metal"],
-            "m6i.metal": ["m5d.metal"],
+            "m5n.metal": ["c5n.metal", "m6i.metal"],
+            "c5n.metal": ["m5n.metal", "m6i.metal"],
+            "m6i.metal": ["m5n.metal", "c5n.metal"],
         },
-        "instances": ["m5d.metal", "m6i.metal", "m6a.metal"],
+        "instances": ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"],
     },
     "fingerprint": {
         BkStep.COMMAND: [

.buildkite/pipeline_cross.py

@@ -17,7 +17,8 @@
 def restore_step(label, src_instance, src_kv, dst_instance, dst_os, dst_kv):
     """Generate a restore step"""
     pytest_keyword_for_instance = {
-        "m5d.metal": "-k 'not None'",
+        "c5n.metal": "-k 'not None'",
+        "m5n.metal": "-k 'not None'",
         "m6i.metal": "-k 'not None'",
         "m6a.metal": "",
     }
@@ -36,7 +37,7 @@ def restore_step(label, src_instance, src_kv, dst_instance, dst_os, dst_kv):
 
 def cross_steps():
     """Generate group steps"""
-    snap_instances = ["m5d.metal", "m6i.metal", "m6a.metal"]
+    snap_instances = ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"]
     groups = []
     commands = [
         "./tools/devtool -y sh ./tools/create_snapshot_artifact/main.py",
@@ -59,11 +60,12 @@ def cross_steps():
     # allow-list of what instances can be restores on what other instances (in
     # addition to itself)
     supported = {
-        "m5d.metal": ["m6i.metal"],
-        "m6i.metal": ["m5d.metal"],
+        "c5n.metal": ["m5n.metal", "m6i.metal"],
+        "m5n.metal": ["c5n.metal", "m6i.metal"],
+        "m6i.metal": ["c5n.metal", "m5n.metal"],
     }
 
-    instances_x86_64 = ["m5d.metal", "m6i.metal", "m6a.metal"]
+    instances_x86_64 = ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"]
     # https://github.com/firecracker-microvm/firecracker/blob/main/docs/kernel-policy.md#experimental-snapshot-compatibility-across-kernel-versions
     # We currently have nothing for aarch64
     perms_aarch64 = []

README.md

@@ -132,9 +132,10 @@ We test all combinations of:
 
 | Instance  | Host OS & Kernel  | Guest Rootfs | Guest Kernel |
 |:----------|:------------------|:-------------|:-------------|
-| m5d.metal | al2    linux_4.14 | ubuntu 22.04 | linux_4.14   |
-| m6i.metal | al2    linux_5.10 |              | linux_5.10   |
-| m6a.metal | al2023 linux_6.1  |              |              |
+| c5n.metal | al2    linux_4.14 | ubuntu 22.04 | linux_4.14   |
+| m5n.metal | al2    linux_5.10 |              | linux_5.10   |
+| m6i.metal | al2023 linux_6.1  |              |              |
+| m6a.metal |                   |              |              |
 | m6g.metal |                   |              |              |
 | m7g.metal |                   |              |              |
 

docs/snapshotting/snapshot-support.md

@@ -106,16 +106,8 @@ process will be terminated.
 ### Performance
 
 The Firecracker snapshot create/resume performance depends on the memory size,
-vCPU count and emulated devices count.
-The Firecracker CI runs snapshot tests on:
-
-- AWS **m5d.metal** and **m6i.metal** instances for Intel
-- AWS **m6g.metal** and **c7g.metal** for ARM
-- AWS **m6a.metal** for AMD
-
-We are running nightly performance tests for all the enumerated platforms on
-all supported kernel versions.
-The baselines can be found in their [respective config file](../../tests/integration_tests/performance/configs/).
+vCPU count and emulated devices count. The Firecracker CI runs snapshot tests on
+all [supported platforms](../../README.md#tested-platforms).
 
 ### Developer preview status
 

tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_4.14host.json

@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.7.0-dev",
-  "kernel_version": "4.14.334-252.552.amzn2.x86_64",
+  "kernel_version": "4.14.336-253.554.amzn2.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
   "bios_revision": "3.80",
@@ -183,7 +183,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000000000001011111111111111"
+            "bitmap": "0b00000000000000001000111111111111"
           },
           {
             "register": "edx",
@@ -785,7 +785,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00110101001011100011001000100000"
+            "bitmap": "0b00110000001011100011001100100000"
           }
         ]
       },

tests/data/cpu_template_helper/fingerprint_INTEL_SKYLAKE_5.10host.json

@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.7.0-dev",
-  "kernel_version": "5.10.205-195.804.amzn2.x86_64",
+  "kernel_version": "5.10.205-195.807.amzn2.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
   "bios_revision": "3.80",
@@ -183,7 +183,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000000000001011111111111111"
+            "bitmap": "0b00000000000000001000111111111111"
           },
           {
             "register": "edx",
@@ -969,7 +969,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00110101001011100011001000100000"
+            "bitmap": "0b00110000001011100011001100100000"
           }
         ]
       },

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

@@ -1,6 +1,6 @@
 {
   "firecracker_version": "1.7.0-dev",
-  "kernel_version": "6.1.66-93.164.amzn2023.x86_64",
+  "kernel_version": "6.1.72-96.166.amzn2023.x86_64",
   "microcode_version": "0x2007006",
   "bios_version": "1.0",
   "bios_revision": "3.80",
@@ -183,7 +183,7 @@
           },
           {
             "register": "ecx",
-            "bitmap": "0b00000000000000001011111111111111"
+            "bitmap": "0b00000000000000001000111111111111"
           },
           {
             "register": "edx",
@@ -969,7 +969,7 @@
           },
           {
             "register": "edx",
-            "bitmap": "0b00110101001011100011001000100000"
+            "bitmap": "0b00110000001011100011001100100000"
           }
         ]
       },