Merge from 'sycl' to 'sycl-web' (7 commits)

Author: iclsrc

.github/workflows/sycl-containers-igc-dev.yaml

@@ -35,7 +35,6 @@ jobs:
             imagefile: ubuntu2404_intel_drivers
             tag: devigc
             build_args: |
-                  "use_unstable_driver=false"
                   "use_igc_dev=true"
     steps:
       - name: Checkout

.github/workflows/sycl-containers.yaml

@@ -54,29 +54,23 @@ jobs:
           - name: Intel Drivers Ubuntu 22.04 Docker image
             file: ubuntu2204_intel_drivers
             tag: latest
-            build_args: "use_unstable_driver=false"
+            build_args: ""
           - name: Intel Drivers Ubuntu 24.04 Docker image
             file: ubuntu2404_intel_drivers
             tag: latest
-            build_args: "use_unstable_driver=false"
-          - name: Intel Drivers (unstable) Ubuntu 24.04 Docker image
-            file: ubuntu2404_intel_drivers
-            tag: unstable
-            build_args: "use_unstable_driver=true"
+            build_args: ""
           - name: Build + Intel Drivers Ubuntu 22.04 Docker image
             file: ubuntu2204_intel_drivers
             tag: alldeps
             build_args: |
               base_image=ghcr.io/intel/llvm/ubuntu2204_build
               base_tag=latest
-              use_unstable_driver=false
           - name: Build + Intel Drivers Ubuntu 24.04 Docker image
             file: ubuntu2404_intel_drivers
             tag: alldeps
             build_args: |
               base_image=ghcr.io/intel/llvm/ubuntu2404_build
               base_tag=latest
-              use_unstable_driver=false
     steps:
       - name: Checkout
         uses: actions/checkout@v4

devops/containers/ubuntu2204_intel_drivers.Dockerfile

@@ -5,8 +5,6 @@ FROM $base_image:$base_tag
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ARG use_unstable_driver=true
-
 USER root
 
 RUN apt update && apt install -yqq wget
@@ -18,12 +16,7 @@ COPY dependencies.json /
 RUN mkdir /runtimes
 ENV INSTALL_LOCATION=/runtimes
 RUN --mount=type=secret,id=github_token \
-    if [ "$use_unstable_driver" = "true" ]; then \
-      install_driver_opt=" --use-latest"; \
-    else \
-      install_driver_opt=" dependencies.json"; \
-    fi && \
-    GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
+    GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
 
 COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
 

devops/containers/ubuntu2404_intel_drivers.Dockerfile

@@ -5,8 +5,6 @@ FROM $base_image:$base_tag
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ARG use_unstable_driver=true
-
 USER root
 
 RUN apt update && apt install -yqq wget
@@ -18,12 +16,7 @@ COPY dependencies.json /
 RUN mkdir /runtimes
 ENV INSTALL_LOCATION=/runtimes
 RUN --mount=type=secret,id=github_token \
-    if [ "$use_unstable_driver" = "true" ]; then \
-      install_driver_opt=" --use-latest"; \
-    else \
-      install_driver_opt=" dependencies.json"; \
-    fi && \
-    GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
+    GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
 
 COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
 

devops/scripts/install_drivers.sh

@@ -19,14 +19,6 @@ if [ -f "$1" ]; then
        IGC_DEV_VER=$(jq -r '.linux.igc_dev.version' $CONFIG_FILE_IGC_DEV)
        IGC_DEV_URL=$(jq -r '.linux.igc_dev.url' $CONFIG_FILE_IGC_DEV)
     fi
-elif [[ "$*" == *"--use-latest"* ]]; then
-    CR_TAG=latest
-    IGC_TAG=latest
-    CM_TAG=latest
-    L0_TAG=latest
-    TBB_TAG=latest
-    FPGA_TAG=latest
-    CPU_TAG=latest
 else
     CR_TAG=$compute_runtime_tag
     IGC_TAG=$igc_tag
