Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/basic-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/runtime/AllocationTracking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<const typeart::global_types::GlobalTypeInfo*>(info)->type_id;
Expand All @@ -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<const typeart::global_types::GlobalTypeInfo*>(info)->type_id;
Expand Down
6 changes: 5 additions & 1 deletion lib/typelib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
1 change: 1 addition & 0 deletions test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 4 additions & 2 deletions test/pass/misc/05_make_all_callbacks.c
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -32,4 +33,5 @@ int main(void) {
return 0;
}

// CHECK-NOT: error
// CHECK: TypeArtPass [Heap & Stack]