Skip to content

Commit 9d635a3

Browse files
[SYCL][NFC] Automatically detect PVC in E2E tests (#14451)
Previously we had to explicitly specify that certain HW is present to enable corresponding LIT features and make some tests run (or be skipped). Forgetting to set that argument could lead to missing coverage, or unrelated failures. #13976 introduced automatic detection of HW architecture to E2E tests. This patch is one in a series of transitioning our tests to use that new functionality. This patch transitions tests that use `gpu-intel-pvc` feature to use auto-generated `arch-intel_gpu_pvc`. The patch does not completely removes `gpu-intel-pvc` usage in our LIT scripts, because some other features depend on it and I would like to do changes incrementally.
1 parent d77a348 commit 9d635a3

227 files changed

Lines changed: 252 additions & 235 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

sycl/test-e2e/Basic/event_profiling_info.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
// Fails there.
14-
// UNSUPPORTED: opencl && gpu && gpu-intel-pvc
14+
// UNSUPPORTED: opencl && arch-intel_gpu_pvc
1515

1616
#include <cassert>
1717
#include <iostream>

sycl/test-e2e/Basic/kernel_max_wg_size.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Currently grf_size property can take value 256 (large) on PVC and DG2:
55
// https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/experimental/sycl_ext_intel_grf_size.asciidoc
6-
// REQUIRES: gpu && (gpu-intel-pvc || gpu-intel-dg2)
6+
// REQUIRES: arch-intel_gpu_pvc || gpu-intel-dg2
77
// UNSUPPORTED: cuda || hip
88

99
// clang-format off

sycl/test-e2e/Basic/submit_time.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// There is an issue with reported device time for the L0 backend, works only on
33
// pvc for now. No such problems for other backends.
4-
// RUN: %if (!level_zero || gpu-intel-pvc) %{ %{run} %t.out %}
4+
// RUN: %if (!level_zero || arch-intel_gpu_pvc) %{ %{run} %t.out %}
55

66
// Check that submission time is calculated properly.
77

sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: gpu, gpu-intel-pvc
1+
// REQUIRES: arch-intel_gpu_pvc, ocloc
22
// RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out
33
// RUN: %{run} %t.out
44

sycl/test-e2e/DeviceCodeSplit/grf.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
// - SYCL device binary images are compiled with the corresponding
1414
// compiler option
1515

16-
// REQUIRES: gpu && gpu-intel-pvc
17-
// UNSUPPORTED: cuda || hip
16+
// REQUIRES: arch-intel_gpu_pvc
1817
// RUN: %{build} -o %t.out
1918
// RUN: env SYCL_PI_TRACE=-1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
2019
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_PI_TRACE=-1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR

sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//==-----------------------------------------------------------------------==//
8-
// REQUIRES: gpu-intel-pvc
8+
// REQUIRES: arch-intel_gpu_pvc
99
// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
1010
// RUN: %{run} %t.out
1111
//

sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//=-------------------------------------------------------------------=//
8-
// REQUIRES: gpu-intel-pvc
8+
// REQUIRES: arch-intel_gpu_pvc
99
// RUN: %{build} -o %t.out -fsycl-esimd-force-stateless-mem
1010
// RUN: %{run} %t.out
1111

sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===-------------------------------------------------------------------===//
8-
// REQUIRES: gpu-intel-pvc
8+
// REQUIRES: arch-intel_gpu_pvc
99
// RUN: %{build} -o %t.out -fsycl-esimd-force-stateless-mem
1010
// RUN: %{run} %t.out
1111

sycl/test-e2e/ESIMD/accessor_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===------------------------------------------------------------===//
8-
// REQUIRES: gpu-intel-pvc
8+
// REQUIRES: arch-intel_gpu_pvc
99
// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
1010
// RUN: %{run} %t.out
1111

sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===------------------------------------------------------------===//
8-
// REQUIRES: gpu-intel-pvc
8+
// REQUIRES: arch-intel_gpu_pvc
99
// RUN: %{build} -fsycl-esimd-force-stateless-mem -o %t.out
1010
// RUN: %{run} %t.out
1111

0 commit comments

Comments
 (0)