Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 3 additions & 3 deletions sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// UNSUPPORTED: hip_nvidia
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
// UNSUPPORTED: accelerator
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We support multiple // UNSUPPORTED: directives? ( As opposed to having to construct a boolean expression with hip_nvidia )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

// RUN: %{build} -o %t.out
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s

#include <iostream>
#include <sycl/accessor.hpp>
Expand Down
5 changes: 2 additions & 3 deletions sycl/test-e2e/Plugin/enqueue-arg-order-image.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// REQUIRES: aspect-ext_intel_legacy_image
// UNSUPPORTED: hip
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %{build} -o %t.out
// Native images are created with host pointers only with host unified memory
// support, enforce it for this test.
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %{run} %t.out | FileCheck %s

#include <iostream>
#include <sycl/accessor.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-buffer-cuda.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

//==--- interop-cuda.cpp - SYCL test for CUDA buffer interop API ----------===//
//
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-cuda-experimental.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda && cuda_dev_kit

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %cuda_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %cuda_options -o %t.out
// RUN: %{run} %t.out

#define SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL 1
#include <sycl/ext/oneapi/experimental/backend/cuda.hpp>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %cuda_options -lcudart -lcuda -x cuda %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// REQUIRES: cuda && cuda_dev_kit
// RUN: %{build} %cuda_options -lcudart -lcuda -x cuda -o %t.out
// RUN: %{run} %t.out

#include <cuda.h>
#include <sycl/sycl.hpp>
Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/Plugin/interop-l0-direct.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %GPU_RUN_PLACEHOLDER %t.out
// UNSUPPORTED: ze_debug-1,ze_debug4
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{run} %t.out

#include <iostream>
#include <level_zero/ze_api.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR='level_zero:*' %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out

// Test 2D and 3D interoperability buffers for the Level Zero backend.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// L0 plugin incorrectly reports memory leaks because it doesn't take into
// account direct calls to L0 API.
// UNSUPPORTED: ze_debug-1,ze_debug4
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_USM_ALLOCATOR=1 ONEAPI_DEVICE_SELECTOR='level_zero:*' ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_DISABLE_USM_ALLOCATOR=1 ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s

// Test for Level Zero buffer interop API.
// Check the following cases:
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero-buffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// L0 plugin incorrectly reports memory leaks because it doesn't take into
// account direct calls to L0 API.
// UNSUPPORTED: ze_debug-1,ze_debug4
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR='level_zero:*' ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env ZE_DEBUG=1 %{run} %t.out

// Test interoperability buffer for the Level Zer backend

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero-get-native-mem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// L0 plugin incorrectly reports memory leaks because it doesn't take into
// account direct calls to L0 API.
// UNSUPPORTED: ze_debug-1,ze_debug4
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out

// Test get_native_mem for the Level Zero backend.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out 2>&1 | FileCheck %s

// we use the interop to get the native image handle and then use that to make a
// new image and enumerate the pixels.
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero-image-ownership.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s

// This test verifies that ownership is working correctly.
// If ownership is ::transfer then the ~image destructor will end up calling
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero-image.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out

// This test verifies that make_image is working for 1D, 2D and 3D images.
// We instantiate an image with L0, set its body, then use a host accessor to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out

// Test for Level Zero interop_task for buffer.
// Level-Zero
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: aspect-ext_intel_legacy_image
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out

// Test for Level Zero interop_task for image.
// Level-Zero
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero-keep-ownership.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out %level_zero_options
// RUN: %{run} %t.out

// Test for Level Zero interop API where SYCL RT doesn't take ownership

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero-thread.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options %threads_lib
// RUN: %BE_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out %level_zero_options %threads_lib
// RUN: %{run} %t.out
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did BE_RUN_PLACEHOLDER somehow also pipe to FileCheck? In any case, we'll need to add that now, corect?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we never ran FileCheck on that test. I think the author supposed we need (hence checks below), but enabling that should be a separate PR.

//
// CHECK: Running iteration 0
// CHECK: Running iteration 1
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-level-zero.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out
// UNSUPPORTED: ze_debug-1,ze_debug4

// Test for Level Zero interop API
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/interop-opencl-interop-task-mem.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: opencl, opencl_icd

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out %opencl_lib
// RUN: %{run} %t.out

// Test for OpenCL interop_task.

Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Plugin/interop-opencl-make-kernel-bundle.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// REQUIRES: opencl, opencl_icd

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out %opencl_lib
// RUN: %{run} %t.out

#include <CL/cl.h>

Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Plugin/interop-opencl-make-kernel.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// REQUIRES: opencl, opencl_icd

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %opencl_lib
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out %opencl_lib
// RUN: %{run} %t.out

// Test for OpenCL make_kernel

Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Plugin/interop-opencl.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// REQUIRES: opencl

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %CPU_RUN_PLACEHOLDER %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %GPU_RUN_PLACEHOLDER %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %ACC_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

//==-- interop-opencl.cpp - SYCL test for OpenCL interop API --------------===//
//
Expand Down
12 changes: 6 additions & 6 deletions sycl/test-e2e/Plugin/level-zero-event-leak.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// REQUIRES: level_zero, level_zero_dev_kit
//
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out wait 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.out nowait 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %{run} %t.out wait 2>&1 | FileCheck %s
Copy link
Contributor

@cperkinsintel cperkinsintel May 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we have the //REQUIRES: level_zero already in the test, do we really need the ONEAPI_DEVICE_SELECTOR="level_zero:*" ?

The other tests have foregone it and I think they are improved for the change. Probably should remove it everyhwere in this test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it should be removed.

// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %{run} %t.out nowait 2>&1 | FileCheck %s
//
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -DCHECK_INORDER -o %t.inorder.out
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.inorder.out wait 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %GPU_RUN_PLACEHOLDER %t.inorder.out nowait 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: %{build} %level_zero_options -DCHECK_INORDER -o %t.inorder.out
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %{run} %t.inorder.out wait 2>&1 | FileCheck %s
// RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:*" ZE_DEBUG=4 %{run} %t.inorder.out nowait 2>&1 | FileCheck %s
//
// CHECK-NOT: LEAK

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/level-zero-usm-capabilities.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// REQUIRES: gpu, level_zero, level_zero_dev_kit
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out 2>&1 | FileCheck %s

#include <iostream>
#include <sycl/sycl.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: gpu, level_zero, level_zero_dev_kit

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: %{build} %level_zero_options -o %t.out
// RUN: env SYCL_PI_TRACE=2 ZE_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out 2>&1 | FileCheck %s

// Test that the wait with a barrier is fully batched, i.e. it doesn't cause
// extra submissions.
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// See https://github.com/intel/llvm-test-suite/issues/906
// REQUIRES: gpu, level_zero

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %{build} -o %t.out

// Set batching to 4 explicitly
// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_TRACE=2 ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2>&1 | FileCheck %s
// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_TRACE=2 ZE_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s

// level_zero_batch_test.cpp
//
Expand Down
Loading