Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

[SYCL] Disable tests that use images on PVC platform #1497

Merged
merged 2 commits into from
Jan 10, 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 SYCL/Basic/image/image.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: hip
// UNSUPPORTED: hip || gpu-intel-pvc
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_accessor_range.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// FIXME: Investigate OS-agnostic failures
// REQUIRES: TEMPORARY_DISABLED

// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// CUDA does not support SYCL 1.2.1 images.
//
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
Expand Down
10 changes: 5 additions & 5 deletions SYCL/Basic/image/image_accessor_readsampler.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: cuda || hip || (windows && level_zero)
// UNSUPPORTED: cuda || hip || (windows && level_zero) || gpu-intel-pvc
// unsupported on windows (level-zero) due to fail of Jenkins/pre-ci-windows
// CUDA cannot support SYCL 1.2.1 images.
//
Expand Down Expand Up @@ -67,10 +67,10 @@ void checkReadSampler(char *host_ptr, s::sampler Sampler, s::cl_float4 Coord,
s::accessor<s::cl_float4, 1, s::access::mode::write> ReadDataBufAcc(
ReadDataBuf, cgh);

cgh.single_task<class kernel_class<i>>([=](){
s::cl_float4 RetColor = ReadAcc.read(Coord, Sampler);
ReadDataBufAcc[0] = RetColor;
});
cgh.single_task<class kernel_class<i>>([=]() {
s::cl_float4 RetColor = ReadAcc.read(Coord, Sampler);
ReadDataBufAcc[0] = RetColor;
});
});
}
validateReadData(ReadData, ExpectedColor, precision);
Expand Down
17 changes: 9 additions & 8 deletions SYCL/Basic/image/image_accessor_readwrite.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// CUDA cannot support SYCL 1.2.1 images.
//
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
Expand Down Expand Up @@ -106,9 +106,9 @@ void write_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
s::queue Queue;
Queue.submit([&](s::handler &cgh) {
auto WriteAcc = Img.get_access<WriteDataT, s::access::mode::write>(cgh);
cgh.single_task<class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>([=](){
WriteAcc.write(Coord, Color);
});
cgh.single_task<
class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>(
[=]() { WriteAcc.write(Coord, Color); });
});
}
}
Expand All @@ -129,10 +129,11 @@ void check_read_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
s::accessor<ReadDataT, 1, s::access::mode::write> ReadDataBufAcc(
ReadDataBuf, cgh);

cgh.single_task<class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=](){
ReadDataT RetColor = ReadAcc.read(Coord);
ReadDataBufAcc[0] = RetColor;
});
cgh.single_task<
class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=]() {
ReadDataT RetColor = ReadAcc.read(Coord);
ReadDataBufAcc[0] = RetColor;
});
});
}
check_read_data(ReadData, ExpectedColor);
Expand Down
17 changes: 9 additions & 8 deletions SYCL/Basic/image/image_accessor_readwrite_half.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// CUDA cannot support SYCL 1.2.1 images.
//
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
Expand Down Expand Up @@ -73,9 +73,9 @@ void write_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
s::queue Queue;
Queue.submit([&](s::handler &cgh) {
auto WriteAcc = Img.get_access<WriteDataT, s::access::mode::write>(cgh);
cgh.single_task<class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>([=](){
WriteAcc.write(Coord, Color);
});
cgh.single_task<
class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>(
[=]() { WriteAcc.write(Coord, Color); });
});
}
}
Expand All @@ -96,10 +96,11 @@ void check_read_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
s::accessor<ReadDataT, 1, s::access::mode::write> ReadDataBufAcc(
ReadDataBuf, cgh);

cgh.single_task<class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=](){
ReadDataT RetColor = ReadAcc.read(Coord);
ReadDataBufAcc[0] = RetColor;
});
cgh.single_task<
class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=]() {
ReadDataT RetColor = ReadAcc.read(Coord);
ReadDataBufAcc[0] = RetColor;
});
});
}
check_read_data(ReadData, ExpectedColor);
Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_max_size.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

// UNSUPPORTED: cuda || hip || (windows && opencl && gpu)
// UNSUPPORTED: cuda || hip || (windows && opencl && gpu) || gpu-intel-pvc
// CUDA does not support info::device::image3d_max_width query.
// TODO: Irregular runtime fails on Windows/opencl:gpu require analysis.

Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_read.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: hip
// UNSUPPORTED: hip || gpu-intel-pvc
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_read_fp16.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: hip
// UNSUPPORTED: hip || gpu-intel-pvc
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_sample.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// Temporarily disable test on Windows due to regressions in GPU driver.
// UNSUPPORTED: hip, windows
// UNSUPPORTED: hip, windows, gpu-intel-pvc

