Skip to content

Commit be9b4bb

Browse files
committed
[MCJIT] Add cmake variables to customize ittapi git location and revision.
To support llorg builds this patch provides the following changes: 1) Added cmake variable ITTAPI_GIT_REPOSITORY to control the location of ITTAPI repository. Default value of ITTAPI_GIT_REPOSITORY is github location: https://github.com/intel/ittapi.git Also, the separate cmake variable ITTAPI_GIT_TAG was added for repo tag. 2) Added cmake variable ITTAPI_SOURCE_DIR to control the place where the repo will be cloned. Default value of ITTAPI_SOURCE_DIR is build area: PROJECT_BINARY_DIR Reviewed By: etyurin, bader Patch by ekovanov. Differential Revision: https://reviews.llvm.org/D91935
1 parent 664b187 commit be9b4bb

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
11
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
22

3-
set(GIT_REPOSITORY https://github.com/intel/ittapi.git)
4-
set(GIT_TAG v3.18.8)
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.8)
9+
endif()
10+
11+
if(NOT DEFINED ITTAPI_SOURCE_DIR)
12+
set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR})
13+
endif()
514

6-
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ittapi)
7-
execute_process(COMMAND ${GIT_EXECUTABLE} clone ${GIT_REPOSITORY}
8-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
15+
if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi)
16+
execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY}
17+
WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}
918
RESULT_VARIABLE GIT_CLONE_RESULT)
1019
if(NOT GIT_CLONE_RESULT EQUAL "0")
11-
message(FATAL_ERROR "git clone ${GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${GIT_REPOSITORY}")
20+
message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}")
1221
endif()
1322
endif()
1423

15-
execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${GIT_TAG}
16-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ittapi
24+
execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG}
25+
WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi
1726
RESULT_VARIABLE GIT_CHECKOUT_RESULT)
1827
if(NOT GIT_CHECKOUT_RESULT EQUAL "0")
19-
message(FATAL_ERROR "git checkout ${GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${GIT_TAG} at ${CMAKE_CURRENT_SOURCE_DIR}/ittapi")
28+
message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi")
2029
endif()
2130

22-
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/ittapi/include/ )
31+
include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ )
2332

2433
if( HAVE_LIBDL )
2534
set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
@@ -31,7 +40,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
3140
add_llvm_component_library(LLVMIntelJITEvents
3241
IntelJITEventListener.cpp
3342
jitprofiling.c
34-
ittapi/src/ittnotify/ittnotify_static.c
43+
${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c
3544

3645
LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
3746

0 commit comments

Comments
 (0)