Skip to content

Commit ff240c6

Browse files
Update cmake for dynamic allocation tracking
If cmake variable ENABLE_DYNAMIC_MEMORY_TRACKING is true: - add preprocessor definition to enable tacking - change linker options to export all symbols Related-To: NEO-6837 Signed-off-by: Dominik Dabek <[email protected]>
1 parent 817ba40 commit ff240c6

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ if(RELEASE_WITH_REGKEYS)
108108
add_definitions(-D_RELEASE_BUILD_WITH_REGKEYS)
109109
endif()
110110

111+
if(ENABLE_DYNAMIC_MEMORY_TRACKING)
112+
message(STATUS "Enabling dynamic memory tracking")
113+
add_definitions(-DENABLE_DYNAMIC_MEMORY_TRACKING)
114+
endif()
115+
111116
if(DEFINED NEO_EXTRA_DEFINES)
112117
string(REPLACE "," ";" NEO_EXTRA_DEFINES "${NEO_EXTRA_DEFINES}")
113118
foreach(_tmp ${NEO_EXTRA_DEFINES})
@@ -191,7 +196,9 @@ if(UNIX)
191196
else()
192197
message(STATUS "Using linker: default")
193198
endif()
194-
199+
if(ENABLE_DYNAMIC_MEMORY_TRACKING)
200+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
201+
endif()
195202
if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
196203
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g")
197204
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g")

level_zero/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,10 +477,11 @@ if(BUILD_WITH_L0)
477477

478478
if(UNIX)
479479
target_link_libraries(${TARGET_NAME_L0} ${GMM_LINK_NAME})
480-
481-
set_property(TARGET ${TARGET_NAME_L0}
482-
APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/core/source/dll/linux/ze.exports"
483-
)
480+
if(NOT ENABLE_DYNAMIC_MEMORY_TRACKING)
481+
set_property(TARGET ${TARGET_NAME_L0}
482+
APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/core/source/dll/linux/ze.exports"
483+
)
484+
endif()
484485
endif()
485486

486487
create_source_tree(${TARGET_NAME_L0} ${L0_ROOT_DIR}/..)

opencl/source/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,11 @@ if(${GENERATE_EXECUTABLE})
175175
target_include_directories(${NEO_DYNAMIC_LIB_NAME} PRIVATE
176176
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}
177177
)
178-
set_property(TARGET ${NEO_DYNAMIC_LIB_NAME}
179-
APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${EXPORTS_FILENAME}"
180-
)
178+
if(NOT ENABLE_DYNAMIC_MEMORY_TRACKING)
179+
set_property(TARGET ${NEO_DYNAMIC_LIB_NAME}
180+
APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${EXPORTS_FILENAME}"
181+
)
182+
endif()
181183
set_property(TARGET ${NEO_DYNAMIC_LIB_NAME}
182184
APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bsymbolic"
183185
)

0 commit comments

Comments
 (0)