Merge remote-tracking branch 'origin/sycl' into fix_llvm_spirv_failur…

…e_ci
intel · Jan 25, 2025 · 03b1cf6 · 03b1cf6
2 parents 20d632a + 1dbe403
commit 03b1cf6
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 59 deletions.
diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
@@ -40,12 +40,6 @@ on:
         description: 'Filter matches for the changed files in the PR'
         default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
         required: false
-      merge_ref:
-        description: |
-          Commit-ish to merge post-checkout if non-empty. Must be reachable from
-          the default_branch input paramter.
-        type: string
-        default: 'FETCH_HEAD'
       retention-days:
         description: 'Artifacts retention period'
         type: string
@@ -150,7 +144,6 @@ jobs:
       with:
         path: src
         ref: ${{ inputs.build_ref || github.sha }}
-        merge_ref: ${{ inputs.merge_ref }}
         cache_path: "/__w/repo_cache/"
     - name: Setup oneAPI env
       if: ${{ inputs.cc == 'icx' || inputs.cxx == 'icpx' }}
@@ -278,7 +271,6 @@ jobs:
       uses: ./devops/actions/run-tests/e2e
       with:
         ref: ${{ inputs.ref || github.sha }}
-        merge_ref: ${{ inputs.merge_ref }}
         e2e_testing_mode: build-only
         target_devices: all
         artifact_suffix: default

diff --git a/.github/workflows/sycl-linux-precommit-aws.yml b/.github/workflows/sycl-linux-precommit-aws.yml
@@ -72,7 +72,6 @@ jobs:
       # No idea why but that seems to work and be in sync with the main
       # pre-commit workflow.
       ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
-      merge_ref: ''
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: llvm_sycl.tar.zst

diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml
@@ -41,7 +41,6 @@ jobs:
     uses: ./.github/workflows/sycl-linux-build.yml
     with:
       build_ref: ${{ github.sha }}
-      merge_ref: ''
       build_cache_root: "/__w/"
       build_artifact_suffix: "default"
       build_cache_suffix: "default"
@@ -97,7 +96,6 @@ jobs:
       extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }}
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
       ref: ${{ github.sha }}
-      merge_ref: ''
       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 }}
@@ -179,7 +177,6 @@ jobs:
       skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
 
       ref: ${{ github.sha }}
-      merge_ref: ''
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
@@ -228,7 +225,6 @@ jobs:
       extra_lit_opts: -a -j 1 --param enable-perf-tests=True
 
       ref: ${{ github.sha }}
-      merge_ref: ''
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}

diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml
@@ -38,13 +38,6 @@ on:
       ref:
         type: string
         required: True
-      merge_ref:
-        description: |
-          Commit-ish to merge post-checkout if non-empty. Must be reachable from
-          the default_branch input paramter.
-        type: string
-        default: 'FETCH_HEAD'
-        required: False
 
       sycl_toolchain_artifact:
         type: string
@@ -296,7 +289,6 @@ jobs:
       uses: ./devops/actions/run-tests/e2e
       with:
         ref: ${{ inputs.ref || github.sha }}
-        merge_ref: ${{ inputs.merge_ref }}
         e2e_binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         e2e_testing_mode: ${{ inputs.e2e_testing_mode }}

diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml
@@ -17,7 +17,6 @@ jobs:
       build_artifact_suffix: default
       build_configure_extra_args: '--hip --cuda'
       build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
-      merge_ref: ''
       retention-days: 90
 
       # We upload the build for people to download/use, override its name and
@@ -33,7 +32,6 @@ jobs:
       build_cache_suffix: sprod_shared
       build_artifact_suffix: sprod_shared
       build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu'
-      merge_ref: ''
 
       artifact_archive_name: sycl_linux_shared.tar.zst
 
@@ -112,7 +110,6 @@ jobs:
       extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}"
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
       ref: ${{ github.sha }}
-      merge_ref: ''
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -129,7 +126,6 @@ jobs:
       image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
       image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
       ref: ${{ github.sha }}
-      merge_ref: ''
       sycl_toolchain_artifact: sycl_linux_oneapi
       sycl_toolchain_archive: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_decompress_command }}
