Skip to content

Commit dd5f918

Browse files
0x12CC0x12CC
committed
Fix test failures
Signed-off-by: Michael Aziz <[email protected]>
1 parent be00c78 commit dd5f918

File tree

6 files changed

+8
-33
lines changed

6 files changed

+8
-33
lines changed

‎sycl/include/sycl/info/ext_oneapi_kernel_queue_specific_traits.def‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
// TODO: Revisit 'max_num_work_group_sync' and align it with the
2-
// 'sycl_ext_oneapi_forward_progress' extension once #7598 is merged.
3-
__SYCL_PARAM_TRAITS_SPEC(ext::oneapi::experimental, kernel_queue_specific, max_num_work_group_sync, size_t,)
41
__SYCL_PARAM_TRAITS_SPEC(ext::oneapi::experimental, kernel_queue_specific, max_num_work_groups, size_t,)

‎sycl/source/detail/kernel_impl.hpp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -376,21 +376,6 @@ inline typename syclex::info::kernel_queue_specific::max_num_work_groups::
376376
return queryMaxNumWorkGroups(Queue, WorkGroupSize, DynamicLocalMemorySize);
377377
}
378378

379-
template <>
380-
inline typename syclex::info::kernel_queue_specific::max_num_work_group_sync::
381-
return_type
382-
kernel_impl::ext_oneapi_get_info<
383-
syclex::info::kernel_queue_specific::max_num_work_group_sync>(
384-
queue Queue) const {
385-
auto Device = Queue.get_device();
386-
const auto MaxWorkGroupSize =
387-
get_info<info::kernel_device_specific::work_group_size>(Device);
388-
const sycl::range<3> WorkGroupSize{MaxWorkGroupSize, 1, 1};
389-
return ext_oneapi_get_info<
390-
syclex::info::kernel_queue_specific::max_num_work_groups>(
391-
Queue, WorkGroupSize, /* DynamicLocalMemorySize */ 0);
392-
}
393-
394379
} // namespace detail
395380
} // namespace _V1
396381
} // namespace sycl

‎sycl/source/kernel.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,6 @@ kernel::ext_oneapi_get_info(queue Queue, const range<3> &WorkGroupSize,
135135
DynamicLocalMemorySize);
136136
}
137137

