Intrinsic for example subincacc instruction

Definition and test case for subincacc. Partially addresses #67 and #68

examples/cfg/example/intrinsics.yml

@@ -0,0 +1,13 @@
+---
+intrinsics:
+  intrinsics:
+  - args:
+    - arg_name: rd
+      arg_type: i32
+    - arg_name: rs1
+      arg_type: i32
+    - arg_name: rs2
+      arg_type: i32
+    instr_name: xexample.subincacc
+    intrinsic_name: subincacc
+    ret_type: i32

examples/demo.py

@@ -94,6 +94,7 @@
     EXAMPLES_DIR / "cfg" / "tests.yml",
     EXAMPLES_DIR / "cfg" / "passes.yml",
     EXAMPLES_DIR / "cfg" / "git.yml",
+    EXAMPLES_DIR / "cfg" / "example/intrinsics.yml",
 ]
 seal5_flow.load(cfg_files, verbose=VERBOSE, overwrite=False)
 

examples/tests/example/test_subincacc.c

@@ -23,3 +23,13 @@ __attribute__((naked)) void test_subincacc() {
     // CHECK: ab ba b5 51 xexample.subincacc x21, x11, x27
     asm("xexample.subincacc x21, x11, x27");
 }
+
+void test_intrinsic() {
+    // CHECK: <test_intrinsic>
+    int a = 3;
+    int b = 7;
+    int c = 4;
+    // Can't rely upon specific registers being used but at least instruction should have been used
+    // CHECK: example.subincacc
+    c = __builtin_xexample_subincacc(a, b, c);
+}

seal5/backends/riscv_instr_info/writer.py

@@ -241,7 +241,7 @@ def main():
     parser.add_argument("--metrics", default=None, help="Output metrics to file")
     parser.add_argument("--index", default=None, help="Output index to file")
     parser.add_argument("--ext", type=str, default="td", help="Default file extension (if using --splitted)")
-    parser.add_argument("--add-intrinsics", type=bool, default=True, action=argparse.BooleanOptionalAction, help="Include patterns for intrinsic functions")
+    parser.add_argument("--no-add-intrinsics", dest='add_intrinsics', default=True, action='store_false', help="Suppress patterns for intrinsic functions")
     args = parser.parse_args()
 
     # initialize logging

seal5/backends/riscv_intrinsics/writer.py

@@ -47,9 +47,8 @@ def build_target(arch: str, intrinsic: IntrinsicDefn):
 
 def ir_type_to_pattern(ir_type: str):
     # needs fleshing out with all likely types
-    match ir_type:
-        case 'i32':
-            return 'llvm_i32_ty'
+    if ir_type == 'i32':
+        return 'llvm_i32_ty'
     raise NotImplementedError(f'Unhandled ir_type "{ir_type}"')
 
 def build_attr(arch: str, intrinsic: IntrinsicDefn):
@@ -77,9 +76,11 @@ def build_emit(arch: str, intrinsic: IntrinsicDefn):
 
 @dataclass
 class PatchFrag:
-   patchee: str
-   tag: str
-   contents: str = ""
+    """Pairs patch contents to location to apply it"""
+    patchee: str
+    tag: str
+    contents: str = ""
+
 
 def main():
     """Main app entrypoint."""
@@ -113,7 +114,7 @@ def main():
     else:
         out_path = pathlib.Path(args.output)
 
-    logger.info("loading models")
+    logger.info("intrinsics/writer - loading models")
     if not is_seal5_model:
         raise NotImplementedError
 

seal5/flow.py

@@ -81,6 +81,7 @@
     # ("riscv_instr_formats", passes.gen_riscv_instr_formats_patch, {}),
     ("riscv_register_info", passes.gen_riscv_register_info_patch, {}),
     ("riscv_instr_info", passes.gen_riscv_instr_info_patch, {}),
+    ("riscv_intrinsics", passes.gen_riscv_intrinsics, {}),
     # subtarget_tests
     # register_types
     # operand_types

seal5/pass_list.py

@@ -1076,7 +1076,6 @@ def gen_riscv_isa_info_patch(
         print_func=logger.info if verbose else logger.debug,
         live=True,
     )
-#    breakpoint()
     if gen_index_file:
         if index_file.is_file():
             patch_name = f"riscv_isa_info_{input_file.stem}"
@@ -1138,7 +1137,6 @@ def gen_riscv_intrinsics(
         print_func=logger.info if verbose else logger.debug,
         live=True,
     )
-#    breakpoint()
     if gen_index_file:
         if index_file.is_file():
             patch_base = f"riscv_intrinsics_target_{input_file.stem}"
@@ -1166,7 +1164,6 @@ def gen_riscv_instr_info_patch(
     **_kwargs,
 ):
     # assert not split, "TODO"
-#    breakpoint()
     assert split, "TODO"
     # formats = True
     gen_metrics_file = True