Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GHA] Uplift Linux GPU RT version to 23.30.26918.9 #11302

Merged
merged 7 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions devops/dependencies.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"linux": {
"compute_runtime": {
"github_tag": "23.22.26516.18",
"version": "23.22.26516.18",
"url": "https://github.com/intel/compute-runtime/releases/tag/23.22.26516.18",
"github_tag": "23.30.26918.9",
"version": "23.30.26918.9",
"url": "https://github.com/intel/compute-runtime/releases/tag/23.30.26918.9",
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
},
"igc": {
"github_tag": "igc-1.0.14062.11",
"version": "1.0.14062.11",
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.14062.11",
"github_tag": "igc-1.0.14828.8",
"version": "1.0.14828.8",
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.14828.8",
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
},
"cm": {
Expand Down
5 changes: 4 additions & 1 deletion sycl/test-e2e/Assert/assert_in_kernels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

// https://github.com/intel/llvm/issues/7634
// UNSUPPORTED: hip
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)

// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
// Shouldn't fail on ACC as fallback assert isn't enqueued there
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %}
//
// CHECK-NOT: One shouldn't see this message
// CHECK: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed
// CHECK-NOT: test aborts earlier, one shouldn't see this message
// CHECK-NOT: The test ended.
//
Expand Down
5 changes: 4 additions & 1 deletion sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

// https://github.com/intel/llvm/issues/7634
// UNSUPPORTED: hip
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)

// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %}
Expand All @@ -10,7 +13,7 @@
// CUDA uses block/thread vs global/local id for SYCL, also it shows the
// position of a thread within the block, not the absolute ID.
// CHECK: {{.*}}kernels_in_file2.cpp:15: int calculus(int): {{global id: \[5|block: \[1}},0,0], {{local id|thread}}: [1,0,0]
// CHECK-SAME: Assertion `X && "this message from calculus"` failed.
// CHECK-SAME: Assertion `X && "this message from calculus"` failed
// CHECK-NOT: this message from file2
// CHECK-NOT: The test ended.
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

// https://github.com/intel/llvm/issues/7634
// UNSUPPORTED: hip
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)

// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%{sycl_triple} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
// Shouldn't fail on ACC as fallback assert isn't enqueued there
Expand All @@ -11,7 +14,7 @@
// CUDA uses block/thread vs global/local id for SYCL, also it shows the
// position of a thread within the block, not the absolute ID.
// CHECK: {{.*}}assert_in_multiple_tus.hpp:20: int checkFunction(): {{global id: \[5|block: \[1}},0,0],
// CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed.
// CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed
// CHECK-NOT: this message from file2
// CHECK-NOT: The test ended.
//
Expand Down
5 changes: 4 additions & 1 deletion sycl/test-e2e/Assert/assert_in_one_kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

// https://github.com/intel/llvm/issues/7634
// UNSUPPORTED: hip
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)

// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
// Shouldn't fail on ACC as fallback assert isn't enqueued there
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %}
//
// CHECK: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
// CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
// CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed
// CHECK-NOT: The test ended.
//
// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
Expand Down
5 changes: 4 additions & 1 deletion sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
// UNSUPPORTED: hip || cuda
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out %threads_lib
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)
//
// Since this is a multi-threaded application enable memory tracking and
// deferred release feature in the Level Zero plugin to avoid releasing memory
// too early. This is necessary because currently SYCL RT sets indirect access
Expand All @@ -17,7 +20,7 @@
// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if acc %{ --check-prefix=CHECK-ACC %}
//
// CHECK: {{.*}}assert_in_simultaneous_kernels.hpp:13: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0]
// CHECK-SAME: Assertion `false && "from assert statement"` failed.
// CHECK-SAME: Assertion `false && "from assert statement"` failed
// CHECK-NOT: The test ended.
//
// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:13: void assertFunc(): {{.*}} [9,7,0], {{.*}} [0,0,0]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// FIXME flaky fail on CUDA and HIP
// UNSUPPORTED: cuda || hip
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)
//
// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
//
// Since this is a multi-threaded application enable memory tracking and
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// FIXME flaky fail on CUDA
// FIXME HIP: https://github.com/intel/llvm/issues/7634
// UNSUPPORTED: cuda, hip
//
// FIXME: Remove XFAIL one intel/llvm#11364 is resolved
// XFAIL: (opencl && gpu)

// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%{sycl_triple} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_simultaneously_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
// RUN: %if cpu %{ %{run} %t.out &> %t.cpu.txt ; FileCheck %s --input-file %t.cpu.txt %}
Expand Down
5 changes: 5 additions & 0 deletions sycl/test-e2e/ESIMD/assert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
//
// The test still fails after GPU driver update on Linux. Temporary marking it
// as expected to fail, whilst it is being investigated, see intel/llvm#11359
// FIXME: remove that XFAIL
// XFAIL: linux

#include "esimd_test_utils.hpp"

Expand Down
5 changes: 5 additions & 0 deletions sycl/test-e2e/ESIMD/slm_block_load_store.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
// RUN: %{run} %t.out
//
// UNSUPPORTED: esimd_emulator
// Even though the driver we use in CI is now new enough so this test doesn't
// skip itself, it still fails. Temporary XFAIL-ing it while it is being
// investigated.
// FIXME: enable it back after investigation, see intel/llvm#11358
// XFAIL: linux

// This test verifies usage of slm_block_load() and slm_block_store().

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/Graph/Explicit/buffer_ordering.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// REQUIRES: level_zero, gpu
// FIXME: re-enabled the test once intel/llvm#11374 is resolved
// REQUIRES: level_zero, gpu, TEMPORARILY_DISABLED
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// Extra run to check for leaks in Level Zero using ZE_DEBUG
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/Graph/RecordReplay/buffer_ordering.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// REQUIRES: level_zero, gpu
// FIXME: re-enabled the test once intel/llvm#11374 is resolved
// REQUIRES: level_zero, gpu, TEMPORARILY_DISABLED
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// Extra run to check for leaks in Level Zero using ZE_DEBUG
Expand Down