From a8cdcbfe7ba15846ffa8145c61c4c6efd83f2687 Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Sun, 21 May 2023 14:44:50 -0700 Subject: [PATCH 1/2] [SYCL][DevOps] Fuse OCL CPU testing into GEN9 Linux task It would increase its duration by several minutes while eliminating 20+ minutes task completely. --- .github/workflows/sycl_precommit.yml | 2 +- devops/test_configs.json | 4 ++-- sycl/test-e2e/Config/allowlist.cpp | 16 +++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index f30853f3d796f..6628b6b819850 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -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_gen9;esimd_emu;cuda_aws;win_l0_gen12" linux_default: name: Linux diff --git a/devops/test_configs.json b/devops/test_configs.json index 7e34639c1a848..95cd79ebaf3b7 100644 --- a/devops/test_configs.json +++ b/devops/test_configs.json @@ -2,14 +2,14 @@ "lts": [ { "config": "lin_gen9", - "name": "SYCL E2E on Intel GEN9 GPU", + "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": "" }, { diff --git a/sycl/test-e2e/Config/allowlist.cpp b/sycl/test-e2e/Config/allowlist.cpp index 36453a2612062..d7077267d130e 100644 --- a/sycl/test-e2e/Config/allowlist.cpp +++ b/sycl/test-e2e/Config/allowlist.cpp @@ -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 #include From c2a50d732f1993829e6791558a0c2859aaed302b Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Mon, 22 May 2023 10:43:55 -0700 Subject: [PATCH 2/2] Rename lin_gen9 -> lin_intel --- .github/workflows/sycl_precommit.yml | 2 +- devops/test_configs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index 6628b6b819850..f7b1cee9e46eb 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -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;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 diff --git a/devops/test_configs.json b/devops/test_configs.json index 95cd79ebaf3b7..820f97371ae6e 100644 --- a/devops/test_configs.json +++ b/devops/test_configs.json @@ -1,7 +1,7 @@ { "lts": [ { - "config": "lin_gen9", + "config": "lin_intel", "name": "SYCL E2E on Intel CPU/GEN9 GPU", "runs-on": [ "Linux",