Merge "adding cltrace" into amd-master-next

opencl/CMakeLists.txt

@@ -16,6 +16,7 @@ set(BUILD_SHARED_LIBS "Build shared libs" ON)
 add_subdirectory(khronos/icd)
 add_subdirectory(amdocl)
 add_subdirectory(tools/clinfo)
+add_subdirectory(tools/cltrace)
 
 # get date information based on UTC
 # use the last two digits of year + week number + day in the week as OPENCL_VERSION_GITDATE
@@ -47,6 +48,9 @@ get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION)
 install(PROGRAMS $<TARGET_FILE:clinfo>
         DESTINATION bin
         COMPONENT MAIN)
+install(PROGRAMS $<TARGET_FILE:cltrace>
+        DESTINATION lib
+        COMPONENT MAIN)
 install(PROGRAMS $<TARGET_FILE:amdocl64>
         DESTINATION lib
         COMPONENT MAIN)

opencl/tools/cltrace/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
+  add_definitions(-DDEBUG)
+endif()
+
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_SOURCE_DIR}/tools/cltrace/cltrace.map")
+
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
+include_directories(${VDI_DIR}/include)
+
+add_definitions(-DHAVE_CL2_HPP -DCL_TARGET_OPENCL_VERSION=220)
+
+add_library(cltrace cltrace.cpp)
+
+target_link_libraries(cltrace OpenCL)

opencl/tools/cltrace/cltrace.def

@@ -0,0 +1,2 @@
+EXPORTS
+vdiAgent_OnLoad

opencl/tools/cltrace/cltrace.map

@@ -0,0 +1,7 @@
+CLTRACE_1.0 {
+global:
+    vdiAgent_OnLoad;
+    vdiAgent_OnUnload;
+local:
+    *;
+};