Removed unnecessary intrinsics structure level

Having a class that purely wraps a list was a hack around broken syntax
somewhere. Simple to re-add a (better named) class in the event that it
becomes more than a list.

examples/cfg/example/intrinsics.yml

@@ -1,6 +1,5 @@
 ---
 intrinsics:
-  intrinsics:
   - args:
     - arg_name: rd
       arg_type: i32

examples/cfg/example/intrinsics64.yml

@@ -1,6 +1,5 @@
 ---
 intrinsics:
-  intrinsics:
   - args:
     - arg_name: rd
       arg_type: i64

examples/cfg/openasip/intrinsics.yml

@@ -1,6 +1,5 @@
 ---
 intrinsics:
-  intrinsics:
   - args:
     - arg_name: rs1
       arg_type: i32

examples/cfg/tumeda/intrinsics.yml

@@ -1,6 +1,5 @@
 ---
 intrinsics:
-  intrinsics:
   - args:
     - arg_name: rd
       arg_type: i32

examples/cfg/xcorev/XCoreVAlu.yml

@@ -8,7 +8,6 @@ extensions:
     vendor: true
 intrinsics:
   # See: https://github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-builtin-spec.md#listing-of-multiply-accumulate-builtins-xcvmac
-  intrinsics:
   # unary
   - &ScalarCoreVAluGprIntrinsic
     args:

examples/cfg/xcorev/XCoreVBitmanip.yml

@@ -8,7 +8,6 @@ extensions:
     vendor: true
 intrinsics:
   # See: https://github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-builtin-spec.md#listing-of-pulp-bit-manipulation-builtins-xcvbitmanip
-  intrinsics:
   # unary (reg)
   - &ScalarCoreVBitmanipGprIntrinsic
     args:

examples/cfg/xcorev/XCoreVMac.yml

@@ -8,7 +8,6 @@ extensions:
     vendor: true
 intrinsics:
   # See: https://github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-builtin-spec.md#listing-of-multiply-accumulate-builtins-xcvmac
-  intrinsics:
   - &ScalarCoreVMacGprGprGprIntrinsic
     args:
     - arg_name: rd

examples/cfg/xcorev/XCoreVSimd.yml

@@ -8,7 +8,6 @@ extensions:
     vendor: true
 intrinsics:
   # See: https://github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-builtin-spec.md#listing-of-pulp-816-bit-simd-builtins-xcvsimd
-  intrinsics:
   # TODO: add SCI variants
   # TODO: add DIV2/4/8 variants
   # unary (reg)

seal5/backends/report/test_results/writer.py

@@ -242,7 +242,7 @@ def get_instr_cov(instr_def, tests, settings):
                         def lookup_intrin(instr_name, settings):
                             if settings.intrinsics is None:
                                 return None
-                            intrinsics = settings.intrinsics.intrinsics
+                            intrinsics = settings.intrinsics
                             if not intrinsics:
                                 return None
                             found = None

seal5/backends/riscv_instr_info/writer.py

@@ -346,9 +346,9 @@ def main():
                     metrics["success_instructions"].append(instr_def.name)
                     content = gen_riscv_instr_info_str(instr_def, set_def)
                     if len(content) > 0:
-                        if args.add_intrinsics and settings.intrinsics.intrinsics:
+                        if args.add_intrinsics and settings.intrinsics:
                             # TODO: intrinsics should be dict keyed by instr name
-                            for intrinsic in settings.intrinsics.intrinsics:
+                            for intrinsic in settings.intrinsics:
                                 if intrinsic.instr_name.casefold() in [
                                     instr_def.mnemonic.casefold(),
                                     instr_def.name.casefold(),

seal5/backends/riscv_intrinsics/writer.py

@@ -303,7 +303,7 @@ def main():
         # errs = []
         settings = model.get("settings", None)
         llvm_version = None
-        if not settings or not settings.intrinsics.intrinsics:
+        if not settings or not settings.intrinsics:
             logger.warning("No intrinsics configured; didn't need to invoke intrinsics writer.")
             quit()  # TODO: refactor this
         if settings:
@@ -329,11 +329,11 @@ def main():
             artifacts[set_name] = []
             metrics["n_sets"] += 1
             ext_settings = set_def.settings
-            if ext_settings is None or len(settings.intrinsics.intrinsics) == 0:
+            if ext_settings is None or len(settings.intrinsics) == 0:
                 metrics["n_skipped"] += 1
                 metrics["skipped_sets"].append(set_name)
                 continue
-            for intrinsic in settings.intrinsics.intrinsics:
+            for intrinsic in settings.intrinsics:
                 if intrinsic.set_name is not None and intrinsic.set_name != set_name:
                     continue
                 try:

seal5/settings.py

@@ -164,7 +164,7 @@
             "sparse_checkout": False,
         },
     },
-    "intrinsics": {},
+    "intrinsics": [],
 }
 
 
@@ -626,11 +626,6 @@ class IntrinsicDefn(YAMLSettings):
     args: Optional[List[IntrinsicArg]] = None
 
 
-@dataclass
-class IntrinsicsSettings(YAMLSettings):
-    intrinsics: Optional[List[IntrinsicDefn]] = None
-
-
 @dataclass
 class Seal5Settings(YAMLSettings):
     """Seal5 settings."""
@@ -652,7 +647,7 @@ class Seal5Settings(YAMLSettings):
     riscv: Optional[RISCVSettings] = None
     tools: Optional[ToolsSettings] = None
     metrics: list = field(default_factory=list)
-    intrinsics: Optional[IntrinsicsSettings] = None
+    intrinsics: Optional[List[IntrinsicDefn]] = None
 
     def reset(self):
         """Reset Seal5 seetings."""
@@ -684,7 +679,7 @@ def reset(self):
             transform_info=None,
             legalization=None,
         )
-        self.intrinsics = IntrinsicsSettings()
+        self.intrinsics = []
 
     def save(self, dest: Optional[Path] = None):
         """Save Seal5 settings to file."""