Skip to content

[SYCL][DevOps] Fuse OCL CPU testing into GEN9 Linux task #9546

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

Merged
merged 2 commits into from
May 23, 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
2 changes: 1 addition & 1 deletion .github/workflows/sycl_precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: ./.github/workflows/sycl_gen_test_matrix.yml
with:
ref: ${{ github.event.pull_request.head.sha }}
lts_config: "hip_amdgpu;ocl_x64;lin_gen9;esimd_emu;cuda_aws;win_l0_gen12"
lts_config: "hip_amdgpu;lin_intel;esimd_emu;cuda_aws;win_l0_gen12"

linux_default:
name: Linux
Expand Down
6 changes: 3 additions & 3 deletions devops/test_configs.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"lts": [
{
"config": "lin_gen9",
"name": "SYCL E2E on Intel GEN9 GPU",
"config": "lin_intel",
"name": "SYCL E2E on Intel CPU/GEN9 GPU",
"runs-on": [
"Linux",
"gen9"
],
"image": "${{ inputs.intel_drivers_image }}",
"container_options": "-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN",
"targets": "ext_oneapi_level_zero:gpu;opencl:gpu",
"targets": "ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu",
"cmake_args": ""
},
{
Expand Down
16 changes: 9 additions & 7 deletions sycl/test-e2e/Config/allowlist.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
// REQUIRES: cpu
// REQUIRES: opencl && cpu
// RUN: %{build} -o %t.out
//
// RUN: env PRINT_DEVICE_INFO=1 %{run-unfiltered-devices} %t.out > %t1.conf
// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t1.conf %{run-unfiltered-devices} %t.out
// FIXME: Using ONEAPI_DEVICE_SELECTOR=\*:cpu results in seg. faults that I
// cannot reproduce under gdb.
// RUN: env PRINT_DEVICE_INFO=1 ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out > %t1.conf
// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t1.conf ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
//
// RUN: env PRINT_PLATFORM_INFO=1 %{run-unfiltered-devices} %t.out > %t2.conf
// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t2.conf %{run-unfiltered-devices} %t.out
// RUN: env PRINT_PLATFORM_INFO=1 ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out > %t2.conf
// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t2.conf ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
//
// RUN: env TEST_DEVICE_IS_NOT_AVAILABLE=1 env SYCL_DEVICE_ALLOWLIST="PlatformName:{{SUCH NAME DOESN'T EXIST}}" %{run-unfiltered-devices} %t.out
// RUN: env TEST_INCORRECT_VALUE=1 env SYCL_DEVICE_ALLOWLIST="IncorrectKey:{{.*}}" %{run-unfiltered-devices} %t.out
// RUN: env TEST_DEVICE_IS_NOT_AVAILABLE=1 env SYCL_DEVICE_ALLOWLIST="PlatformName:{{SUCH NAME DOESN'T EXIST}}" ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
// RUN: env TEST_INCORRECT_VALUE=1 env SYCL_DEVICE_ALLOWLIST="IncorrectKey:{{.*}}" ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out

#include <algorithm>
#include <cstdlib>
Expand Down