Skip to content

Commit aa203ef

Browse files
authored
[SYCL][UR][Bindless] Enable tests using Level Zero backend and their aspects (#16862)
A number of working bindless images CI tests are disabled running on Level Zero backend. Enable them to improve test coverage. Enable corresponding feature aspects on the Level Zero backend.
1 parent 4538709 commit aa203ef

15 files changed

+41
-25
lines changed

sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_image_array
23
// UNSUPPORTED: target-amd
34
// UNSUPPORTED-INTENDED: image array not currently supported on AMD
45

56
// RUN: %{build} -o %t.out
6-
// RUN: %{run} %t.out
7+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
78

89
#include "../helpers/common.hpp"
910
#include <iostream>

sycl/test-e2e/bindless_images/array/read_sampled_array.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// REQUIRES: aspect-ext_oneapi_bindless_images
2-
3-
// UNSUPPORTED: hip
4-
// UNSUPPORTED-INTENDED: Image arrays are unimplemented in the HIP adapter.
2+
// REQUIRES: aspect-ext_oneapi_image_array
53

64
// RUN: %{build} -o %t.out
75
// RUN: %{run} %t.out

sycl/test-e2e/bindless_images/array/read_write_1d_subregion.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_image_array
23

4+
// UNSUPPORTED: level_zero
5+
// UNSUPPORTED-INTENDED: Undetermined issue causing enqueue process to fail.
6+
37
// RUN: %{build} -o %t.out
48
// RUN: %{run} %t.out
59

sycl/test-e2e/bindless_images/array/read_write_2d_subregion.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_image_array
23

4+
// UNSUPPORTED: level_zero
5+
// UNSUPPORTED-INTENDED: Undetermined issue causing data and invalid pointer
6+
// errors.
7+
38
// RUN: %{build} -o %t.out
49
// RUN: %{run} %t.out
510

sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// REQUIRES: linux
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
22
// REQUIRES: aspect-ext_oneapi_image_array
33

44
// RUN: %{build} -o %t.out

sycl/test-e2e/bindless_images/copies/device_to_device_copy_3D_subregion.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// REQUIRES: aspect-ext_oneapi_bindless_images
2+
23
// RUN: %{build} -o %t.out
3-
// RUN: %{run} %t.out
4+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
45

56
#include <iostream>
67
#include <numeric>

sycl/test-e2e/bindless_images/examples/example_1_1D_read_write.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// UNSUPPORTED-INTENDED: Undetermined issue in 'create_image' in this test.
66

77
// RUN: %{build} -o %t.out
8-
// RUN: %{run} %t.out
8+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
99

1010
#include <sycl/detail/core.hpp>
1111
#include <sycl/ext/oneapi/bindless_images.hpp>

sycl/test-e2e/bindless_images/examples/example_2_2D_dynamic_read.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: aspect-ext_oneapi_bindless_images
22

33
// RUN: %{build} -o %t.out
4-
// RUN: %{run} %t.out
4+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
55

66
#include <sycl/detail/core.hpp>
77
#include <sycl/ext/oneapi/bindless_images.hpp>

sycl/test-e2e/bindless_images/examples/example_4_1D_array_read_write.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
// REQUIRES: aspect-ext_oneapi_bindless_images
2+
// REQUIRES: aspect-ext_oneapi_image_array
23

34
// UNSUPPORTED: hip
45
// UNSUPPORTED-INTENDED: Undetermined issue in 'create_image' in this test.
56

67
// RUN: %{build} -o %t.out
7-
// RUN: %{run} %t.out
8+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
89

910
#include <sycl/detail/core.hpp>
1011
#include <sycl/ext/oneapi/bindless_images.hpp>

sycl/test-e2e/bindless_images/examples/example_6_import_memory_and_semaphores.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_external_memory_import
23
// REQUIRES: aspect-ext_oneapi_external_semaphore_import
34

sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
2+
// REQUIRES: aspect-ext_oneapi_bindless_images_shared_usm
13
// REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_1d_usm
24
// UNSUPPORTED: target-amd
35
// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
46

57
// RUN: %{build} -o %t.out
6-
// RUN: %{run} %t.out
8+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
79

810
#include <iostream>
911
#include <sycl/detail/core.hpp>

sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_2d
23
// UNSUPPORTED: target-amd
34
// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
45

56
// RUN: %{build} -o %t.out
6-
// RUN: %{run} %t.out
7+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
78

89
#include <iostream>
910
#include <sycl/detail/core.hpp>

sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_2d_usm
23
// UNSUPPORTED: target-amd
34
// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
45

56
// RUN: %{build} -o %t.out
6-
// RUN: %{run} %t.out
7+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
78

89
#include <iostream>
910
#include <sycl/detail/core.hpp>

sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
// REQUIRES: aspect-ext_oneapi_bindless_images
12
// REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_3d
23
// UNSUPPORTED: target-amd
34
// UNSUPPORTED-INTENDED: Sampled fetch not currently supported on AMD
45

56
// RUN: %{build} -o %t.out
6-
// RUN: %{run} %t.out
7+
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
78

89
#include <iostream>
910
#include <sycl/detail/core.hpp>

unified-runtime/source/adapters/level_zero/device.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,28 +1139,28 @@ ur_result_t urDeviceGetInfo(
11391139
return ReturnValue(false);
11401140
}
11411141
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP: {
1142-
// L0 does not support fetching 1D USM sampled image data.
1143-
return ReturnValue(false);
1142+
// L0 does support fetching 1D USM sampled image data.
1143+
return ReturnValue(true);
11441144
}
11451145
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP: {
1146-
// L0 does not not support fetching 1D non-USM sampled image data.
1146+
// L0 does not support fetching 1D non-USM sampled image data.
11471147
return ReturnValue(false);
11481148
}
11491149
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP: {
1150-
// L0 does not support fetching 2D USM sampled image data.
1151-
return ReturnValue(false);
1150+
// L0 does support fetching 2D USM sampled image data.
1151+
return ReturnValue(true);
11521152
}
11531153
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP: {
1154-
// L0 does not support fetching 2D non-USM sampled image data.
1155-
return ReturnValue(false);
1154+
// L0 does support fetching 2D non-USM sampled image data.
1155+
return ReturnValue(true);
11561156
}
11571157
case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP: {
1158-
// L0 does not support fetching 3D non-USM sampled image data.
1159-
return ReturnValue(false);
1158+
// L0 does support fetching 3D non-USM sampled image data.
1159+
return ReturnValue(true);
11601160
}
11611161
case UR_DEVICE_INFO_IMAGE_ARRAY_SUPPORT_EXP: {
1162-
// L0 does not support image arrays
1163-
return ReturnValue(false);
1162+
// L0 does support image arrays
1163+
return ReturnValue(true);
11641164
}
11651165
case UR_DEVICE_INFO_BINDLESS_UNIQUE_ADDRESSING_PER_DIM_EXP: {
11661166
// L0 does not support unique addressing per dimension
@@ -1171,7 +1171,7 @@ ur_result_t urDeviceGetInfo(
11711171
return ReturnValue(false);
11721172
}
11731173
case UR_DEVICE_INFO_BINDLESS_SAMPLE_2D_USM_EXP: {
1174-
// L0 does not support sampling 1D USM sampled image data.
1174+
// L0 does not support sampling 2D USM sampled image data.
11751175
return ReturnValue(false);
11761176
}
11771177
case UR_DEVICE_INFO_PROGRAM_SET_SPECIALIZATION_CONSTANTS:

0 commit comments

Comments
 (0)