Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown

 Conflicts:
	llvm-spirv/lib/SPIRV/SPIRVReader.cpp

Author: jsji

.github/CODEOWNERS

@@ -193,9 +193,12 @@ llvm/include/llvm/Transforms/Instrumentation/AddressSanitizer.h @intel/dpcpp-san
 llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerCommon.h @intel/dpcpp-sanitizers-review
 llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h @intel/dpcpp-sanitizers-review
 llvm/include/llvm/Transforms/Instrumentation/MemorySanitizer.h @intel/dpcpp-sanitizers-review
+llvm/include/llvm/Transforms/Instrumentation/ThreadSanitizer.h @intel/dpcpp-sanitizers-review
 llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @intel/dpcpp-sanitizers-review
 llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @intel/dpcpp-sanitizers-review
+llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp @intel/dpcpp-sanitizers-review
 llvm/test/Instrumentation/AddressSanitizer/ @intel/dpcpp-sanitizers-review
 llvm/test/Instrumentation/MemorySanitizer/ @intel/dpcpp-sanitizers-review
+llvm/test/Instrumentation/ThreadSanitizer/ @intel/dpcpp-sanitizers-review
 sycl/test-e2e/AddressSanitizer/ @intel/dpcpp-sanitizers-review
 sycl/test-e2e/MemorySanitizer/ @intel/dpcpp-sanitizers-review

.github/workflows/sycl-linux-precommit.yml

@@ -107,6 +107,13 @@ jobs:
             target_devices: level_zero:gpu
             # The new Xe kernel driver used by BMG doesn't support resetting.
             reset_intel_gpu: false
+          - name: SPIR-V Backend / Intel Battlemage Graphics
+            runner: '["Linux", "bmg"]'
+            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+            target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
+            reset_intel_gpu: false
+            extra_lit_opts: --param spirv-backend=True
+            e2e_binaries_artifact: sycl_e2e_bin_default_spirv_backend
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}
@@ -120,7 +127,7 @@ jobs:
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
-      e2e_binaries_artifact: sycl_e2e_bin_default
+      e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact || 'sycl_e2e_bin_default' }}
       e2e_testing_mode: 'run-only'
 
       # Do not install drivers on AMD and CUDA runners.

.github/workflows/sycl-linux-run-tests.yml

@@ -145,7 +145,6 @@ on:
           - 'level_zero:gpu'
           - 'opencl:cpu'
           - 'opencl:gpu'
-          - 'opencl:fpga'
           - 'hip:gpu'
           - 'cuda:gpu'
       tests_selector:

.github/workflows/sycl-post-commit.yml

@@ -46,7 +46,7 @@ jobs:
         include:
           - name: Intel GEN12 Graphics with Level Zero
             runner: '["Linux", "gen12"]'
-            target_devices: level_zero:gpu;opencl:fpga
+            target_devices: level_zero:gpu
             reset_intel_gpu: true
           - name: Intel Arc A-Series Graphics with Level Zero
             runner: '["Linux", "arc"]'

.github/workflows/sycl-windows-build.yml

@@ -43,6 +43,7 @@ on:
         type: choice
         options:
           - "[]"
+          - '[sycl]'
           - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
       build_cache_suffix:
         type: choice
@@ -164,6 +165,19 @@ jobs:
       if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
       run: |
         cmake --build build --target check-libdevice
+    - name: Generate/diff new ABI symbols
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
+      shell: bash
+      run: |
+        LLVM_BIN_PATH="build/bin" python.exe src/sycl/tools/abi_check.py --mode dump_symbols --output build/new_sycl_symbols_windows.dump build/bin/sycl?.dll
+        diff -Naur src/sycl/test/abi/sycl_symbols_windows.dump build/new_sycl_symbols_windows.dump || true
+    - name: Upload new ABI symbols
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
+      uses: actions/upload-artifact@v4
+      with:
+        name: sycl_windows_abi_symbols
+        path: build/new_sycl_symbols_windows.dump
+        retention-days: ${{ inputs.retention-days }}
     - name: Install
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
       shell: bash

buildbot/configure.py

@@ -65,9 +65,15 @@ def do_configure(args):
     sycl_enable_xpti_tracing = "ON"
     xpti_enable_werror = "OFF"
     llvm_enable_zstd = "ON"
+    spirv_enable_dis = "OFF"
 
     if sys.platform != "darwin":
-        sycl_enabled_backends.append("level_zero")
+        # For more info on the enablement of level_zero_v2 refer to this document:
+        # https://github.com/intel/llvm/blob/sycl/unified-runtime/source/adapters/level_zero/v2/README.md
+        if args.level_zero_v2:
+            sycl_enabled_backends.append("level_zero_v2")
+        else:
+            sycl_enabled_backends.append("level_zero")
 
     # lld is needed on Windows or for the HIP adapter on AMD
     if platform.system() == "Windows" or (args.hip and args.hip_platform == "AMD"):
