@@ -307,14 +307,13 @@ LZT_TEST_F(AtomicAccessTests, SetAndGetAccessTypeForSharedAllocation) {
307307 lzt::free_memory (context, alloc_data);
308308}
309309
310- LZT_TEST_F (AtomicAccessTests,
311- SetAndGetPositiveAccessTypeWithSharedSystemAllocator) {
312- SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED ();
310+ static void RunSetAndGetPositiveAccessTypeTest (bool is_shared_system) {
313311 auto context = lzt::get_default_context ();
314312 auto device = lzt::get_default_device (lzt::get_default_driver ());
315313
316314 auto alloc_data =
317- static_cast <int *>(lzt::aligned_malloc (size * sizeof (int ), 1 ));
315+ static_cast <int *>(lzt::allocate_shared_memory_with_allocator_selector (
316+ size * sizeof (int ), is_shared_system));
318317
319318 auto memory_access_properties = lzt::get_memory_access_properties (device);
320319 ze_memory_atomic_attr_exp_flags_t access_type;
@@ -352,16 +351,26 @@ LZT_TEST_F(AtomicAccessTests,
352351 context, device, alloc_data, size,
353352 ZE_MEMORY_ATOMIC_ATTR_EXP_FLAG_SYSTEM_ATOMICS);
354353
355- if (!(memory_access_properties.sharedSingleDeviceAllocCapabilities &
356- ZE_MEMORY_ACCESS_CAP_FLAG_CONCURRENT_ATOMIC)) {
354+ auto capabilities =
355+ is_shared_system
356+ ? memory_access_properties.sharedSystemAllocCapabilities
357+ : memory_access_properties.sharedSingleDeviceAllocCapabilities ;
358+
359+ if (!(capabilities & ZE_MEMORY_ACCESS_CAP_FLAG_CONCURRENT_ATOMIC)) {
357360 EXPECT_EQ (ZE_RESULT_ERROR_INVALID_ARGUMENT, result);
358361 } else {
359362 EXPECT_ZE_RESULT_SUCCESS (result);
360363 EXPECT_ZE_RESULT_SUCCESS (zeMemGetAtomicAccessAttributeExp (
361364 context, device, alloc_data, size, &access_type));
362365 EXPECT_EQ (ZE_MEMORY_ATOMIC_ATTR_EXP_FLAG_SYSTEM_ATOMICS, access_type);
363366 }
364- lzt::aligned_free (alloc_data);
367+ lzt::free_memory_with_allocator_selector (alloc_data, is_shared_system);
368+ }
369+
370+ LZT_TEST_F (AtomicAccessTests,
371+ SetAndGetPositiveAccessTypeWithSharedSystemAllocator) {
372+ SKIP_IF_SHARED_SYSTEM_ALLOC_UNSUPPORTED ();
373+ RunSetAndGetPositiveAccessTypeTest (true );
365374}
366375
367376} // namespace
0 commit comments