diff --git a/.github/workflows/basic-ci.yml b/.github/workflows/basic-ci.yml index 237686dc..852ff663 100644 --- a/.github/workflows/basic-ci.yml +++ b/.github/workflows/basic-ci.yml @@ -109,6 +109,10 @@ jobs: if: matrix.preset.coverage run: sudo apt-get install lcov + - name: Setup Mold Linker + if: ${{ matrix.platform.llvm-version > 14 }} + uses: rui314/setup-mold@v1 + - name: Setup env run: | sudo ln -f -s /usr/bin/clang-${{ matrix.platform.llvm-version }} /usr/bin/clang diff --git a/lib/runtime/AllocationTracking.cpp b/lib/runtime/AllocationTracking.cpp index 279e5272..7e4764e6 100644 --- a/lib/runtime/AllocationTracking.cpp +++ b/lib/runtime/AllocationTracking.cpp @@ -316,7 +316,7 @@ void __typeart_alloc_global_mty(const void* addr, const void* info, size_t count rt.allocation_tracker().onAllocGlobal(addr, type_id, count, retAddr); } -void __typeart_alloc_omp_mty(const void* addr, const void* info, size_t count) { +void __typeart_alloc_global_mty_omp(const void* addr, const void* info, size_t count) { TYPEART_RUNTIME_GUARD; const void* retAddr = __builtin_return_address(0); const auto type_id = reinterpret_cast(info)->type_id; @@ -325,7 +325,7 @@ void __typeart_alloc_omp_mty(const void* addr, const void* info, size_t count) { rt.allocation_tracker().onAlloc(addr, type_id, count, retAddr); } -void __typeart_alloc_stack_omp_mty(const void* addr, const void* info, size_t count) { +void __typeart_alloc_stack_mty_omp(const void* addr, const void* info, size_t count) { TYPEART_RUNTIME_GUARD; const void* retAddr = __builtin_return_address(0); const auto type_id = reinterpret_cast(info)->type_id; diff --git a/lib/typelib/CMakeLists.txt b/lib/typelib/CMakeLists.txt index 5ed9da0f..6a0951f1 100644 --- a/lib/typelib/CMakeLists.txt +++ b/lib/typelib/CMakeLists.txt @@ -56,11 +56,15 @@ target_include_directories( typeart_target_coverage_options(${TYPEART_PREFIX}_TypesStatic) +install(FILES TypeInterface.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} +) + if(TYPEART_INSTALL_TYPES_LIB) set(CONFIG_NAME ${PROJECT_NAME}Types) set(TARGETS_EXPORT_NAME ${CONFIG_NAME}Targets) - install(FILES TypeInterface.h TypeDatabase.h + install(FILES TypeDatabase.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} ) diff --git a/test/lit.cfg b/test/lit.cfg index 163bbdcc..fc8dbd45 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -108,6 +108,7 @@ config.substitutions.append(('%filecheck', filecheck)) config.substitutions.append(('%llc', llc)) # Substitutions: executables use "-" separator, variables use underscore +config.substitutions.append(('%base_path', config.typeart_project_dir)) config.substitutions.append(('%base_lib_path', typeart_base_lib_dir)) config.substitutions.append(('%script_path', typeart_script_dir)) config.substitutions.append(('%plugin_path', typeart_lib_root)) diff --git a/test/pass/misc/05_make_all_callbacks.c b/test/pass/misc/05_make_all_callbacks.c index 7a6b1601..4a27a617 100644 --- a/test/pass/misc/05_make_all_callbacks.c +++ b/test/pass/misc/05_make_all_callbacks.c @@ -1,6 +1,7 @@ -// RUN: %c-to-llvm %s -I%runtime_path | %apply-typeart --typeart-stack=true -S 2>&1 | %filecheck %s +// RUN: %c-to-llvm -Wimplicit-function-declaration %s -I%runtime_path -I%base_path/lib/runtime | %apply-typeart --typeart-stack=true -S 2>&1 | \ +// RUN: %filecheck %s -#include "../../../lib/runtime/CallbackInterface.h" +#include "CallbackInterface.h" int main(void) { int count = 0; @@ -32,4 +33,5 @@ int main(void) { return 0; } +// CHECK-NOT: error // CHECK: TypeArtPass [Heap & Stack] \ No newline at end of file