Skip to content

Commit 98db1cb

Browse files
[Tests] Revert changes in tests due we works with sycl::buffer on host (#2533)
1 parent af30f10 commit 98db1cb

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

test/parallel_api/iterator/transform_iterator.pass.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void test_simple_copy(size_t buffer_size)
6868

6969
int identity = 0;
7070
auto& sycl_src_buf = test_base_data.get_buffer(UDTKind::eKeys);
71-
auto host_source_begin = TestUtils::get_accessor_ptr(sycl_src_buf.get_host_access(sycl::write_only));
71+
auto host_source_begin = sycl_src_buf.get_host_access(sycl::write_only).get_pointer();
7272
::std::fill_n(host_source_begin, buffer_size, identity);
7373

7474
test_copy<int> test(test_base_data);
@@ -86,8 +86,8 @@ void test_ignore_copy(size_t buffer_size)
8686
auto& source_buf = test_base_data.get_buffer(UDTKind::eKeys);
8787
auto& result_buf = test_base_data.get_buffer(UDTKind::eVals);
8888

89-
auto host_source_begin = TestUtils::get_accessor_ptr(source_buf.get_host_access(sycl::write_only));
90-
auto host_result_begin = TestUtils::get_accessor_ptr(result_buf.get_host_access(sycl::write_only));
89+
auto host_source_begin = source_buf.get_host_access(sycl::write_only).get_pointer();
90+
auto host_result_begin = result_buf.get_host_access(sycl::write_only).get_pointer();
9191

9292
auto sycl_source_begin = oneapi::dpl::begin(source_buf);
9393
auto sycl_source_end = oneapi::dpl::end(source_buf);
@@ -118,7 +118,7 @@ void test_multi_transform_copy(size_t buffer_size)
118118
sycl::buffer<int>& source_buf = test_base_data.get_buffer(UDTKind::eKeys);
119119
sycl::buffer<int>& result_buf = test_base_data.get_buffer(UDTKind::eVals);
120120

121-
auto host_source_begin = TestUtils::get_accessor_ptr(source_buf.get_host_access(sycl::write_only));
121+
auto host_source_begin = source_buf.get_host_access(sycl::write_only).get_pointer();
122122

123123
auto sycl_source_begin = oneapi::dpl::begin(source_buf);
124124
auto sycl_source_end = sycl_source_begin + buffer_size;

test/support/utils_sycl.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -426,18 +426,5 @@ test4buffers(int mult = kDefaultMultValue)
426426
test4buffers<alloc_type, typename TestName::UsedValueType, TestName, TestSyclBuffer>(mult, TestName::ScaleStep, TestName::ScaleMax);
427427
}
428428

429-
#if TEST_DPCPP_BACKEND_PRESENT
430-
template <typename Acc>
431-
auto
432-
get_accessor_ptr(const Acc& acc)
433-
{
434-
#if (TEST_LIBSYCL_VERSION >= 70000)
435-
return acc.template get_multi_ptr<sycl::access::decorated::no>().get();
436-
#else
437-
return acc.get_pointer();
438-
#endif
439-
}
440-
#endif
441-
442429
} /* namespace TestUtils */
443430
#endif // _UTILS_SYCL_H

0 commit comments

Comments
 (0)