fix and added some improvements for future tests

Author: dyniols

sycl/test-e2e/VirtualMem/basic_access_from_kernel_virtual_mem.cpp

@@ -6,26 +6,22 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/detail/core.hpp>
-#include <sycl/ext/oneapi/virtual_mem/physical_mem.hpp>
-#include <sycl/ext/oneapi/virtual_mem/virtual_mem.hpp>
-
-namespace syclext = sycl::ext::oneapi::experimental;
+#include "helpers.hpp"
 
 int main() {
   sycl::queue Q;
   sycl::context Context = Q.get_context();
+  sycl::device Device = Q.get_device();
   int Failed = 0;
   constexpr size_t NumberOfElements = 1000;
   size_t BytesRequired = NumberOfElements * sizeof(int);
 
-  size_t CtxGranularity = syclext::get_mem_granularity(
-      Context, syclext::granularity_mode::recommended);
+  size_t UsedGranularity = GetLCMGranularity(Device,Context);
 
   size_t AlignedByteSize =
-      ((BytesRequired + CtxGranularity - 1) / CtxGranularity) * CtxGranularity;
+      ((BytesRequired + UsedGranularity - 1) / UsedGranularity) * UsedGranularity;
 
-  syclext::physical_mem NewPhysicalMem{Q.get_device(), Context,
+  syclext::physical_mem NewPhysicalMem{Device, Context,
                                        AlignedByteSize};
   uintptr_t VirtualMemoryPtr =
       syclext::reserve_virtual_mem(0, AlignedByteSize, Context);

sycl/test-e2e/VirtualMem/helpers.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/virtual_mem/physical_mem.hpp>
+#include <sycl/ext/oneapi/virtual_mem/virtual_mem.hpp>
+
+namespace syclext = sycl::ext::oneapi::experimental;
+
+// Find the least common multiple of the context and device granularities. This
+// value can be used for aligning both physical memory allocations and for
+// reserving virtual memory ranges.
+size_t GetLCMGranularity(const sycl::device &Dev, const sycl::context &Ctx, syclext::granularity_mode Gm = syclext::granularity_mode::recommended) {
+  size_t CtxGranularity = syclext::get_mem_granularity(Ctx, Gm);
+  size_t DevGranularity = syclext::get_mem_granularity(Dev, Ctx, Gm);
+
+  size_t GCD = CtxGranularity;
+  size_t Rem = DevGranularity % GCD;
+  while (Rem != 0) {
+    std::swap(GCD, Rem);
+    Rem %= GCD;
+  }
+  return (DevGranularity / GCD) * CtxGranularity;
+}

sycl/test-e2e/VirtualMem/vector_with_virtual_mem.cpp

@@ -1,32 +1,13 @@
-// REQUIRES: aspect-ext_oneapi_virtual_mem, usm_shared_allocations
+// REQUIRES: aspect-ext_oneapi_virtual_mem, aspect-usm_shared_allocations
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/detail/core.hpp>
 #include <sycl/usm.hpp>
 
 #include <sycl/ext/oneapi/experimental/device_architecture.hpp>
-#include <sycl/ext/oneapi/virtual_mem/physical_mem.hpp>
-#include <sycl/ext/oneapi/virtual_mem/virtual_mem.hpp>
-
-namespace syclext = sycl::ext::oneapi::experimental;
-
-// Find the least common multiple of the context and device granularities. This
-// value can be used for aligning both physical memory allocations and for
-// reserving virtual memory ranges.
-size_t GetLCMGranularity(const sycl::device &Dev, const sycl::context &Ctx) {
-  size_t CtxGranularity = syclext::get_mem_granularity(MContext);
-  size_t DevGranularity = syclext::get_mem_granularity(MDevice, MContext);
-
-  size_t GCD = CtxGranularity;
-  size_t Rem = DevGranularity % GCD;
-  while (Rem != 0) {
-    std::swap(GCD, Rem);
-    Rem %= GCD;
-  }
-  return (DevGranularity / GCD) * LCMGranularity;
-}
+
+#include "helpers.hpp"
 
 template <typename T> class VirtualVector {
 public:
@@ -233,4 +214,4 @@ int main() {
   }
 
   return 0;
-}
+}