@@ -151,6 +157,7 @@ def do_configure(args):
             if libclc_nvidia_target_names not in libclc_targets_to_build:
                 libclc_targets_to_build += libclc_nvidia_target_names
             libclc_gen_remangled_variants = "ON"
+            spirv_enable_dis = "ON"
 
     if args.enable_backends:
         sycl_enabled_backends += args.enable_backends
@@ -188,6 +195,7 @@ def do_configure(args):
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
         "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing),
         "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
+        "-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS={}".format(spirv_enable_dis),
         "-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror),
         "-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags),
         "-DSYCL_ENABLE_BACKENDS={}".format(";".join(set(sycl_enabled_backends))),
@@ -327,6 +335,9 @@ def main():
         default="AMD",
         help="choose hardware platform for HIP backend",
     )
+    parser.add_argument(
+        "--level_zero_v2", action="store_true", help="Enable SYCL Level Zero V2"
+    )
     parser.add_argument(
         "--host-target",
         default="host",

devops/dependencies-igc-dev.json

@@ -1,10 +1,10 @@
 {
   "linux": {
     "igc_dev": {
-      "github_tag": "igc-dev-485a03a",
-      "version": "485a03a",
-      "updated_at": "2025-02-23T08:39:32Z",
-      "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2636767722/zip",
+      "github_tag": "igc-dev-e651db8",
+      "version": "e651db8",
+      "updated_at": "2025-02-26T22:36:50Z",
+      "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/2659517987/zip",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     }
   }

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -6789,10 +6789,6 @@ LLVMToSPIRVBase::transBuiltinToInstWithoutDecoration(Op OC, CallInst *CI,
                                       transValue(CI->getArgOperand(2), BB), BB);
     return BM->addStoreInst(transValue(CI->getArgOperand(0), BB), V, {}, BB);
   }
-  case OpCooperativeMatrixLengthKHR: {
-    return BM->addCooperativeMatrixLengthKHRInst(
-        transScavengedType(CI), transType(CI->getArgOperand(0)->getType()), BB);
-  }
   case OpGroupNonUniformShuffleDown: {
     Function *F = CI->getCalledFunction();
     if (F->arg_size() && F->getArg(0)->hasStructRetAttr()) {

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVModule.cpp

@@ -279,9 +279,6 @@ class SPIRVModuleImpl : public SPIRVModule {
   SPIRVTypeTaskSequenceINTEL *addTaskSequenceINTELType() override;
   SPIRVInstruction *addTaskSequenceGetINTELInst(SPIRVType *, SPIRVValue *,
                                                 SPIRVBasicBlock *) override;
-  SPIRVInstruction *
-  addCooperativeMatrixLengthKHRInst(SPIRVType *, SPIRVType *,
-                                    SPIRVBasicBlock *) override;
   SPIRVType *addOpaqueGenericType(Op) override;
   SPIRVTypeDeviceEvent *addDeviceEventType() override;
   SPIRVTypeQueue *addQueueType() override;
@@ -1097,14 +1094,6 @@ SPIRVInstruction *SPIRVModuleImpl::addTaskSequenceGetINTELInst(
       BB);
 }
 
-SPIRVInstruction *SPIRVModuleImpl::addCooperativeMatrixLengthKHRInst(
-    SPIRVType *RetTy, SPIRVType *MatTy, SPIRVBasicBlock *BB) {
-  return addInstruction(
-      SPIRVInstTemplateBase::create(OpCooperativeMatrixLengthKHR, RetTy,
-                                    getId(), getVec(MatTy->getId()), BB, this),
-      BB);
-}
-
 SPIRVType *SPIRVModuleImpl::addOpaqueGenericType(Op TheOpCode) {
   return addType(new SPIRVTypeOpaqueGeneric(TheOpCode, this, getId()));
 }

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVModule.h

@@ -272,9 +272,6 @@ class SPIRVModule {
   virtual SPIRVTypeTaskSequenceINTEL *addTaskSequenceINTELType() = 0;
   virtual SPIRVInstruction *
   addTaskSequenceGetINTELInst(SPIRVType *, SPIRVValue *, SPIRVBasicBlock *) = 0;
-  virtual SPIRVInstruction *
-  addCooperativeMatrixLengthKHRInst(SPIRVType *, SPIRVType *,
-                                    SPIRVBasicBlock *) = 0;
   virtual SPIRVTypeVoid *addVoidType() = 0;
   virtual SPIRVType *addOpaqueGenericType(Op) = 0;
   virtual SPIRVTypeDeviceEvent *addDeviceEventType() = 0;