#include <sycl/sycl.hpp>

Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_write.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// TODO: re-enable on cuda device.
// See https://github.com/intel/llvm/issues/1542#issuecomment-707877817 for more
// details.
Expand Down
2 changes: 1 addition & 1 deletion SYCL/Basic/image/image_write_fp16.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: hip || cuda
// UNSUPPORTED: hip || cuda || gpu-intel-pvc
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/histogram.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
// REQUIRES: gpu
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/histogram_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
// REQUIRES: gpu
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/histogram_raw_send.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
// REQUIRES: gpu-intel-gen9
// UNSUPPORTED: gpu-intel-dg1,gpu-intel-dg2,cuda,hip
// UNSUPPORTED: gpu-intel-dg1,gpu-intel-dg2,cuda,hip, gpu-intel-pvc
// UNSUPPORTED: ze_debug-1,ze_debug4
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/linear/linear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
// REQUIRES: gpu
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// RUN: %clangxx -fsycl %s -I%S/.. -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out %S/linear_in.bmp %S/linear_gold_hw.bmp

Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/mandelbrot/mandelbrot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//

// REQUIRES: gpu
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// RUN: %clangxx -fsycl %s -I%S/.. -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out %T/output.ppm %S/golden_hw.ppm

Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

// TODO enable on Windows
// REQUIRES: linux && gpu
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// TODO online_compiler check fails for esimd_emulator
// XFAIL: esimd_emulator
// RUN: %clangxx -fsycl %s -I%S/.. -o %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/matrix_transpose2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
// FIXME: Investigate Windows-specific failures
// REQUIRES: TEMPORARY_DISABLED
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// TODO: esimd_emulator fails due to outdated __esimd_media_ld
// XFAIL: esimd_emulator
// RUN: %clangxx -fsycl %s -o %t.out
Expand Down
2 changes: 1 addition & 1 deletion SYCL/ESIMD/vadd_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
// REQUIRES: gpu
// UNSUPPORTED: cuda || hip
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

Expand Down
2 changes: 1 addition & 1 deletion SYCL/Plugin/enqueue-arg-order-image.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// UNSUPPORTED: hip
// UNSUPPORTED: hip, gpu-intel-pvc
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// Native images are created with host pointers only with host unified memory
// support, enforce it for this test.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out

// Test for Level Zero interop_task.

// Test for Level Zero interop_task for buffer.
// Level-Zero
#include <iostream>
#include <level_zero/ze_api.h>
Expand All @@ -20,27 +19,20 @@ int main() {

try {
buffer<uint8_t, 1> buffer(SIZE);
image<2> image(image_channel_order::rgba, image_channel_type::fp32,
{SIZE, SIZE});

ze_context_handle_t ze_context =
get_native<backend::ext_oneapi_level_zero>(queue.get_context());

queue
.submit([&](handler &cgh) {
auto buffer_acc = buffer.get_access<access::mode::write>(cgh);
auto image_acc = image.get_access<float4, access::mode::write>(cgh);
cgh.interop_task([=](const interop_handler &ih) {
void *device_ptr =
ih.get_mem<backend::ext_oneapi_level_zero>(buffer_acc);
ze_memory_allocation_properties_t memAllocProperties{};
ze_result_t res = zeMemGetAllocProperties(
ze_context, device_ptr, &memAllocProperties, nullptr);
assert(res == ZE_RESULT_SUCCESS);

ze_image_handle_t ze_image =
ih.get_mem<backend::ext_oneapi_level_zero>(image_acc);
assert(ze_image != nullptr);
});
})
.wait();
Expand Down
47 changes: 47 additions & 0 deletions SYCL/Plugin/interop-level-zero-interop-task-mem-image.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// REQUIRES: level_zero, level_zero_dev_kit
// UNSUPPORTED: gpu-intel-pvc
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %level_zero_options %s -o %t.out
// RUN: env SYCL_BE=PI_LEVEL_ZERO %GPU_RUN_PLACEHOLDER %t.out

// Test for Level Zero interop_task for image.
// Level-Zero
#include <iostream>
#include <level_zero/ze_api.h>
// SYCL
#include <sycl/ext/oneapi/backend/level_zero.hpp>
#include <sycl/sycl.hpp>

using namespace sycl;

constexpr size_t SIZE = 16;

int main() {
queue queue{};

try {
image<2> image(image_channel_order::rgba, image_channel_type::fp32,
{SIZE, SIZE});

ze_context_handle_t ze_context =
get_native<backend::ext_oneapi_level_zero>(queue.get_context());

queue
.submit([&](handler &cgh) {
auto image_acc = image.get_access<float4, access::mode::write>(cgh);
cgh.interop_task([=](const interop_handler &ih) {
ze_image_handle_t ze_image =
ih.get_mem<backend::ext_oneapi_level_zero>(image_acc);
assert(ze_image != nullptr);
});
})
.wait();
} catch (exception const &e) {
std::cout << "SYCL exception caught: " << e.what() << std::endl;
return e.get_cl_code();
} catch (const char *msg) {
std::cout << "Exception caught: " << msg << std::endl;
return 1;
}

return 0;
}
2 changes: 1 addition & 1 deletion SYCL/Tracing/image_printers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// RUN: %GPU_RUN_PLACEHOLDER %t.out
//
// Unsupported hip call on AMD
// UNSUPPORTED: hip_amd
// UNSUPPORTED: hip_amd, gpu-intel-pvc

// Test image-specific printers of the Plugin Interace
//
Expand Down