@@ -175,7 +171,6 @@ jobs:
       image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
       target_devices: cuda:gpu
       ref: ${{ github.sha }}
-      merge_ref: ''
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

diff --git a/.github/workflows/sycl-post-commit.yml b/.github/workflows/sycl-post-commit.yml
@@ -36,7 +36,6 @@ jobs:
       build_cache_suffix: default
       build_artifact_suffix: default
       build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
-      merge_ref: ''
 
   e2e-lin:
     needs: [build-lin]
@@ -90,7 +89,6 @@ jobs:
       env: ${{ matrix.env || '{}' }}
 
       ref: ${{ github.sha }}
-      merge_ref: ''
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}
@@ -106,8 +104,7 @@ jobs:
       compiler: icx
       build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no" 
       build_cache_suffix: icx
-      merge_ref: ''
-
+
   e2e-win:
     needs: build-win
     # Continue if build was successful.
@@ -121,7 +118,6 @@ jobs:
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       compiler: icx
-      merge_ref: ''
 
   macos_default:
     name: macOS

diff --git a/.github/workflows/sycl-rel-nightly.yml b/.github/workflows/sycl-rel-nightly.yml
@@ -39,7 +39,6 @@ jobs:
       build_artifact_suffix: default
       build_configure_extra_args: '--hip --cuda'
       build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
-      merge_ref: ''
       build_ref: sycl-rel-6_0_0
 
       # We upload the build for people to download/use, override its name and
@@ -109,7 +108,6 @@ jobs:
       extra_lit_opts: ${{ matrix.extra_lit_opts }}
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
       ref: sycl-rel-6_0_0
-      merge_ref: ''
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
@@ -120,7 +118,6 @@ jobs:
     uses: ./.github/workflows/sycl-windows-build.yml
     with:
       ref: sycl-rel-6_0_0
-      merge_ref: ''
 
       # We upload both Linux/Windows build via Github's "Releases"
       # functionality, make sure Linux/Windows names follow the same pattern.
@@ -140,7 +137,6 @@ jobs:
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       extra_lit_opts: --param gpu-intel-gen12=True
       ref: sycl-rel-6_0_0
-      merge_ref: ''
 
   cuda-aws-start:
     needs: [ubuntu2204_build]
@@ -162,7 +158,6 @@ jobs:
       image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
       target_devices: cuda:gpu
       ref: sycl-rel-6_0_0
-      merge_ref: ''
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

diff --git a/.github/workflows/sycl-weekly.yml b/.github/workflows/sycl-weekly.yml
@@ -19,7 +19,6 @@ jobs:
       build_cache_root: "/__w/"
       build_artifact_suffix: default
       build_configure_extra_args: ''
-      merge_ref: ''
 
   build-sycl-cts:
     needs: ubuntu2204_build

diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml
@@ -18,12 +18,6 @@ on:
       ref:
         type: string
         required: False
-      merge_ref:
-        description: |
-          Commit-ish to merge post-checkout if non-empty. Must be reachable from
-          the default_branch input paramter.
-        type: string
-        default: 'FETCH_HEAD'
       artifact_archive_name:
         type: string
         default: llvm_sycl.tar.gz
@@ -106,7 +100,6 @@ jobs:
       with:
         path: src
         ref: ${{ inputs.ref || github.sha }}
-        merge_ref: ${{ inputs.merge_ref }}
         cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
     - name: Configure
       shell: cmd

diff --git a/.github/workflows/sycl-windows-precommit.yml b/.github/workflows/sycl-windows-precommit.yml
@@ -42,7 +42,6 @@ jobs:
     uses: ./.github/workflows/sycl-windows-build.yml
     with:
       changes: ${{ needs.detect_changes.outputs.filters }}
-      merge_ref: ''
 
   e2e:
     needs: build
@@ -56,4 +55,3 @@ jobs:
       name: Intel GEN12 Graphics with Level Zero
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
-      merge_ref: ''
diff --git a/.github/workflows/sycl-windows-run-tests.yml b/.github/workflows/sycl-windows-run-tests.yml
@@ -18,13 +18,6 @@ on:
       ref:
         type: string
         required: False
-      merge_ref:
-        description: |
-          Commit-ish to merge post-checkout if non-empty. Must be reachable from
-          the default_branch input paramter.
-        type: string
-        default: 'FETCH_HEAD'
-        required: False
 
       sycl_toolchain_artifact:
         type: string
