updates CMakeLists.txt and dbt-rise-tgc submodule

.gitignore

@@ -22,3 +22,4 @@
 /.direnv
 /TGC_C_XRB/
 /.envrc.eyck
+/.cache

CMakeLists.txt

@@ -16,7 +16,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
     option(WITH_LLVM "Build LLVM backend" OFF)
     option(WITH_ASMJIT "Build ASMJIT backend" OFF)
     
-    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -85,7 +85,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
         spdlog/1.9.2
         boost/1.75.0 
         gsl-lite/0.37.0 
-        elfio/3.8 
+        elfio/3.11 
         lz4/1.9.3 
         yaml-cpp/0.7.0 
         jsoncpp/1.9.5
@@ -213,7 +213,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
         FetchContent_Declare(
               riscvfw
               GIT_REPOSITORY https://git.minres.com/Firmware/Firmwares.git
-              GIT_TAG        main
+              GIT_TAG        develop
               GIT_SHALLOW OFF
               UPDATE_DISCONNECTED ON
         )

CMakePresets.json

@@ -0,0 +1,39 @@
+{
+    "version": 3,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 21,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "Debug",
+            "displayName": "Debug build",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        },
+        {
+            "name": "Release",
+            "displayName": "Release build",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "Debug",
+            "description": "Debug build",
+            "displayName": "Debug"
+        }
+    ]
+}

Jenkinsfile

@@ -36,20 +36,22 @@ pipeline {
                 stage("Generate cores and build TGC-ISS"){
                     steps {
                         sh '''
-                            for core in TGC5A TGC5B TGC5D TGC5E; do 
+                            for core in TGC5A TGC5B TGC5D TGC5E TGC5F RV32GC; do 
                                 for backend in interp llvm tcc asmjit; do 
                                     TGC-GEN/scripts/generate_iss.sh -o dbt-rise-tgc/ -c $core -b ${backend} TGC-GEN/CoreDSL/${core}.core_desc
                                 done
                             done
-                            for core in TGC6B TGC6C TGC6D TGC6E; do
+                            for core in TGC6B TGC6C TGC6D TGC6E RV64GC; do
                                 for backend in interp llvm asmjit; do 
                                     TGC-GEN/scripts/generate_iss.sh -o dbt-rise-tgc/ -c $core -b ${backend} TGC-GEN/CoreDSL/${core}.core_desc
                                 done
                             done
                             '''
                         sh 'conan profile new default --detect --force'
+                        sh 'rm -rf build'
                         sh 'cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_ASMJIT=ON -DWITH_TCC=ON -DWITH_LLVM=ON'
                         sh 'cmake --build build -j'
+                        sh 'build/dbt-rise-tgc/tgc-sim --isa ?'
                     }
                 }
             }
@@ -67,7 +69,7 @@ pipeline {
                         axes {
                             axis {
                                 name 'CORE'
-                                values 'TGC5A', 'TGC5B','TGC5C', 'TGC5D', 'TGC5E'  
+                                values 'TGC5A', 'TGC5B', 'TGC5C', 'TGC5D', 'TGC5E', 'TGC5F', 'RV32GC'
                             }
                             axis {
                                 name 'BACKEND'
@@ -89,7 +91,7 @@ pipeline {
                         axes {
                             axis {
                                 name 'CORE'
-                                    values 'TGC6B', 'TGC6C', 'TGC6D', 'TGC6E'
+                                    values 'TGC6B', 'TGC6C', 'TGC6D', 'TGC6E', 'RV64GC'
                             }
                             axis {
                                 name 'BACKEND'

scripts/annotate_addr_to_signature.py

@@ -0,0 +1,75 @@
+import argparse
+import os
+import subprocess
+
+
+def get_address_from_objdump(elf_file, symbol):
+    result = subprocess.run(
+        ["riscv64-unknown-elf-objdump", "-t", elf_file], capture_output=True, text=True
+    )
+    for line in result.stdout.splitlines():
+        if symbol in line:
+            return int(line.split()[0], 16)
+    return None
+
+
+def annotate_dump(signature_file, elf_file):
+    begin_signature = get_address_from_objdump(elf_file, "begin_signature")
+    end_signature = get_address_from_objdump(elf_file, "end_signature")
+
+    if begin_signature is None or end_signature is None:
+        print(f"Symbols not found in {elf_file}")
+        return
+
+    address = begin_signature
+    annotated_lines = []
+
+    with open(signature_file, "r") as sig_file:
+        for line in sig_file:
+            annotated_lines.append(f"{hex(address)}: {line.strip()}")
+            address += 4
+
+    output_file = signature_file + ".annotated"
+    with open(output_file, "w") as out_file:
+        out_file.write("\n".join(annotated_lines))
+    print(f"Annotated file created: {output_file}")
+
+
+def process_directory(root_dir):
+    for subdir, _, files in os.walk(root_dir):
+        elf_file = None
+        signature_file = None
+
+        for file in files:
+            if file.endswith(".elf"):
+                elf_file = os.path.join(subdir, file)
+            elif file.endswith(".signature"):
+                signature_file = os.path.join(subdir, file)
+
+        if elf_file and signature_file:
+            annotate_dump(signature_file, elf_file)
+        elif signature_file:
+            print(f"No ELF file found for {signature_file}")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="""
+        Annotate memory dumps with addresses. Parses all subdirectories from the given root.
+        Expects a .signature with a corresponding .elf in the same directory.
+        Designed to annotate riscof signatures."""
+    )
+    parser.add_argument(
+        "root_dir", type=str, help="Root directory to search for .signature files"
+    )
+    args = parser.parse_args()
+
+    if not os.path.isdir(args.root_dir):
+        print("Invalid root directory")
+        return
+
+    process_directory(args.root_dir)
+
+
+if __name__ == "__main__":
+    main()

scripts/create_reg_traces.py

@@ -131,6 +131,9 @@ def main(args: argparse.Namespace) -> None:
 
 
 if __name__ == "__main__":
+    # sys.exit(
+    #    "This script needs to be adapted, it assumed to be in a directory named 'Debug'"
+    # )
     parser = argparse.ArgumentParser(
         description="Process an ELF file with a specified backend. Generates register traces for interp and the specified backend"
     )
@@ -140,8 +143,8 @@ if __name__ == "__main__":
     parser.add_argument(
         "--backend",
         type=str,
-        default="amsjit",
-        help="The backend to be used. Default is amsjit.",
+        default="asmjit",
+        help="The backend to be used. Default is asmjit.",
         required=False,
     )
     parser.add_argument(