@@ -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,8 +351,6 @@ LZT_TEST_F(AtomicAccessTests,
352351 context, device, alloc_data, size,
353352 ZE_MEMORY_ATOMIC_ATTR_EXP_FLAG_SYSTEM_ATOMICS);
354353
355- auto is_shared_system =
356- lzt::supports_shared_system_alloc (memory_access_properties);
357354 auto capabilities =
358355 is_shared_system
359356 ? memory_access_properties.sharedSystemAllocCapabilities
@@ -367,7 +364,13 @@ LZT_TEST_F(AtomicAccessTests,
367364 context, device, alloc_data, size, &access_type));
368365 EXPECT_EQ (ZE_MEMORY_ATOMIC_ATTR_EXP_FLAG_SYSTEM_ATOMICS, access_type);
369366 }
370- 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 );
371374}
372375
373376} // namespace
0 commit comments