Copy clang sources to handle opencl-clang patching

Author: aus-intel

external/llvm/llvm.cmake

@@ -46,20 +46,7 @@ cmake_policy(VERSION 3.13.4)
 
 include_guard(DIRECTORY)
 
-set(SOURCE_MODE_NAME "Source")
-set(PREBUILDS_MODE_NAME "Prebuilds")
-
-set(IGC_OPTION__LLVM_MODE "" CACHE STRING
-  "LLVM mode for IGC (can be ${SOURCE_MODE_NAME}, ${PREBUILDS_MODE_NAME} or empty)"
-  )
-
-if(IGC_OPTION__LLVM_MODE AND NOT (IGC_OPTION__LLVM_MODE MATCHES "^(${SOURCE_MODE_NAME}|${PREBUILDS_MODE_NAME})$"))
-  message(FATAL_ERROR "LLVM mode can be only ${SOURCE_MODE_NAME}, ${PREBUILDS_MODE_NAME} or empty!")
-endif()
-
-# Get preferred version of LLVM.
-include(llvm_preferred_version)
-set(IGC_OPTION__LLVM_PREFERRED_VERSION ${DEFAULT_IGC_LLVM_VERSION} CACHE STRING "Preferred version of LLVM to use")
+llvm_define_mode_variable(LLVM IGC_OPTION__LLVM_MODE)
 
 # Get default source dir.
 include(llvm_source_path)
@@ -108,7 +95,7 @@ message(STATUS "[LLVM] LLVM will be built from sources")
 message(STATUS "[LLVM] LLVM sources folder: ${IGC_OPTION__LLVM_SOURCES_DIR}")
 message(STATUS "[LLVM] LLVM sources in stock version: ${IGC_OPTION__LLVM_STOCK_SOURCES}")
 
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/llvm/build)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR} ${IGC_LLVM_WORKSPACE}/build)
 
 # Some variables are lost after LLVM subdirectory left.
 # Restore them for IGC usage.

external/llvm/llvm_clang_source_hook.cmake

@@ -22,5 +22,45 @@
 #
 #============================ end_copyright_notice =============================
 
+# Source hook for clang. IGC will try to search for clang in
+# find_opencl_clang script independenty of this file. All of these is
+# required to handle intel opencl-clang project patching scheme.
+# FIXME: this should be moved to opencl-clang repo.
+
+include_guard(DIRECTORY)
+
+llvm_define_mode_variable(Clang IGC_OPTION__CLANG_MODE)
+
+# Reuse LLVM source search module. Clang should be located in the same place.
+include(llvm_source_path)
+if(DEFAULT_IGC_LLVM_SOURCES_DIR)
+  set(DEFAULT_IGC_CLANG_SOURCES_DIR ${DEFAULT_IGC_LLVM_SOURCES_DIR}/clang)
+endif()
+
+if(IGC_OPTION__CLANG_MODE STREQUAL SOURCE_MODE_NAME)
+  set(IGC_OPTION__CLANG_SOURCES_DIR "${DEFAULT_IGC_CLANG_SOURCES_DIR}" CACHE PATH "Path to Clang sources")
+endif()
+
+# In Prebuild mode there is nothing to do here for now.
+if(IGC_OPTION__CLANG_MODE STREQUAL PREBUILDS_MODE_NAME)
+  return()
+endif()
+
+# No mode was specified, start searching.
+if(NOT IGC_OPTION__CLANG_MODE)
+  message(STATUS "[Clang] No mode was specified, searching for Clang")
+  if(EXISTS "${DEFAULT_IGC_CLANG_SOURCES_DIR}")
+    set(IGC_OPTION__CLANG_SOURCES_DIR "${DEFAULT_IGC_CLANG_SOURCES_DIR}")
+  else()
+    return()
+  endif()
+endif()
+
+set(IGC_COPIED_CLANG_DIR ${IGC_LLVM_WORKSPACE_SRC}/clang)
+
+message(STATUS "[Clang] Clang will be built from sources")
+message(STATUS "[Clang] Copying stock Clang sources ${IGC_OPTION__CLANG_SOURCES_DIR} to ${IGC_COPIED_CLANG_DIR}")
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${IGC_OPTION__CLANG_SOURCES_DIR} ${IGC_COPIED_CLANG_DIR})
+
 # Just register clang as external llvm project.
-register_llvm_external_project(clang clang RELATIVE_TO_LLVM)
+register_llvm_external_project(clang ${IGC_COPIED_CLANG_DIR})

external/llvm/llvm_deps.cmake

@@ -39,6 +39,13 @@ include_guard(DIRECTORY)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH})
 
+# Get preferred version of LLVM.
+include(llvm_preferred_version)
+set(IGC_OPTION__LLVM_PREFERRED_VERSION ${DEFAULT_IGC_LLVM_VERSION} CACHE STRING "Preferred version of LLVM to use")
+
+set(IGC_LLVM_WORKSPACE ${CMAKE_CURRENT_BINARY_DIR}/llvm-deps)
+set(IGC_LLVM_WORKSPACE_SRC ${IGC_LLVM_WORKSPACE}/src)
+
 # Get useful macros for llvm hooks.
 include(llvm_utils)
 

external/llvm/llvm_patch_sources.cmake

@@ -26,9 +26,7 @@
 
 include_guard(DIRECTORY)
 
-if(NOT IGC_LLVM_SOURCE_DIR)
-  set(IGC_LLVM_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/../src/llvm")
-endif()
+set(IGC_LLVM_SOURCE_DIR ${IGC_LLVM_WORKSPACE_SRC}/llvm)
 
 # Already copied and patched. Probably...
 # TODO: handle dependencies on patches changes.
@@ -59,6 +57,7 @@ endif()
 
 # Copy stock LLVM sources to IGC_LLVM_SOURCE_DIR to apply patches.
 message(STATUS "[LLVM_PATCHER] : Copying stock LLVM sources ${IGC_OPTION__LLVM_SOURCES_DIR} to ${IGC_LLVM_SOURCE_DIR}")
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${IGC_OPTION__LLVM_SOURCES_DIR}/.git ${IGC_LLVM_WORKSPACE_SRC}/.git)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${IGC_OPTION__LLVM_SOURCES_DIR}/llvm ${IGC_LLVM_SOURCE_DIR})
 
 message(STATUS "[LLVM_PATCHER] : Applying patches for LLVM from version ${DIR_WITH_PATCHES}")

external/llvm/llvm_utils.cmake

@@ -111,3 +111,19 @@ macro(get_llvm_external_project_dir proj out)
     get_filename_component(${out} ${${out}} ABSOLUTE BASE_DIR ${ARG_BASE_DIR})
   endif()
 endmacro()
+
+# Helper function to define and check build mode variable for project.
+# proj_name -- name of project to print in messages.
+# var -- output variable that should be defined.
+macro(llvm_define_mode_variable proj_name var)
+  set(SOURCE_MODE_NAME "Source")
+  set(PREBUILDS_MODE_NAME "Prebuilds")
+
+  set(${var} "" CACHE STRING
+    "${proj_name} mode for IGC (can be ${SOURCE_MODE_NAME}, ${PREBUILDS_MODE_NAME} or empty)"
+    )
+
+  if(${var} AND NOT (${var} MATCHES "^(${SOURCE_MODE_NAME}|${PREBUILDS_MODE_NAME})$"))
+    message(FATAL_ERROR "${proj_name} mode can be only ${SOURCE_MODE_NAME}, ${PREBUILDS_MODE_NAME} or empty!")
+  endif()
+endmacro()