Skip to content

Commit e07608c

Browse files
committed
Add missing code to enforce subgroup size in subgroup test.
1 parent e824ddc commit e07608c

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

test/conformance/device_code/subgroup.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ struct KernelFunctor {
1111
KernelFunctor(sycl::accessor<size_t, 1, sycl::access_mode::write> Acc)
1212
: Acc(Acc) {}
1313

14+
auto get(sycl::ext::oneapi::experimental::properties_tag) {
15+
return sycl::ext::oneapi::experimental::properties{
16+
sycl::ext::oneapi::experimental::sub_group_size<8>};
17+
}
18+
1419
void operator()(sycl::nd_item<1> NdItem) const {
1520
auto SG = NdItem.get_sub_group();
1621
if (NdItem.get_global_linear_id() == 0) {

test/conformance/enqueue/enqueue_adapter_level_zero_v2.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
urEnqueueDeviceGetGlobalVariableReadTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
33
urEnqueueKernelLaunchTest.InvalidKernelArgs/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
44
urEnqueueKernelLaunchKernelWgSizeTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
5-
urEnqueueKernelLaunchKernelSubGroupTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
65
urEnqueueKernelLaunchWithVirtualMemory.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
76
urEnqueueKernelLaunchUSMLinkedList.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UsePoolEnabled
87
urEnqueueKernelLaunchUSMLinkedList.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UsePoolDisabled
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{{NONDETERMINISTIC}}
22
{{OPT}}urEnqueueDeviceGetGlobalVariableReadTest.Success/Intel_R__OpenCL___{{.*}}_
33
urEnqueueKernelLaunchKernelWgSizeTest.Success/Intel_R__OpenCL___{{.*}}_
4-
urEnqueueKernelLaunchKernelSubGroupTest.Success/Intel_R__OpenCL___{{.*}}_
54
{{OPT}}urEnqueueKernelLaunchUSMLinkedList.Success/Intel_R__OpenCL___{{.*}}_UsePoolEnabled

test/conformance/enqueue/urEnqueueKernelLaunch.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ TEST_P(urEnqueueKernelLaunchKernelSubGroupTest, Success) {
180180
queue, kernel, n_dimensions, global_offset.data(), global_size.data(),
181181
nullptr, 0, nullptr, nullptr));
182182
ASSERT_SUCCESS(urQueueFinish(queue));
183+
// We specify this subgroup size in the kernel source, and then the kernel
184+
// queries for its subgroup size at runtime and writes it to the buffer.
183185
ValidateBuffer<size_t>(buffer, sizeof(size_t), 8);
184186
}
185187

0 commit comments

Comments
 (0)