domains: Move domain configs to elaborate configs

Signed-off-by: Krishnan Winter <krishnan.winter@unsw.edu.au>

Author: Kswin01

build_sdk.py

@@ -465,29 +465,6 @@ class KernelPath:
             }
         },
     ),
-    # TODO: This is experimental for now, do this in a better way
-    ConfigInfo(
-        name="release_domains",
-        debug=False,
-        kernel_options={
-            "KernelNumDomains": 256,
-            "KernelNumDomainSchedules": 256,
-        },
-        kernel_options_arch={},
-    ),
-    ConfigInfo(
-        name="debug_domains",
-        debug=True,
-        kernel_options={
-            "KernelDebugBuild": True,
-            "KernelPrinting": True,
-            "KernelVerificationBuild": False,
-            "KernelNumDomains": 256,
-            "KernelNumDomainSchedules": 256,
-        },
-        kernel_options_arch={},
-    ),
-
 )
 
 
@@ -512,6 +489,15 @@ def elaborate_all_board_configs(board: BoardInfo) -> list[ConfigInfo]:
             }
             elaborated_configs.append(config)
 
+    for config in SUPPORTED_CONFIGS:
+        config = copy.deepcopy(config)
+        config.name = f"domain-{config.name}"
+        config.kernel_options |= {
+            "KernelNumDomains": 64,
+            "KernelNumDomainSchedules": 128,
+        }
+        elaborated_configs.append(config)
+
     return elaborated_configs
 
 

docs/manual.md

@@ -1143,9 +1143,9 @@ The `end` element has the following attributes:
 The `id` is passed to the PD in the `notified` and `protected` entry points.
 The `id` should be passed to the `microkit_notify` and `microkit_ppcall` functions.
 
-## `domain_schedule` (experimental)
+## `domain_schedule`
 
-The `domain_schedule` element, by default, has a list of up to 256 `domain` child elements. This can be configured by changing the number of schedule entries defined in the `release_domains` and `debug_domains` configs in `build_sdk.py`. Each child specifies a particular timeslice in the domain schedule and the order of the child elements specifies the order in which the timeslices will be scheduled. A domain may be named more than once in the schedule, in which case the domain will have multiple timeslices in the schedule.
+The `domain_schedule` element, by default, has a list of up to 128 `domain` child elements (bounded by the kernel config). This can be configured by changing the number of schedule entries defined in `elaborate_all_board_configs` in `build_sdk.py`. Each child specifies a particular timeslice in the domain schedule and the order of the child elements specifies the order in which the timeslices will be scheduled. A domain may be named more than once in the schedule, in which case the domain will have multiple timeslices in the schedule.
 
 The `domain` element has the following attributes:
 
@@ -1161,7 +1161,7 @@ The `domain_idx_shift` element has the following attribute:
 The `domain_start` element has the following attribute:
 * `index`: This is the start index of the domain schedule. When the kernel reaches the end of the domain schedule, it will wrap around to this index again. This index is an offset into the user defined schedule, and not an absolute index. If no domain start index is set, then the Microkit tool will set this to 0 by default.
 
-The `domain_schedule` element is only valid if the using one of the domain configs (`release_domains`, `debug_domains`).
+The `domain_schedule` element is only valid if the using one of the domain configs (`domain-release`, `domain-debug`, `domain-benchmark`).
 
 # Board Support Packages {#bsps}
 

tool/microkit/src/capdl/packaging.rs

@@ -52,9 +52,9 @@ pub fn pack_spec_into_initial_task(
 
     for named_obj in output_spec.objects.iter_mut() {
         match build_config {
-            "smp-debug" | "debug" | "debug_domains" => {}
+            "smp-debug" | "debug" | "domain-debug" => {}
             // We don't copy over the object names as there is no debug printing in these configuration to save memory.
-            "release" | "release_domains" | "benchmark" | "smp-release" | "smp-benchmark" => {
+            "release" | "benchmark" | "smp-release" | "smp-benchmark" | "domain-release" | "domain-benchmark" => {
                 named_obj.name = None
             }
             _ => panic!("unknown configuration {build_config}"),