@@ -43,11 +35,7 @@ fi
 function get_release() {
     REPO=$1
     TAG=$2
-    if [ "$TAG" == "latest" ]; then
-        URL="https://api.github.com/repos/${REPO}/releases/latest"
-    else
-        URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
-    fi
+    URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
     HEADER=""
     if [ "$GITHUB_TOKEN" != "" ]; then
         HEADER="Authorization: Bearer $GITHUB_TOKEN"
@@ -149,7 +137,7 @@ InstallIGFX () {
     # Backup and install it from release igc as a temporarily workaround
     # while we working to resolve the issue.
     echo "Backup libopencl-clang"
-    cp -d /usr/local/lib/libopencl-clang2.so.14*  .
+    cp -d /usr/local/lib/libopencl-clang2.so.15*  .
     echo "Download IGC dev git hash $IGC_DEV_VER"
     get_pre_release_igfx $IGC_DEV_URL $IGC_DEV_VER
     echo "Install IGC dev git hash $IGC_DEV_VER"
@@ -158,12 +146,12 @@ InstallIGFX () {
     dpkg -i --force-all *.deb
     echo "Install libopencl-clang"
     # Workaround only, will download deb and install with dpkg once fixed.
-    cp -d libopencl-clang2.so.14*  /usr/local/lib/
+    cp -d libopencl-clang2.so.15*  /usr/local/lib/
     rm /usr/local/lib/libigc.so /usr/local/lib/libigc.so.1* && \
        ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so && \
        ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so.1
     echo "Clean up"
-    rm *.deb libopencl-clang2.so.14*
+    rm *.deb libopencl-clang2.so.15*
     echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt
   fi
 }
@@ -215,7 +203,6 @@ if [[ $# -eq 0 ]] ; then
   echo "--use-dev-igc     - Install development version of Intel Graphics drivers instead"
   echo "--cpu      - Install Intel CPU OpenCL runtime"
   echo "--fpga-emu - Install Intel FPGA Fast emulator"
-  echo "--use-latest      - Use latest for all tags"
   echo "Set INSTALL_LOCATION env variable to specify install location"
   exit 0
 fi

llvm/include/llvm/SYCLLowerIR/DeviceConfigFile.td

@@ -262,7 +262,10 @@ class CudaTargetInfo<string targetName, list<Aspect> aspectList, int subGroupSiz
   assert !eq(subGroupSize, 32), "sub-group size for Cuda must be equal to 32 and not " # subGroupSize # ".";
 }
 
-defvar CudaMinAspects = !listconcat(AllUSMAspects, [AspectGpu, AspectFp64, AspectOnline_compiler, AspectOnline_linker,
+defvar CudaMinUSMAspects = [AspectUsm_device_allocations, AspectUsm_host_allocations, AspectUsm_shared_allocations];
+defvar CudaSM90USMAspects = [AspectUsm_system_allocations, AspectUsm_atomic_host_allocations, AspectUsm_atomic_shared_allocations];
+
+defvar CudaMinAspects = !listconcat(CudaMinUSMAspects, [AspectGpu, AspectFp64, AspectOnline_compiler, AspectOnline_linker,
     AspectQueue_profiling, AspectExt_intel_pci_address, AspectExt_intel_max_mem_bandwidth, AspectExt_intel_memory_bus_width,
     AspectExt_intel_device_info_uuid, AspectExt_oneapi_native_assert, AspectExt_intel_free_memory, AspectExt_intel_device_id,
     AspectExt_intel_memory_clock_rate, AspectExt_oneapi_ballot_group, AspectExt_oneapi_fixed_size_group,
@@ -292,9 +295,9 @@ def : CudaTargetInfo<"nvidia_gpu_sm_87", !listconcat(CudaMinAspects, CudaBindles
     [AspectFp16, AspectAtomic64, AspectExt_oneapi_cuda_async_barrier])>;
 def : CudaTargetInfo<"nvidia_gpu_sm_89", !listconcat(CudaMinAspects, CudaBindlessImagesAspects,
     [AspectFp16, AspectAtomic64, AspectExt_oneapi_cuda_async_barrier])>;
-def : CudaTargetInfo<"nvidia_gpu_sm_90", !listconcat(CudaMinAspects, CudaBindlessImagesAspects,
+def : CudaTargetInfo<"nvidia_gpu_sm_90", !listconcat(CudaMinAspects, CudaSM90USMAspects, CudaBindlessImagesAspects,
     [AspectFp16, AspectAtomic64, AspectExt_oneapi_cuda_async_barrier, AspectExt_oneapi_cuda_cluster_group])>;
-def : CudaTargetInfo<"nvidia_gpu_sm_90a", !listconcat(CudaMinAspects, CudaBindlessImagesAspects,
+def : CudaTargetInfo<"nvidia_gpu_sm_90a", !listconcat(CudaMinAspects, CudaSM90USMAspects, CudaBindlessImagesAspects,
     [AspectFp16, AspectAtomic64, AspectExt_oneapi_cuda_async_barrier, AspectExt_oneapi_cuda_cluster_group])>;
 
 //

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
@@ -213,9 +214,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
@@ -250,7 +248,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}
@@ -275,7 +273,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}
@@ -458,7 +455,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,24 @@
+# Finds or fetches emhash.
+if(DEFINED SYCL_EMHASH_DIR OR DEFINED EMHASH_SYS_LOC)
+  return()
+endif()
+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()