[SYCL][CMake] Move opencl-aot into opencl subdir opencl/opencl-aot (#3670)

* Update opencl-aot target to reuse opencl deps
* Add opencl-aot to standard SYCL bundle instead of separate deploy
* Update configure.py accordingly
* Minor fix in cmake print message
* Update CODEOWNERS to new paths

Signed-off-by: Pavel V Chupin <[email protected]>

Author: Pavel Chupin

.github/CODEOWNERS

@@ -9,8 +9,11 @@ clang/**/Driver @mdtoguchi @AGindinson
 # LLVM-SPIRV translator
 llvm-spirv/ @AlexeySotkin @AlexeySachkov
 
+# OpenCL deps
+opencl/ @pvchupin @vladimirlaz
+
 # OpenCL "offline" compiler
-opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
+opencl/opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
 
 # Device library
 libdevice/ @vzakhari @jinge90

buildbot/compile.py

@@ -32,7 +32,6 @@ def do_compile(args):
         "--build", abs_obj_dir,
         "--",
         "deploy-sycl-toolchain",
-        "deploy-opencl-aot",
         "-j", str(cpu_count)]
 
     if args.verbose:

buildbot/configure.py

@@ -13,7 +13,7 @@ def do_configure(args):
     if not os.path.isdir(abs_obj_dir):
       os.makedirs(abs_obj_dir)
 
-    llvm_external_projects = 'sycl;llvm-spirv;opencl;opencl-aot;libdevice;xpti;xptifw'
+    llvm_external_projects = 'sycl;llvm-spirv;opencl;libdevice;xpti;xptifw'
 
     llvm_dir = os.path.join(abs_src_dir, "llvm")
     sycl_dir = os.path.join(abs_src_dir, "sycl")

opencl-aot/CMakeLists.txt

@@ -16,7 +16,7 @@ set(OCL_LOADER_TAG 5f8249691ec8c25775789498951f8e9eb62c201d)
 
 # OpenCL Headers
 if(NOT OpenCL_HEADERS)
-  message(STATUS "Will fetch OpenCL headers from github.com")
+  message(STATUS "Will fetch OpenCL headers from ${OCL_HEADERS_REPO}")
 
   FetchContent_Declare(ocl-headers
     GIT_REPOSITORY    ${OCL_HEADERS_REPO}
@@ -49,7 +49,7 @@ set(OPENCL_ICD_LOADER_HEADERS_DIR
 set(BUILD_SHARED_LIBS ON)
 
 if(NOT OpenCL_LIBRARY_SRC)
-  message(STATUS "Will fetch OpenCL ICD Loader from github.com")
+  message(STATUS "Will fetch OpenCL ICD Loader from ${OCL_LOADER_REPO}")
 
   FetchContent_Declare(ocl-icd
     GIT_REPOSITORY    ${OCL_LOADER_REPO}
@@ -69,3 +69,4 @@ endif()
 FetchContent_MakeAvailable(ocl-icd)
 add_library(OpenCL-ICD ALIAS OpenCL)
 
+add_subdirectory(opencl-aot)

opencl/CMakeLists.txt

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.14)
+
+set(LLVM_LINK_COMPONENTS
+        ${LLVM_TARGETS_TO_BUILD}
+        Support
+        )
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+file(GLOB TARGET_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp)
+
+set(OPENCL_AOT_PROJECT_NAME opencl-aot)
+
+add_llvm_tool(${OPENCL_AOT_PROJECT_NAME} ${TARGET_SOURCES})
+
+target_link_libraries(${OPENCL_AOT_PROJECT_NAME}
+  PRIVATE
+    OpenCL-Headers
+    OpenCL-ICD)

opencl-aot/.clang-format renamed to opencl/opencl-aot/.clang-format

@@ -190,17 +190,11 @@ add_custom_target( sycl-toolchain
           llvm-objcopy
           sycl-post-link
           sycl-ls
+          opencl-aot
           ${XPTIFW_LIBS}
   COMMENT "Building SYCL compiler toolchain..."
 )
 
-# Check if opencl-aot tool is enabled.
-list(FIND LLVM_ENABLE_PROJECTS opencl-aot OPENCL_AOT_FOUND)
-if(NOT OPENCL_AOT_FOUND EQUAL -1)
-  add_dependencies(sycl-toolchain opencl-aot)
-  list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS opencl-aot)
-endif()
-
 if (SYCL_ENABLE_XPTI_TRACING)
   add_dependencies( sycl-toolchain xpti)
   if (MSVC)
@@ -246,6 +240,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
      sycl-ls
      clang-resource-headers
      OpenCL-Headers
+     opencl-aot
      sycl-headers
      sycl-headers-extras
      sycl

opencl-aot/.clang-tidy renamed to opencl/opencl-aot/.clang-tidy

@@ -331,7 +331,7 @@ AOT compiler for each device type:
 #### CPU
 
 * CPU AOT compiler `opencl-aot` is enabled by default. For more, see
-[opencl-aot documentation](../../opencl-aot/README.md).
+[opencl-aot documentation](../../opencl/opencl-aot/README.md).
 
 #### Accelerator