138-
template __SYCL_EXPORT typename ext::oneapi::experimental::info::
139-
kernel_queue_specific::max_num_work_group_sync::return_type
140-
kernel::ext_oneapi_get_info<
141-
ext::oneapi::experimental::info::kernel_queue_specific::
142-
max_num_work_group_sync>(queue Queue) const;
143-
144138
#define __SYCL_PARAM_TRAITS_SPEC(Namespace, DescType, Desc, ReturnT) \
145139
template __SYCL_EXPORT ReturnT \
146140
kernel::ext_oneapi_get_info<Namespace::info::DescType::Desc>( \

‎sycl/test-e2e/GroupAlgorithm/root_group.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ void testQueriesAndProperties() {
2727
const auto bundle =
2828
sycl::get_kernel_bundle<sycl::bundle_state::executable>(q.get_context());
2929
const auto kernel = bundle.get_kernel<class QueryKernel>();
30+
const auto local_range = sycl::range<1>(1);
3031
const auto maxWGs = kernel.ext_oneapi_get_info<
3132
sycl::ext::oneapi::experimental::info::kernel_queue_specific::
32-
max_num_work_group_sync>(q);
33-
const auto wgRange = sycl::range{WorkGroupSize, 1, 1};
33+
max_num_work_groups>(q, local_range, 0);
34+
const auto wgRange = sycl::range<3>{WorkGroupSize, 1, 1};
3435
const auto maxWGsWithLimits = kernel.ext_oneapi_get_info<
3536
sycl::ext::oneapi::experimental::info::kernel_queue_specific::
36-
max_num_work_group_sync>(q, wgRange, wgRange.size() * sizeof(int));
37+
max_num_work_groups>(q, wgRange, wgRange.size() * sizeof(int));
3738
const auto props = sycl::ext::oneapi::experimental::properties{
3839
sycl::ext::oneapi::experimental::use_root_sync};
3940
q.single_task<class QueryKernel>(props, []() {});
@@ -54,7 +55,7 @@ void testRootGroup() {
5455
const auto kernel = bundle.get_kernel<class RootGroupKernel>();
5556
const auto maxWGs = kernel.ext_oneapi_get_info<
5657
sycl::ext::oneapi::experimental::info::kernel_queue_specific::
57-
max_num_work_group_sync>(q);
58+
max_num_work_groups>(q, WorkGroupSize, 0);
5859
const auto props = sycl::ext::oneapi::experimental::properties{
5960
sycl::ext::oneapi::experimental::use_root_sync};
6061
sycl::buffer<int> dataBuf{sycl::range{maxWGs * WorkGroupSize}};
@@ -96,7 +97,7 @@ void testRootGroupFunctions() {
9697
const auto kernel = bundle.get_kernel<class RootGroupFunctionsKernel>();
9798
const auto maxWGs = kernel.ext_oneapi_get_info<
9899
sycl::ext::oneapi::experimental::info::kernel_queue_specific::
99-
max_num_work_group_sync>(q);
100+
max_num_work_groups>(q, WorkGroupSize, 0);
100101
const auto props = sycl::ext::oneapi::experimental::properties{
101102
sycl::ext::oneapi::experimental::use_root_sync};
102103

‎sycl/test/abi/sycl_symbols_linux.dump‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3939,9 +3939,9 @@ _ZNK4sycl3_V16kernel16get_backend_infoINS0_4info6device15backend_versionEEENS0_6
39393939
_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info6device7versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
39403940
_ZNK4sycl3_V16kernel16get_backend_infoINS0_4info8platform7versionEEENS0_6detail20is_backend_info_descIT_E11return_typeEv
39413941
_ZNK4sycl3_V16kernel17get_kernel_bundleEv
3942+
_ZNK4sycl3_V16kernel19ext_oneapi_get_infoINS0_3ext6oneapi12experimental4info21kernel_queue_specific19max_num_work_groupsEEENS0_6detail34is_kernel_queue_specific_info_descIT_E11return_typeENS0_5queueERKNS0_5rangeILi1EEEm
3943+
_ZNK4sycl3_V16kernel19ext_oneapi_get_infoINS0_3ext6oneapi12experimental4info21kernel_queue_specific19max_num_work_groupsEEENS0_6detail34is_kernel_queue_specific_info_descIT_E11return_typeENS0_5queueERKNS0_5rangeILi2EEEm
39423944
_ZNK4sycl3_V16kernel19ext_oneapi_get_infoINS0_3ext6oneapi12experimental4info21kernel_queue_specific19max_num_work_groupsEEENS0_6detail34is_kernel_queue_specific_info_descIT_E11return_typeENS0_5queueERKNS0_5rangeILi3EEEm
3943-
_ZNK4sycl3_V16kernel19ext_oneapi_get_infoINS0_3ext6oneapi12experimental4info21kernel_queue_specific23max_num_work_group_syncEEENS0_6detail34is_kernel_queue_specific_info_descIT_E11return_typeENS0_5queueE
3944-
_ZNK4sycl3_V16kernel19ext_oneapi_get_infoINS0_3ext6oneapi12experimental4info21kernel_queue_specific23max_num_work_group_syncEEENS0_6detail34is_kernel_queue_specific_info_descIT_E11return_typeENS0_5queueERKNS0_5rangeILi3EEEm
39453945
_ZNK4sycl3_V16kernel3getEv
39463946
_ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific15work_group_sizeEEENS0_6detail35is_kernel_device_specific_info_descIT_E11return_typeERKNS0_6deviceE
39473947
_ZNK4sycl3_V16kernel8get_infoINS0_4info22kernel_device_specific16global_work_sizeEEENS0_6detail35is_kernel_device_specific_info_descIT_E11return_typeERKNS0_6deviceE

‎sycl/test/abi/sycl_symbols_windows.dump‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
??$create_sub_devices@$0BAIH@@device@_V1@sycl@@QEBA?AV?$vector@Vdevice@_V1@sycl@@V?$allocator@Vdevice@_V1@sycl@@@std@@@std@@AEBV?$vector@_KV?$allocator@_K@std@@@4@@Z
1414
??$create_sub_devices@$0BAII@@device@_V1@sycl@@QEBA?AV?$vector@Vdevice@_V1@sycl@@V?$allocator@Vdevice@_V1@sycl@@@std@@@std@@W4partition_affinity_domain@info@12@@Z
1515
??$create_sub_devices@$0BAIJ@@device@_V1@sycl@@QEBA?AV?$vector@Vdevice@_V1@sycl@@V?$allocator@Vdevice@_V1@sycl@@@std@@@std@@XZ
16-
??$ext_oneapi_get_info@Umax_num_work_group_sync@kernel_queue_specific@info@experimental@oneapi@ext@_V1@sycl@@@kernel@_V1@sycl@@QEBA_KVqueue@12@@Z
17-
??$ext_oneapi_get_info@Umax_num_work_group_sync@kernel_queue_specific@info@experimental@oneapi@ext@_V1@sycl@@@kernel@_V1@sycl@@QEBA_KVqueue@12@AEBV?$range@$02@12@_K@Z
1816
??$ext_oneapi_get_info@Umax_num_work_groups@kernel_queue_specific@info@experimental@oneapi@ext@_V1@sycl@@@kernel@_V1@sycl@@QEBA_KVqueue@12@AEBV?$range@$02@12@_K@Z
1917
??$get_backend_info@Ubackend_version@device@info@_V1@sycl@@@context@_V1@sycl@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ
2018
??$get_backend_info@Ubackend_version@device@info@_V1@sycl@@@device@_V1@sycl@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ

0 commit comments

Comments
 (0)