[SYCL] Change kernel/program cache data structures and get rid of boost

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

sycl/CMakeLists.txt

@@ -82,6 +82,7 @@ if(MSVC)
   endif()
 endif()
 
+include(FetchEmhash)
 include(FetchUnifiedRuntime)
 
 # The change in SYCL_MAJOR_VERSION must be accompanied with the same update in
@@ -216,9 +217,6 @@ install(FILES
   DESTINATION "${SYCL_INCLUDE_DIR}/sycl"
   COMPONENT sycl-headers)
 
-include(AddBoostMp11Headers)
-include(FetchBoostUnorderedHeaders)
-
 # This is workaround to detect changes (add or modify) in subtree which
 # are not detected by copy_directory command.
 # TODO: detect and process remove header/directory case
@@ -253,7 +251,7 @@ add_custom_target(sycl-headers
           ${OUT_HEADERS_IN_SYCLCOMPAT_DIR}
           ${OUT_UR_HEADERS}
           sycl-device-aspect-macros-header
-          boost_mp11-headers)
+          )
 
 add_custom_command(
   OUTPUT  ${OUT_HEADERS_IN_SYCL_DIR}
@@ -278,7 +276,6 @@ add_custom_command(
 install(DIRECTORY "${sycl_inc_dir}/sycl" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
 install(DIRECTORY "${sycl_inc_dir}/CL" DESTINATION ${SYCL_INCLUDE_DIR}/ COMPONENT sycl-headers)
 install(DIRECTORY "${sycl_inc_dir}/std" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
-install(DIRECTORY ${BOOST_MP11_DESTINATION_DIR} DESTINATION ${SYCL_INCLUDE_DIR}/sycl/detail COMPONENT boost_mp11-headers)
 install(DIRECTORY "${sycl_inc_dir}/syclcompat" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
 install(FILES "${sycl_inc_dir}/syclcompat.hpp" DESTINATION ${SYCL_INCLUDE_DIR} COMPONENT sycl-headers)
 install(FILES "${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api.h" DESTINATION ${SYCL_INCLUDE_DIR}
@@ -461,7 +458,6 @@ get_property(SYCL_TOOLCHAIN_DEPS GLOBAL PROPERTY SYCL_TOOLCHAIN_INSTALL_COMPONEN
 # Listed here are component names contributing the package
 set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
      append-file
-     boost_mp11-headers
      clang
      clang-offload-wrapper
      clang-offload-bundler

sycl/cmake/modules/AddBoostMp11Headers.cmake

@@ -0,0 +1,21 @@
+# Finds or fetches emhash.
+find_file(EMHASH_SYS_LOC "hash_table8.hpp" PATH_SUFFIXES "emhash")
+if(NOT EMHASH_SYS_LOC)
+  set(EMHASH_REPO https://github.com/ktprime/emhash)
+  message(STATUS "Will fetch emhash from ${EMHASH_REPO}")
+  FetchContent_Declare(emhash
+    GIT_REPOSITORY    ${EMHASH_REPO}
+    GIT_TAG           3ba9abdfdc2e0430fcc2fd8993cad31945b6a02b
+    SOURCE_SUBDIR  emhash
+  )
+  FetchContent_MakeAvailable(emhash)
+
+  # FetchContent downloads the files into a directory with
+  # '-src' as the suffix and emhash has the headers in the
+  # top level directory in the repo, so copy the headers to a directory
+  # named `emhash` so source files can include with <emhash/header.hpp>
+  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include/emhash)
+  file(GLOB HEADERS "${emhash_SOURCE_DIR}/*.h*")
+  file(COPY ${HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include/emhash)
+  set(SYCL_EMHASH_DIR ${CMAKE_BINARY_DIR}/include/ CACHE INTERNAL "")
+endif()

sycl/cmake/modules/FetchBoostUnorderedHeaders.cmake

@@ -362,6 +362,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
       -DUMF_BUILD_SHARED_LIBRARY:BOOL=${UMF_BUILD_SHARED_LIBRARY}
       -DUMF_LINK_HWLOC_STATICALLY:BOOL=${UMF_LINK_HWLOC_STATICALLY}
       -DUMF_DISABLE_HWLOC:BOOL=${UMF_DISABLE_HWLOC}
+      -DSYCL_EMHASH_DIR:STRING=${SYCL_EMHASH_DIR}
       # Enable d suffix in UMF
       -DUMF_USE_DEBUG_POSTFIX:BOOL=ON
   )

sycl/cmake/modules/FetchEmhash.cmake

@@ -115,6 +115,15 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
     target_include_directories(${LIB_OBJ_NAME} PRIVATE ${zstd_INCLUDE_DIR})
   endif()
 
+  if (EMHASH_SYS_LOC)
+    # If we are using system emhash, include the system directory
+    # containing the emhash folder and note this location so
+    # other modules using emhash can find it.
+    cmake_path(GET EMHASH_SYS_LOC PARENT_PATH EMHASH_SYS_LOC)
+    set(SYCL_EMHASH_DIR ${EMHASH_SYS_LOC} CACHE INTERNAL "")
+    target_include_directories(${LIB_OBJ_NAME} PRIVATE ${EMHASH_SYS_LOC})
+  endif()
+
   # ur_win_proxy_loader
   if (WIN32)
     include_directories(${LLVM_EXTERNAL_SYCL_SOURCE_DIR}/ur_win_proxy_loader)

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -522,7 +522,7 @@ std::optional<ur_program_handle_t> context_impl::getProgramForDevImgs(
 
       auto KeyMappingsIt = KeyMap.find(OuterKey);
       assert(KeyMappingsIt != KeyMap.end());
-      auto CachedProgIt = Cache.find(KeyMappingsIt->second);
+      auto CachedProgIt = Cache.find((*KeyMappingsIt).second);
       assert(CachedProgIt != Cache.end());
       BuildRes = CachedProgIt->second;
     }