diff --git a/CMake/add_intg_test.cmake b/CMake/add_intg_test.cmake index 9dfef813..1c934f7a 100644 --- a/CMake/add_intg_test.cmake +++ b/CMake/add_intg_test.cmake @@ -23,18 +23,18 @@ macro(add_muriscv_nn_intg_test TEST_NAME) if(NOT ${TOOLCHAIN} STREQUAL "x86") if(${SIMULATOR} STREQUAL "OVPsim") add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/OVPsim/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} 1 + COMMAND ${PROJECT_SOURCE_DIR}/Sim/OVPsim/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} 1 WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) elseif(${SIMULATOR} STREQUAL "Spike") add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/Spike/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} + COMMAND ${PROJECT_SOURCE_DIR}/Sim/Spike/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) elseif(${SIMULATOR} STREQUAL "ETISS") add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/ETISS/run.sh ./${TEST_NAME} + COMMAND ${PROJECT_SOURCE_DIR}/Sim/ETISS/run.sh ./${TEST_NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) elseif(${SIMULATOR} STREQUAL "Vicuna") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -T ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lld_link.ld") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -T ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lld_link.ld") target_link_options(${TEST_NAME} PRIVATE "-nostartfiles") target_link_libraries(${TEST_NAME} PRIVATE vicuna_crt) @@ -51,7 +51,7 @@ macro(add_muriscv_nn_intg_test TEST_NAME) "$.path" VERBATIM) add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/Vicuna/run.sh "$.path" + COMMAND ${PROJECT_SOURCE_DIR}/Sim/Vicuna/run.sh "$.path" WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) else() message(FATAL_ERROR "Could not add test for specified simulator ${SIMULATOR}!") diff --git a/CMake/add_unit_test.cmake b/CMake/add_unit_test.cmake index 79ab40bd..136573e8 100644 --- a/CMake/add_unit_test.cmake +++ b/CMake/add_unit_test.cmake @@ -25,10 +25,10 @@ macro(add_muriscv_nn_unit_test TEST_NAME) # Create test executable if(${SIMULATOR} STREQUAL "ETISS") ADD_EXECUTABLE_PULPINO(${TEST_NAME} - ${CMAKE_SOURCE_DIR}/Tests/TestCases/${TEST_FILE_NAME}/${TEST_FILE_NAME}.c) + ${PROJECT_SOURCE_DIR}/Tests/TestCases/${TEST_FILE_NAME}/${TEST_FILE_NAME}.c) else() add_executable(${TEST_NAME} - ${CMAKE_SOURCE_DIR}/Tests/TestCases/${TEST_FILE_NAME}/${TEST_FILE_NAME}.c) + ${PROJECT_SOURCE_DIR}/Tests/TestCases/${TEST_FILE_NAME}/${TEST_FILE_NAME}.c) endif() target_link_libraries(${TEST_NAME} PUBLIC ${MURISCVNN_LIB} @@ -40,18 +40,18 @@ macro(add_muriscv_nn_unit_test TEST_NAME) if(NOT ${TOOLCHAIN} STREQUAL "x86") if(${SIMULATOR} STREQUAL "OVPsim") add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/OVPsim/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} 1 + COMMAND ${PROJECT_SOURCE_DIR}/Sim/OVPsim/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} 1 WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) elseif(${SIMULATOR} STREQUAL "Spike") add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/Spike/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} + COMMAND ${PROJECT_SOURCE_DIR}/Sim/Spike/run.sh ./${TEST_NAME}.elf ${RISCV_ARCH} ${VLEN} ${ELEN} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) elseif(${SIMULATOR} STREQUAL "ETISS") add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/ETISS/run.sh ./${TEST_NAME} + COMMAND ${PROJECT_SOURCE_DIR}/Sim/ETISS/run.sh ./${TEST_NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) elseif(${SIMULATOR} STREQUAL "Vicuna") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -T ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lld_link.ld") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -T ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lld_link.ld") target_link_options(${TEST_NAME} PRIVATE "-nostartfiles") target_link_libraries(${TEST_NAME} PRIVATE vicuna_crt) @@ -68,7 +68,7 @@ macro(add_muriscv_nn_unit_test TEST_NAME) "$.path" VERBATIM) add_test(NAME ${TEST_NAME} - COMMAND ${CMAKE_SOURCE_DIR}/Sim/Vicuna/run.sh "$.path" + COMMAND ${PROJECT_SOURCE_DIR}/Sim/Vicuna/run.sh "$.path" WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) else() message(FATAL_ERROR "Could not add test for specified simulator ${SIMULATOR}!") diff --git a/Integration/tflm/CMakeLists.txt b/Integration/tflm/CMakeLists.txt index 007048e2..bbc715d4 100644 --- a/Integration/tflm/CMakeLists.txt +++ b/Integration/tflm/CMakeLists.txt @@ -415,8 +415,8 @@ target_include_directories(tflm PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/third_party/kissfft ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN ) if(${TOOLCHAIN} STREQUAL "LLVM") diff --git a/Integration/tvm/aww/CMakeLists.txt b/Integration/tvm/aww/CMakeLists.txt index 907952a3..9236799f 100644 --- a/Integration/tvm/aww/CMakeLists.txt +++ b/Integration/tvm/aww/CMakeLists.txt @@ -35,11 +35,11 @@ if(${SIMULATOR} STREQUAL "Vicuna") ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt ) target_sources(${TEST_NAME}_tvm PRIVATE @@ -54,19 +54,19 @@ if(${SIMULATOR} STREQUAL "Vicuna") ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}_data/${TEST_NAME}_output_data_ref.cc ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}_data/${TEST_NAME}_output_data_ref.h - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.h + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.h - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.h + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.h ) else() target_include_directories(${TEST_NAME}_tvm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include ) target_sources(${TEST_NAME}_tvm PRIVATE diff --git a/Integration/tvm/ic/CMakeLists.txt b/Integration/tvm/ic/CMakeLists.txt index b5208dd0..b3a99acb 100644 --- a/Integration/tvm/ic/CMakeLists.txt +++ b/Integration/tvm/ic/CMakeLists.txt @@ -34,11 +34,11 @@ if(${SIMULATOR} STREQUAL "Vicuna") ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt ) @@ -54,19 +54,19 @@ if(${SIMULATOR} STREQUAL "Vicuna") ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}_data/${TEST_NAME}_output_data_ref.cc ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}_data/${TEST_NAME}_output_data_ref.h - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.h + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.h - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.h + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.h ) else() target_include_directories(${TEST_NAME}_tvm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include ) target_sources(${TEST_NAME}_tvm PRIVATE diff --git a/Integration/tvm/toy/CMakeLists.txt b/Integration/tvm/toy/CMakeLists.txt index 452ad082..6c91d0eb 100644 --- a/Integration/tvm/toy/CMakeLists.txt +++ b/Integration/tvm/toy/CMakeLists.txt @@ -34,11 +34,11 @@ if(${SIMULATOR} STREQUAL "Vicuna") ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt ) target_sources(${TEST_NAME}_tvm PRIVATE @@ -53,19 +53,19 @@ if(${SIMULATOR} STREQUAL "Vicuna") ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}_data/${TEST_NAME}_output_data_ref.cc ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}_data/${TEST_NAME}_output_data_ref.h - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.h + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.h - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.h + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.h ) else() target_include_directories(${TEST_NAME}_tvm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include ) target_sources(${TEST_NAME}_tvm PRIVATE diff --git a/Integration/tvm/vww/CMakeLists.txt b/Integration/tvm/vww/CMakeLists.txt index 3ad815cd..f4912fb6 100644 --- a/Integration/tvm/vww/CMakeLists.txt +++ b/Integration/tvm/vww/CMakeLists.txt @@ -32,8 +32,8 @@ target_include_directories(${TEST_NAME}_tvm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/runtime/include ${CMAKE_CURRENT_SOURCE_DIR}/${MLF_DIR}/codegen/host/include - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include ) target_sources(${TEST_NAME}_tvm PRIVATE diff --git a/Sim/Vicuna/CMakeLists.txt b/Sim/Vicuna/CMakeLists.txt index d4f7ff67..fc3aa26c 100644 --- a/Sim/Vicuna/CMakeLists.txt +++ b/Sim/Vicuna/CMakeLists.txt @@ -19,10 +19,10 @@ # Builds the vicuna C runtime add_library(vicuna_crt STATIC) -target_include_directories(vicuna_crt PUBLIC ${CMAKE_SOURCE_DIR}/Sim/Vicuna) +target_include_directories(vicuna_crt PUBLIC ${PROJECT_SOURCE_DIR}/Sim/Vicuna) target_sources(vicuna_crt PRIVATE - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/runtime.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/crt0.S - ${CMAKE_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/runtime.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/vicuna/sw/lib/uart.c + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/crt0.S + ${PROJECT_SOURCE_DIR}/Sim/Vicuna/crt/vicuna_crt.c ) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 32d117ba..78ef782f 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -39,8 +39,8 @@ set(MURISCVNN_LIB "muriscvnn") add_library(${MURISCVNN_LIB} STATIC) target_include_directories(${MURISCVNN_LIB} PUBLIC - ${CMAKE_SOURCE_DIR}/Include - ${CMAKE_SOURCE_DIR}/Include/CMSIS/NN/Include) + ${PROJECT_SOURCE_DIR}/Include + ${PROJECT_SOURCE_DIR}/Include/CMSIS/NN/Include) if(SIMULATOR) # TODO(fabianpedd): We currently need to include the Vicuna headers in order to redirect printf diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 28bec7ef..ff3fffec 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -29,12 +29,12 @@ FetchContent_Declare( ) add_definitions(-DUNITY_INCLUDE_CONFIG_H) FetchContent_MakeAvailable(unity) -target_include_directories(unity PUBLIC $ - $ +target_include_directories(unity PUBLIC $ + $ $) if(${SIMULATOR} STREQUAL "Vicuna") - target_include_directories(unity PRIVATE $) + target_include_directories(unity PRIVATE $) endif() add_subdirectory(TestCases)