@@ -76,7 +69,6 @@ jobs:
       with:
         path: llvm
         ref: ${{ inputs.ref || github.sha }}
-        merge_ref: ${{ inputs.merge_ref }}
         cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
     - name: Download compiler toolchain
       uses: actions/download-artifact@v4

diff --git a/devops/actions/cached_checkout/action.yml b/devops/actions/cached_checkout/action.yml
@@ -10,7 +10,7 @@ inputs:
     description: |
       Commit-ish to merge post-checkout if non-empty. Must be reachable from the
       default_branch input paramter.
-    default: 'FETCH_HEAD'
+    default: ''
   path:
     description: 'Path to checkout repo to'
   fetch-depth:

diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml
@@ -3,8 +3,6 @@ name: 'Run SYCL E2E tests'
 inputs:
   ref:
     required: false
-  merge_ref:
-    required: false
   e2e_binaries_artifact:
     required: false
   extra_cmake_args:
@@ -31,7 +29,6 @@ runs:
     with:
       path: llvm
       ref: ${{ inputs.ref || github.sha }}
-      merge_ref: ${{ inputs.merge_ref }}
       cache_path: "/__w/repo_cache/"
 
   - name: Download E2E Binaries

diff --git a/sycl/source/detail/host_pipe_map_entry.hpp b/sycl/source/detail/host_pipe_map_entry.hpp
@@ -43,7 +43,18 @@ struct HostPipeMapEntry {
   }
 
   void initialize(const void *HostPipePtr) {
-    assert(!MHostPipePtr && "Host pipe pointer has already been initialized.");
+    // If there are multiple translation units using the host pipe then
+    // initialize function will be called multiple times with the same pointer
+    // because special function for pipe registration and initialization has to
+    // be emitted by frontend for each translation unit. Just make sure that
+    // pointer is the same.
+    if (MHostPipePtr) {
+      assert(MHostPipePtr == HostPipePtr &&
+             "Host pipe intializations disagree on address of the host pipe on "
+             "host.");
+      return;
+    }
+
     MHostPipePtr = HostPipePtr;
   }
 

diff --git a/sycl/test-e2e/Basic/fpga_tests/Inputs/kernel.cpp b/sycl/test-e2e/Basic/fpga_tests/Inputs/kernel.cpp
@@ -0,0 +1,7 @@
+#include "mypipe.hpp"
+#include <cstdint>
+
+void KernelFunctor::operator()() const {
+  uint32_t data = 2;
+  my_pipe::write(data);
+}
diff --git a/sycl/test-e2e/Basic/fpga_tests/Inputs/mypipe.hpp b/sycl/test-e2e/Basic/fpga_tests/Inputs/mypipe.hpp
@@ -0,0 +1,11 @@
+#include <cstdint>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/intel/fpga_extensions.hpp>
+
+#pragma once
+
+struct KernelFunctor {
+  using my_pipe =
+      sycl::ext::intel::experimental::pipe<struct sample_host_pipe, uint32_t>;
+  SYCL_EXTERNAL void operator()() const;
+};
diff --git a/sycl/test-e2e/Basic/fpga_tests/fpga_host_pipe_multiple_tus.cpp b/sycl/test-e2e/Basic/fpga_tests/fpga_host_pipe_multiple_tus.cpp
@@ -0,0 +1,20 @@
+// REQUIRES: accelerator
+// RUN: %clangxx -fsycl -fintelfpga %s %S/Inputs/kernel.cpp -I%S/Inputs -o %t.out
+// RUN: %{run} %t.out | FileCheck %s
+
+// Test checks that host pipe initialization doesn't fail if pipe is used in
+// multiple translation units.
+
+#include "mypipe.hpp"
+#include <iostream>
+
+int main() {
+  sycl::queue q{sycl::ext::intel::fpga_emulator_selector_v};
+  q.submit([&](sycl::handler &cgh) { cgh.single_task(KernelFunctor{}); });
+  uint32_t result = KernelFunctor::my_pipe::read(q);
+  q.wait();
+  // CHECK: 2
+  std::cout << result << std::endl;
+
+  return 0;
+}