From 5dc3247b6ffb0e267d00cfb9f8109da1676c0dd4 Mon Sep 17 00:00:00 2001 From: Philip Wiese Date: Tue, 10 Dec 2024 17:21:46 +0100 Subject: [PATCH] Implemented feedback for PR --- CMakeLists.txt | 74 +++++++++++++------ README.md | 7 +- drivers/CMakeLists.txt | 6 +- drivers/cluster/CMakeLists.txt | 33 +++------ drivers/cluster/trampoline_snitchCluster.c | 8 +- hal/CMakeLists.txt | 4 +- targets/CMakeLists.txt | 2 + targets/chimera-convolve/CMakeLists.txt | 12 ++- targets/chimera-host/CMakeLists.txt | 33 +++++---- targets/chimera-open/CMakeLists.txt | 13 +++- tests/CMakeLists.txt | 30 +++++++- tests/chimera-host/CMakeLists.txt | 8 ++ .../host/CMakeLists.txt | 0 .../host/returnZero/CMakeLists.txt | 9 +-- .../host/returnZero/src_host/test_host.c | 0 .../{generic => chimera-open}/CMakeLists.txt | 2 +- tests/chimera-open/{ => host}/.gitkeep | 0 .../snitchCluster/CMakeLists.txt | 0 .../simpleOffload/CMakeLists.txt | 11 +-- .../simpleOffload/include/test_cluster.h | 0 .../simpleOffload/include/test_host.h | 0 .../simpleOffload/src_cluster/test_cluster.c | 0 .../simpleOffload/src_host/test_host.c | 0 23 files changed, 153 insertions(+), 99 deletions(-) create mode 100644 tests/chimera-host/CMakeLists.txt rename tests/{generic => chimera-host}/host/CMakeLists.txt (100%) rename tests/{generic => chimera-host}/host/returnZero/CMakeLists.txt (82%) rename tests/{generic => chimera-host}/host/returnZero/src_host/test_host.c (100%) rename tests/{generic => chimera-open}/CMakeLists.txt (93%) rename tests/chimera-open/{ => host}/.gitkeep (100%) rename tests/{generic => chimera-open}/snitchCluster/CMakeLists.txt (100%) rename tests/{generic => chimera-open}/snitchCluster/simpleOffload/CMakeLists.txt (80%) rename tests/{generic => chimera-open}/snitchCluster/simpleOffload/include/test_cluster.h (100%) rename tests/{generic => chimera-open}/snitchCluster/simpleOffload/include/test_host.h (100%) rename tests/{generic => chimera-open}/snitchCluster/simpleOffload/src_cluster/test_cluster.c (100%) rename tests/{generic => chimera-open}/snitchCluster/simpleOffload/src_host/test_host.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14cd1d9..fae7253 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,50 +29,82 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) project(chimera-sdk LANGUAGES C ASM) # WIESEP: It is important to set the ISA and ABI for the host and the cluster snitch -set(ISA_HOST rv32imc) -set(ABI_HOST ilp32) +set(ABI ilp32) set(ISA_CLUSTER_SNITCH rv32im) -set(ABI_CLUSTER_SNITCH ilp32) +set(ISA_HOST rv32imc) -message(STATUS "[CHIMERA-SDK] ISA_HOST : ${ISA_HOST}") -message(STATUS "[CHIMERA-SDK] ABI_HOST : ${ABI_HOST}") -message(STATUS "[CHIMERA-SDK] ISA_CLUSTER_SNITCH : ${ISA_CLUSTER_SNITCH}") -message(STATUS "[CHIMERA-SDK] ABI_CLUSTER_SNITCH : ${ABI_CLUSTER_SNITCH}") +message(STATUS "[CHIMERA-SDK] ABI : ${ABI}") +message(STATUS "[CHIMERA-SDK] ISA_HOST : ${ISA_HOST}") +message(STATUS "[CHIMERA-SDK] ISA_CLUSTER_SNITCH : ${ISA_CLUSTER_SNITCH}") +if (${DISASSEMBLE_LIBRARIES}) + message(STATUS "[CHIMERA-SDK] DISASSEMBLE_LIBRARIES : ON") +else() + message(STATUS "[CHIMERA-SDK] DISASSEMBLE_LIBRARIES : OFF") +endif() include(${CMAKE_CURRENT_LIST_DIR}/cmake/Utils.cmake) -# WIESEP: Add a object library to collect all runtime sources -add_library(runtime STATIC) +################################################################################ +# Host Runtime Library # +################################################################################ +add_library(runtime_host STATIC) -target_compile_options(runtime +target_compile_options(runtime_host PRIVATE -O2 +) + +target_compile_options(runtime_host + PUBLIC -march=${ISA_HOST} - -mabi=${ABI_HOST} + -mabi=${ABI} ) -target_link_options(runtime - PRIVATE +# WIESEP: Expose common link option +target_link_options(runtime_host + PUBLIC -march=${ISA_HOST} - -mabi=${ABI_HOST} + -mabi=${ABI} + -nostartfiles + -ffreestanding +) + +################################################################################ +# Snitch Cluster Runtime Library # +################################################################################ +add_library(runtime_cluster_snitch STATIC) + +# WIESEP: Do not export optimization flags +target_compile_options(runtime_cluster_snitch + PRIVATE + -O2 +) + +target_compile_options(runtime_cluster_snitch + PUBLIC + -march=${ISA_CLUSTER_SNITCH} + -mabi=${ABI} ) # WIESEP: Expose common link option -target_link_options(runtime +target_link_options(runtime_cluster_snitch PUBLIC + -march=${ISA_CLUSTER_SNITCH} + -mabi=${ABI} -nostartfiles - -nostdlib + -ffreestanding ) +################################################################################ +# Add subdirectories # +################################################################################ add_subdirectory(hal) add_subdirectory(targets) add_subdirectory(drivers) -# WIESEP: Interface library to link against all components of the SDK -add_library(chimera-sdk INTERFACE) -target_link_libraries(chimera-sdk INTERFACE hal) -target_link_libraries(chimera-sdk INTERFACE runtime) - +################################################################################ +# Testing # +################################################################################ enable_testing() add_subdirectory(tests) diff --git a/README.md b/README.md index 475eae5..8432967 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,12 @@ The resulting binaries will be stored in `build/bin`, and can be used within the To format all source files, run ``` -python scripts/run_clang_format.py -ir hal/ targets/ tests/ driver/ +python scripts/run_clang_format.py -ir hal/ targets/ tests/ drivers/ ``` Our CI uses llvm-12 for clang-format, so on IIS machines you may run ``` -python scripts/run_clang_format.py -ir tests/ hal/ targets/ driver/ --clang-format-executable=/usr/pack/riscv-1.0-kgf/pulp-llvm-0.12.0/bin/clang-format +python scripts/run_clang_format.py -ir tests/ hal/ targets/ drivers/ --clang-format-executable=/usr/pack/riscv-1.0-kgf/pulp-llvm-0.12.0/bin/clang-format ``` @@ -77,12 +77,13 @@ To enable automatic configuration of the C/C++ extension and support for the int } } ``` +If you are not on an IIS system, you need to adjust the paths according to your local installation. ## Technical Details ### Mixed ISA Compilation The current approach compiles all code for both the host and cluster cores into a single library. This requires precise handling to ensure compatibility between the different instruction set architectures (ISAs) and application binary interfaces (ABIs). -This requires careful handling to avoid invalid instructions caused by mismatched ISAs or ABIs between the host and cluster cores. Hence, we define four CMake variables,`ISA_HOST`, `ABI_HOST`, `ISA_CLUSTER_SNITCH`, and `ABI_CLUSTER_SNITCH` to specify the appropriate ISA and ABI for each core type. +This requires careful handling to avoid invalid instructions caused by mismatched ISAs between the host and cluster cores. Hence, we define four CMake variables,`ABI`, `ISA_HOST`, and `ISA_CLUSTER_SNITCH`, to specify the appropriate ISA for each core type. The ABI has to be identical to ensure correct function calls. Furthermore, the tests are split into `src_host` and `src_cluster` directories to clearly separate code executed on the host and cluster cores. ### cMake Build Flow diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt index a09f991..3779272 100644 --- a/drivers/CMakeLists.txt +++ b/drivers/CMakeLists.txt @@ -9,8 +9,4 @@ add_subdirectory(cluster) # WIESEP: Export this directory as root include directory for the drivers -target_include_directories(runtime PUBLIC ${CMAKE_CURRENT_LIST_DIR}) - - - - +target_include_directories(runtime_host PUBLIC ${CMAKE_CURRENT_LIST_DIR}) diff --git a/drivers/cluster/CMakeLists.txt b/drivers/cluster/CMakeLists.txt index 19d4abc..c2e5202 100644 --- a/drivers/cluster/CMakeLists.txt +++ b/drivers/cluster/CMakeLists.txt @@ -4,35 +4,24 @@ # # Philip Wiese -file(GLOB_RECURSE C_SOURCES_SNTICH - "trampoline_snitchCluster.c" -) +################################################################################ +# Host Runtime Library # +################################################################################ file(GLOB_RECURSE C_SOURCES - "*.c" + "offload_snitchCluster.c" ) -# WIESEP: Remove the C_SOURCES_SNTICH from the list of sources -list(REMOVE_ITEM C_SOURCES ${C_SOURCES_SNTICH}) - -# WIESEP: Create an object library for the snitch cluster trampoline to compile it with the correct ISA and ABI -add_library(cluster_snitch OBJECT ${C_SOURCES_SNTICH}) +target_sources(runtime_host PRIVATE ${C_SOURCES}) -target_compile_options(cluster_snitch - PRIVATE - -O2 - -march=${ISA_CLUSTER_SNITCH} - -mabi=${ABI_CLUSTER_SNITCH} -) - -# Add include directories from runtime to cluster_snitch -target_include_directories(cluster_snitch - PRIVATE - $ +################################################################################ +# Snitch Cluster Runtime Library # +################################################################################ +file(GLOB_RECURSE C_SOURCES_SNTICH + "trampoline_snitchCluster.c" ) -target_sources(runtime INTERFACE $) -target_sources(runtime PRIVATE ${C_SOURCES}) +target_sources(runtime_cluster_snitch PRIVATE ${C_SOURCES_SNTICH}) diff --git a/drivers/cluster/trampoline_snitchCluster.c b/drivers/cluster/trampoline_snitchCluster.c index 24bec50..4c38ba9 100644 --- a/drivers/cluster/trampoline_snitchCluster.c +++ b/drivers/cluster/trampoline_snitchCluster.c @@ -4,18 +4,16 @@ // // Philip Wiese -#include "soc.h" - #include // Persistent trampoline function pointer for each core -extern void (*_trampoline_function[NUM_CLUSTER_CORES])(void *); +extern void (*_trampoline_function)(void *); // Peristent argument storage for the trampoline function -extern void *_trampoline_args[NUM_CLUSTER_CORES]; +extern void *_trampoline_args; // Persistant stack pointer storage for each core -extern void *_trampoline_stack[NUM_CLUSTER_CORES]; +extern void *_trampoline_stack; /** * @brief Trampoline function for the cluster core. diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index ed20361..c1c6bf3 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -8,9 +8,9 @@ file(GLOB_RECURSE SOURCES "src/*" ) -add_library(hal STATIC ${SOURCES}) +add_library(hal_host STATIC ${SOURCES}) -target_include_directories(hal +target_include_directories(hal_host PUBLIC "inc/" ) diff --git a/targets/CMakeLists.txt b/targets/CMakeLists.txt index b090d9f..442c15f 100644 --- a/targets/CMakeLists.txt +++ b/targets/CMakeLists.txt @@ -18,6 +18,8 @@ if(NOT TARGET_PLATFORM IN_LIST AVAILABLE_TARGETS) message(FATAL_ERROR "Wrong value for TARGET_PLATFORM: Got ${TARGET_PLATFORM}. Available targets are: ${AVAILABLE_TARGETS}") endif() +message(STATUS "[CHIMERA-SDK] TARGET_PLATFORM : ${TARGET_PLATFORM}") + if (TARGET_PLATFORM STREQUAL "chimera-host") add_subdirectory(chimera-host) endif() diff --git a/targets/chimera-convolve/CMakeLists.txt b/targets/chimera-convolve/CMakeLists.txt index 1194575..54f6e22 100644 --- a/targets/chimera-convolve/CMakeLists.txt +++ b/targets/chimera-convolve/CMakeLists.txt @@ -16,23 +16,27 @@ file(GLOB_RECURSE C_SOURCES set_property(SOURCE ${ASM_SOURCES} PROPERTY LANGUAGE ASM) -target_sources(runtime +target_sources(runtime_host PRIVATE ${ASM_SOURCES} ${C_SOURCES} ) # WIESEP: Export the target specific linkerscript -target_link_options(runtime +target_link_options(runtime_host PUBLIC -L${CMAKE_CURRENT_LIST_DIR} -Tlink.ld ) # WIESEP: Export the target specific include directory -target_include_directories(runtime +target_include_directories(runtime_host PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ) - +# WIESEP: Export the headers also to the cluster runtime +target_include_directories(runtime_cluster_snitch + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/include +) diff --git a/targets/chimera-host/CMakeLists.txt b/targets/chimera-host/CMakeLists.txt index ea4c692..54f6e22 100644 --- a/targets/chimera-host/CMakeLists.txt +++ b/targets/chimera-host/CMakeLists.txt @@ -4,6 +4,7 @@ # # Moritz Scherer # Viviane Potocnik +# Philip Wiese file(GLOB_RECURSE ASM_SOURCES "src/crt0.S" @@ -14,28 +15,28 @@ file(GLOB_RECURSE C_SOURCES ) set_property(SOURCE ${ASM_SOURCES} PROPERTY LANGUAGE ASM) -add_library(runtime OBJECT ${ASM_SOURCES} ${C_SOURCES}) -target_include_directories(runtime - PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/include +target_sources(runtime_host + PRIVATE + ${ASM_SOURCES} + ${C_SOURCES} ) -set(ISA rv32imc) -set(ABI ilp32) +# WIESEP: Export the target specific linkerscript +target_link_options(runtime_host + PUBLIC + -L${CMAKE_CURRENT_LIST_DIR} + -Tlink.ld +) -target_compile_options(runtime +# WIESEP: Export the target specific include directory +target_include_directories(runtime_host PUBLIC - -march=${ISA} - -mabi=${ABI} + ${CMAKE_CURRENT_LIST_DIR}/include ) -target_link_options(runtime +# WIESEP: Export the headers also to the cluster runtime +target_include_directories(runtime_cluster_snitch PUBLIC - -march=${ISA} - -mabi=${ABI} - -nostartfiles - -nostdlib - -L${CMAKE_CURRENT_LIST_DIR} - -Tlink.ld + ${CMAKE_CURRENT_LIST_DIR}/include ) diff --git a/targets/chimera-open/CMakeLists.txt b/targets/chimera-open/CMakeLists.txt index 0c621e1..54f6e22 100644 --- a/targets/chimera-open/CMakeLists.txt +++ b/targets/chimera-open/CMakeLists.txt @@ -4,6 +4,7 @@ # # Moritz Scherer # Viviane Potocnik +# Philip Wiese file(GLOB_RECURSE ASM_SOURCES "src/crt0.S" @@ -15,23 +16,27 @@ file(GLOB_RECURSE C_SOURCES set_property(SOURCE ${ASM_SOURCES} PROPERTY LANGUAGE ASM) -target_sources(runtime +target_sources(runtime_host PRIVATE ${ASM_SOURCES} ${C_SOURCES} ) # WIESEP: Export the target specific linkerscript -target_link_options(runtime +target_link_options(runtime_host PUBLIC -L${CMAKE_CURRENT_LIST_DIR} -Tlink.ld ) # WIESEP: Export the target specific include directory -target_include_directories(runtime +target_include_directories(runtime_host PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ) - +# WIESEP: Export the headers also to the cluster runtime +target_include_directories(runtime_cluster_snitch + PUBLIC + ${CMAKE_CURRENT_LIST_DIR}/include +) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a3a9889..814b4ef 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,10 +3,32 @@ # SPDX-License-Identifier: Apache-2.0 # # Moritz Scherer +# Philip Wiese -add_subdirectory(generic) +# Define mappings directly using lists for each target +set(CHIMERA_CONVOLVE_FOLDERS chimera-convolve chimera-open chimera-host) +set(CHIMERA_OPEN_FOLDERS chimera-open chimera-host) +set(CHIMERA_HOST_FOLDERS chimera-host) -# Check if folder has a CMakeLists.txt file -if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/${TARGET_PLATFORM}/CMakeLists.txt) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${TARGET_PLATFORM}) +# Determine which folders to include based on TARGET_PLATFORM +if(TARGET_PLATFORM STREQUAL "chimera-convolve") + set(INCLUDED_FOLDERS ${CHIMERA_CONVOLVE_FOLDERS}) +elseif(TARGET_PLATFORM STREQUAL "chimera-open") + set(INCLUDED_FOLDERS ${CHIMERA_OPEN_FOLDERS}) +elseif(TARGET_PLATFORM STREQUAL "chimera-host") + set(INCLUDED_FOLDERS ${CHIMERA_HOST_FOLDERS}) +else() + message(FATAL_ERROR "[CHIMERA-SDK] Unknown TARGET_PLATFORM: '${TARGET_PLATFORM}'. Valid options are chimera-convolve, chimera-open, or chimera-host.") endif() + +# WIESEP: Print the folders being included +message(STATUS "[CHIMERA-SDK] Including test folders: ${INCLUDED_FOLDERS}") + +# Add subdirectories, checking for a valid CMakeLists.txt in each folder +foreach(folder IN LISTS INCLUDED_FOLDERS) + if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/${folder}/CMakeLists.txt) + add_subdirectory(${folder}) + else() + message(WARNING "[CHIMERA-SDK] Folder '${folder}' does not contain a valid CMakeLists.txt. Skipping.") + endif() +endforeach() diff --git a/tests/chimera-host/CMakeLists.txt b/tests/chimera-host/CMakeLists.txt new file mode 100644 index 0000000..9239ce6 --- /dev/null +++ b/tests/chimera-host/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright 2024 ETH Zurich and University of Bologna. +# Licensed under the Apache License, Version 2.0, see LICENSE for details. +# SPDX-License-Identifier: Apache-2.0 +# +# Philip Wiese + +# Add test for host core +add_subdirectory(host) diff --git a/tests/generic/host/CMakeLists.txt b/tests/chimera-host/host/CMakeLists.txt similarity index 100% rename from tests/generic/host/CMakeLists.txt rename to tests/chimera-host/host/CMakeLists.txt diff --git a/tests/generic/host/returnZero/CMakeLists.txt b/tests/chimera-host/host/returnZero/CMakeLists.txt similarity index 82% rename from tests/generic/host/returnZero/CMakeLists.txt rename to tests/chimera-host/host/returnZero/CMakeLists.txt index 6bb87aa..e3f58aa 100644 --- a/tests/generic/host/returnZero/CMakeLists.txt +++ b/tests/chimera-host/host/returnZero/CMakeLists.txt @@ -19,16 +19,15 @@ add_library(${TEST_NAME}_host OBJECT ${TEST_HOST_SRCS}) target_compile_options(${TEST_NAME}_host PRIVATE -O2 - -march=${ISA_HOST} - -mabi=${ABI_HOST} ) -target_link_libraries(${TEST_NAME}_host PUBLIC chimera-sdk) - +target_link_libraries(${TEST_NAME}_host PUBLIC runtime_host hal_host) ######## TEST Executable ####################################################### add_chimera_test( ${TEST_NAME} ) -# WIESEP: Link the host to the test executable (chimera-sdk is already linked) +# WIESEP: Link the host to the test executable target_link_libraries(${TEST_NAME} PUBLIC ${TEST_NAME}_host) + + diff --git a/tests/generic/host/returnZero/src_host/test_host.c b/tests/chimera-host/host/returnZero/src_host/test_host.c similarity index 100% rename from tests/generic/host/returnZero/src_host/test_host.c rename to tests/chimera-host/host/returnZero/src_host/test_host.c diff --git a/tests/generic/CMakeLists.txt b/tests/chimera-open/CMakeLists.txt similarity index 93% rename from tests/generic/CMakeLists.txt rename to tests/chimera-open/CMakeLists.txt index 2a36aba..e276a85 100644 --- a/tests/generic/CMakeLists.txt +++ b/tests/chimera-open/CMakeLists.txt @@ -6,7 +6,7 @@ # Philip Wiese # Add test for host core -add_subdirectory(host) +# add_subdirectory(host) # Add test for snitchCluster add_subdirectory(snitchCluster) diff --git a/tests/chimera-open/.gitkeep b/tests/chimera-open/host/.gitkeep similarity index 100% rename from tests/chimera-open/.gitkeep rename to tests/chimera-open/host/.gitkeep diff --git a/tests/generic/snitchCluster/CMakeLists.txt b/tests/chimera-open/snitchCluster/CMakeLists.txt similarity index 100% rename from tests/generic/snitchCluster/CMakeLists.txt rename to tests/chimera-open/snitchCluster/CMakeLists.txt diff --git a/tests/generic/snitchCluster/simpleOffload/CMakeLists.txt b/tests/chimera-open/snitchCluster/simpleOffload/CMakeLists.txt similarity index 80% rename from tests/generic/snitchCluster/simpleOffload/CMakeLists.txt rename to tests/chimera-open/snitchCluster/simpleOffload/CMakeLists.txt index 60f9b4c..2c1f0bc 100644 --- a/tests/generic/snitchCluster/simpleOffload/CMakeLists.txt +++ b/tests/chimera-open/snitchCluster/simpleOffload/CMakeLists.txt @@ -19,10 +19,8 @@ target_include_directories(${TEST_NAME}_host PUBLIC include) target_compile_options(${TEST_NAME}_host PRIVATE -O2 - -march=${ISA_HOST} - -mabi=${ABI_HOST} ) -target_link_libraries(${TEST_NAME}_host PUBLIC chimera-sdk) +target_link_libraries(${TEST_NAME}_host PUBLIC runtime_host hal_host) ######## CLUSTER Code ########################################################## file(GLOB_RECURSE TEST_SNITCH_SRCS @@ -36,16 +34,15 @@ target_include_directories(${TEST_NAME}_cluster PUBLIC include) target_compile_options(${TEST_NAME}_cluster PRIVATE -O2 - -march=${ISA_CLUSTER_SNITCH} - -mabi=${ABI_CLUSTER_SNITCH} ) -target_link_libraries(${TEST_NAME}_cluster PUBLIC chimera-sdk) +target_link_libraries(${TEST_NAME}_cluster PUBLIC runtime_cluster_snitch) ######## TEST Executable ####################################################### add_chimera_test( ${TEST_NAME} ) -# WIESEP: Link the host and cluster code to the test executable (chimera-sdk is already linked) +# WIESEP: Link the host and cluster code to the test executable target_link_libraries(${TEST_NAME} PUBLIC ${TEST_NAME}_host) target_link_libraries(${TEST_NAME} PUBLIC ${TEST_NAME}_cluster) + diff --git a/tests/generic/snitchCluster/simpleOffload/include/test_cluster.h b/tests/chimera-open/snitchCluster/simpleOffload/include/test_cluster.h similarity index 100% rename from tests/generic/snitchCluster/simpleOffload/include/test_cluster.h rename to tests/chimera-open/snitchCluster/simpleOffload/include/test_cluster.h diff --git a/tests/generic/snitchCluster/simpleOffload/include/test_host.h b/tests/chimera-open/snitchCluster/simpleOffload/include/test_host.h similarity index 100% rename from tests/generic/snitchCluster/simpleOffload/include/test_host.h rename to tests/chimera-open/snitchCluster/simpleOffload/include/test_host.h diff --git a/tests/generic/snitchCluster/simpleOffload/src_cluster/test_cluster.c b/tests/chimera-open/snitchCluster/simpleOffload/src_cluster/test_cluster.c similarity index 100% rename from tests/generic/snitchCluster/simpleOffload/src_cluster/test_cluster.c rename to tests/chimera-open/snitchCluster/simpleOffload/src_cluster/test_cluster.c diff --git a/tests/generic/snitchCluster/simpleOffload/src_host/test_host.c b/tests/chimera-open/snitchCluster/simpleOffload/src_host/test_host.c similarity index 100% rename from tests/generic/snitchCluster/simpleOffload/src_host/test_host.c rename to tests/chimera-open/snitchCluster/simpleOffload/src_host/test_host.c