fix: remove '_RV32' suffix for CSRs and conditionally generate multi versions for multi arch encoded instructions

Author: AliAlaa88

backends/generators/generator.py

@@ -276,15 +276,17 @@ def load_instructions(
 
                         # Process RV64 encoding
                         rv64_match = rv64_encoding.get("match")
+                        rv32_match = rv32_encoding.get("match")
+
                         if rv64_match:
                             instr_dict[name] = {
                                 "match": rv64_match
                             }  # RV64 gets the default name
 
-                        # Process RV32 encoding with a _rv32 suffix
-                        rv32_match = rv32_encoding.get("match")
-                        if rv32_match:
-                            instr_dict[f"{name}_rv32"] = {"match": rv32_match}
+                        if rv32_match and rv32_match != rv64_match:
+                            # Process RV32 encoding with a _rv32 suffix
+                            if rv32_match:
+                                instr_dict[f"{name}_rv32"] = {"match": rv32_match}
 
                         continue  # Skip the rest of the loop as we've already added the encodings
                 elif "RV64" in encoding:
@@ -442,10 +444,11 @@ def load_csrs(csr_root, enabled_extensions, include_all=False, target_arch="RV64
                     addr_int = int(addr_to_use, 0)
 
                 # For BOTH architecture, add suffix to RV32-specific CSRs
-                if target_arch == "BOTH" and base == 32:
-                    csrs[addr_int] = f"{name.upper()}.RV32"
-                else:
-                    csrs[addr_int] = name.upper()
+                # if target_arch == "BOTH" and base == 32:
+                #     csrs[addr_int] = f"{name.upper()}.RV32"
+                # else:
+                #     csrs[addr_int] = name.upper()
+                csrs[addr_int] = name.upper()
             except Exception as e:
                 logging.error(f"Error parsing address {addr_to_use} in {path}: {e}")
                 address_errors += 1

backends/generators/sverilog/sverilog_generator.py

@@ -125,7 +125,7 @@ def parse_args():
     )
     parser.add_argument(
         "--arch",
-        default="RV64",
+        default="BOTH",
         choices=["RV32", "RV64", "BOTH"],
         help="Target architecture (RV32, RV64, or BOTH). Default is RV64.",
     )