fix prefix overrides

tum-ei-eda · Mar 19, 2024 · b42577f · b42577f
1 parent 00d11c1
commit b42577f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/examples/cfg/xcorev/XCoreVAlu.yml b/examples/cfg/xcorev/XCoreVAlu.yml
@@ -8,7 +8,7 @@ extensions:
     vendor: true
 passes:
   per_model:
-    XCoreVMac:
+    XCoreVAlu:
       overrides:
         convert_models:
-          prefix: "SEAL5"
+          prefix: "SEAL5_"
diff --git a/examples/cfg/xcorev/XCoreVBitmanip.yml b/examples/cfg/xcorev/XCoreVBitmanip.yml
@@ -8,7 +8,7 @@ extensions:
     vendor: true
 passes:
   per_model:
-    XCoreVMac:
+    XCoreVBitmanip:
       overrides:
         convert_models:
-          prefix: "SEAL5"
+          prefix: "SEAL5_"
diff --git a/examples/cfg/xcorev/XCoreVBranchImmediate.yml b/examples/cfg/xcorev/XCoreVBranchImmediate.yml
@@ -8,7 +8,7 @@ extensions:
     vendor: true
 passes:
   per_model:
-    XCoreVMac:
+    XCoreVBranchImmediate:
       overrides:
         convert_models:
-          prefix: "SEAL5"
+          prefix: "SEAL5_"
diff --git a/examples/cfg/xcorev/XCoreVMac.yml b/examples/cfg/xcorev/XCoreVMac.yml
@@ -11,4 +11,4 @@ passes:
     XCoreVMac:
       overrides:
         convert_models:
-          prefix: "SEAL5"
+          prefix: "SEAL5_"
diff --git a/examples/cfg/xcorev/XCoreVMem.yml b/examples/cfg/xcorev/XCoreVMem.yml
@@ -8,7 +8,7 @@ extensions:
     vendor: true
 passes:
   per_model:
-    XCoreVMac:
+    XCoreVMem:
       overrides:
         convert_models:
-          prefix: "SEAL5"
+          prefix: "SEAL5_"
diff --git a/examples/cfg/xcorev/XCoreVSimd.yml b/examples/cfg/xcorev/XCoreVSimd.yml
@@ -8,7 +8,7 @@ extensions:
     vendor: true
 passes:
   per_model:
-    XCoreVMac:
+    XCoreVSimd:
       overrides:
         convert_models:
-          prefix: "SEAL5"
+          prefix: "SEAL5_"
diff --git a/seal5/transform/converter.py b/seal5/transform/converter.py
@@ -67,8 +67,9 @@ def main():
         logger.info("replacing set %s", set_name)
         for enc, instr_def in set_def.instructions.items():
             if args.prefix:
-                instr_def.name = f"{args.prefix.upper()}_{instr_def.name}"
-                instr_def.mnemonic = f"{args.prefix.lower()}.{instr_def.mnemonic}"
+                instr_def.name = f"{args.prefix.upper()}{instr_def.name}"
+                prefix_ = args.prefix.lower().replace("_", ".")
+                instr_def.mnemonic = f"{prefix_}.{instr_def.mnemonic}"
             set_def.instructions[enc] = seal5_model.Seal5Instruction(
                 instr_def.name,
                 instr_def.attributes,