Skip to content

Commit de92615

Browse files
authored
[ExecutionEngine] Move IntelJITEventsWrapper to its own library. NFC (llvm#81825)
Split IntelJITEventsWrapper away from IntelJITEvents and rename it into IntelJITProfiling. NFC
1 parent c240aca commit de92615

File tree

10 files changed

+56
-47
lines changed

10 files changed

+56
-47
lines changed

llvm/lib/ExecutionEngine/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ if(BUILD_SHARED_LIBS)
2828
target_link_libraries(LLVMExecutionEngine PUBLIC LLVMRuntimeDyld)
2929
endif()
3030

31+
if( LLVM_USE_INTEL_JITEVENTS )
32+
add_subdirectory(IntelJITProfiling)
33+
add_subdirectory(IntelJITEvents)
34+
endif( LLVM_USE_INTEL_JITEVENTS )
35+
3136
add_subdirectory(Interpreter)
3237
add_subdirectory(JITLink)
3338
add_subdirectory(MCJIT)
@@ -38,10 +43,6 @@ if( LLVM_USE_OPROFILE )
3843
add_subdirectory(OProfileJIT)
3944
endif( LLVM_USE_OPROFILE )
4045

41-
if( LLVM_USE_INTEL_JITEVENTS )
42-
add_subdirectory(IntelJITEvents)
43-
endif( LLVM_USE_INTEL_JITEVENTS )
44-
4546
if( LLVM_USE_PERF )
4647
add_subdirectory(PerfJITEvents)
4748
endif( LLVM_USE_PERF )
Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,8 @@
11
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
2-
3-
if(NOT DEFINED ITTAPI_GIT_REPOSITORY)
4-
set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git)
5-
endif()
6-
7-
if(NOT DEFINED ITTAPI_GIT_TAG)
8-
set(ITTAPI_GIT_TAG v3.18.12)
9-
endif()
10-
11-
if(NOT DEFINED ITTAPI_SOURCE_DIR)
12-
set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR})
13-
endif()
14-
15-
if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi)
16-
execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY}
17-
WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}
18-
RESULT_VARIABLE GIT_CLONE_RESULT)
19-
if(NOT GIT_CLONE_RESULT EQUAL "0")
20-
message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}")
21-
endif()
22-
endif()
23-
24-
execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG}
25-
WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi
26-
RESULT_VARIABLE GIT_CHECKOUT_RESULT)
27-
if(NOT GIT_CHECKOUT_RESULT EQUAL "0")
28-
message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi")
29-
endif()
30-
31-
include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ )
32-
33-
if( HAVE_LIBDL )
34-
set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
35-
endif()
36-
37-
set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
38-
39-
2+
include_directories( ${PROJECT_BINARY_DIR}/ittapi/include/ )
403
add_llvm_component_library(LLVMIntelJITEvents
414
IntelJITEventListener.cpp
42-
jitprofiling.c
43-
${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c
445

45-
LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
466

477
LINK_COMPONENTS
488
CodeGen
@@ -51,6 +11,7 @@ add_llvm_component_library(LLVMIntelJITEvents
5111
Support
5212
Object
5313
ExecutionEngine
14+
IntelJITProfiling
5415
)
5516

5617
add_dependencies(LLVMIntelJITEvents LLVMCodeGen)

llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313

14-
#include "IntelJITEventsWrapper.h"
14+
#include "IntelJITProfiling/IntelJITEventsWrapper.h"
1515
#include "ittnotify.h"
1616
#include "llvm-c/ExecutionEngine.h"
1717
#include "llvm/ADT/DenseMap.h"
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
2+
3+
if(NOT DEFINED ITTAPI_GIT_REPOSITORY)
4+
set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git)
5+
endif()
6+
7+
if(NOT DEFINED ITTAPI_GIT_TAG)
8+
set(ITTAPI_GIT_TAG v3.18.12)
9+
endif()
10+
11+
if(NOT DEFINED ITTAPI_SOURCE_DIR)
12+
set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR})
13+
endif()
14+
15+
if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi)
16+
execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY}
17+
WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}
18+
RESULT_VARIABLE GIT_CLONE_RESULT)
19+
if(NOT GIT_CLONE_RESULT EQUAL "0")
20+
message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}")
21+
endif()
22+
endif()
23+
24+
execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG}
25+
WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi
26+
RESULT_VARIABLE GIT_CHECKOUT_RESULT)
27+
if(NOT GIT_CHECKOUT_RESULT EQUAL "0")
28+
message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi")
29+
endif()
30+
31+
include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ )
32+
33+
if( HAVE_LIBDL )
34+
set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
35+
endif()
36+
37+
set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
38+
39+
40+
add_llvm_component_library(LLVMIntelJITProfiling
41+
jitprofiling.c
42+
${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c
43+
44+
LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
45+
46+
)
47+

llvm/tools/llvm-jitlistener/llvm-jitlistener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
#include "../../lib/ExecutionEngine/IntelJITEvents/IntelJITEventsWrapper.h"
15+
#include "../../lib/ExecutionEngine/IntelJITProfiling/IntelJITEventsWrapper.h"
1616
#include "llvm/ExecutionEngine/JITEventListener.h"
1717
#include "llvm/ExecutionEngine/MCJIT.h"
1818
#include "llvm/ExecutionEngine/SectionMemoryManager.h"

0 commit comments

Comments
 (0)