From 33d7f20a67c873f708ea4674b7d2933c5170df47 Mon Sep 17 00:00:00 2001 From: Ronan Keryell Date: Mon, 12 Feb 2024 17:56:05 -0800 Subject: [PATCH] Add clang++ mangling for simple-executor Also add it to the CI. --- tests/CMakeLists.txt | 3 ++- tests/air/simple_executor.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 869cdc7c0..135745d3f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -46,7 +46,7 @@ function(declare_trisycl_test) endif(DEFINED declare_trisycl_test_SOURCES) # Needed because of sloppy file naming in multiple_compilation_units test - set_source_files_properties(${Files_SRCS} PROPERTIES LANGUAGE CXX ) + set_source_files_properties(${Files_SRCS} PROPERTIES LANGUAGE CXX) # Variable to hold ALL files to build and be visible in IDE set(Files_BUILD ${Files_HDRS} ${Files_SRCS}) @@ -101,6 +101,7 @@ add_subdirectory(acap) add_subdirectory(accessor) add_subdirectory(address_spaces) add_subdirectory(aie-axi-stream) +add_subdirectory(air) add_subdirectory(array_partition) add_subdirectory(buffer) add_subdirectory(detail) diff --git a/tests/air/simple_executor.cpp b/tests/air/simple_executor.cpp index f8ee500f6..09552cf96 100644 --- a/tests/air/simple_executor.cpp +++ b/tests/air/simple_executor.cpp @@ -20,9 +20,10 @@ template TRISYCL_WEAK_ATTRIB_PREFIX void TRISYCL_WEAK_ATTRIB_SUFFIX air_tile(void* self, void (*out0_write)(void* self, unsigned int value)) { /* By linking with some AIR code such as _Z8air_tileILi6ELi4EEvPvPFvS0_jE - for air_tile for X=6 and Y=4, this weak symbol will be replaced - by the provided function instead - */ + (g++) or _Z8air_tileITnDaLi6ETnDaLi4EEvPvPFvS0_jE (clang) for air_tile for + X=6 and Y=4, this weak symbol will be replaced by the provided function + instead. + */ // To write some value to out 0 port out0_write(self, 42); }