Fix table spaces. Remove Oryon from ARM list again.

The latter change keeps https://flavors.scs.community/ in sync with
the current definitions.

Signed-off-by: Kurt Garloff <[email protected]>

Author: garloff

Standards/scs-0100-v3-flavor-naming.md

@@ -367,15 +367,15 @@ The options for arch are as follows:
 The generation is vendor specific and can be left out, but it can only be specified in
 conjunction with a vendor. At present, these values are possible:
 
-| Generation | i (Intel x86-64)  | z (AMD x86-64) |  a (AArch64)         | r (RISC-V) |
+| Generation | i (Intel x86-64)  | z (AMD x86-64) | a (AArch64)          | r (RISC-V) |
 | ---------- | ----------------- | -------------- | -------------------- | ---------- |
 | 0          | pre Skylake       | pre Zen        | pre Cortex A76       | TBD        |
 | 1          | Skylake           | Zen-1 (Naples) | A76/NeoN1 class      | TBD        |
 | 2          | Cascade Lake      | Zen-2 (Rome)   | A78/x1/NeoV1 class   | TBD        |
 | 3          | Ice Lake          | Zen-3 (Milan)  | A71x/NeoN2/V2(ARMv9) | TBD        |
 | 4          | Sapphire Rapids   | Zen-4 (Genoa)  | AmpereOne (ARMv8.6)  | TBD        |
 | 5          | Sierra Forest(E)  | Zen-5 (Turin)  | A72x/NeoN3/V3(Av9.2) | TBD        |
-| 6          | Granite Rapids(P) | Zen-6 (Venice)   |                            | TBD       |
+| 6          | Granite Rapids(P) | Zen-6 (Venice) |                      | TBD        |
 
 It is recommended to leave out the `0` when specifying the old generation; this will
 help the parser tool, which assumes 0 for an unspecified value and does leave it

Tests/iaas/scs_0100_flavor_naming/flavor_names.py

@@ -208,7 +208,7 @@ class CPUBrand:
         "z": {None: '(unspecified)', 0: "Unspec/Pre-Zen", 1: "Zen 1", 2: "Zen 2", 3: "Zen 3", 4: "Zen 4/4c", 5: "Zen 5/5c",
               6: 'Zen6/6c'},
         "a": {None: '(unspecified)', 0: "Unspec/Pre-A76", 1: "A76/NeoN1", 2: "A78/X1/NeoV1", 3: "A71x/NeoN2/V2",
-              4: "AmpereOne", 5: "A72x/NeoN3/V3", 6: "OryonV3"},
+              4: "AmpereOne", 5: "A72x/NeoN3/V3"},
         "r": {None: '(unspecified)', 0: "Unspec"},
     })
     perf = TblAttr("Performance", {"": "Std Perf", "h": "High Perf", "hh": "Very High Perf", "hhh": "Very Very High Perf"})