Merge from 'sycl' to 'sycl-web' (#1)

Author: iclsrc

sycl/doc/extensions/OrderedQueue/OrderedQueue.adoc

@@ -6,6 +6,8 @@ v0.2
 == Introduction
 This document presents an addition proposed for a future version of the SYCL Specification.  The goal of this proposal is to reduce the complexity and verbosity of using SYCL for programmers.
 
+NOTE: This proposal replaces the previous one that was based on a separate class for in-order queues.
+
 == Queue Order Properties
 Queues in SYCL are out-of-order by default.  SYCL constructs directed acyclic graphs to ensure tasks are properly ordered based on their data dependences.  However, many programs only require linear DAGs.  The overheads of constructing and managing DAGs are unnecessary for this class of program.  The `in_order` queue property is proposed to serve this class of programs by providing programmer-specified in-order semantics.  This property is used with the existing `property_list` mechanism that is part of the normal SYCL `queue`.  
 

sycl/doc/extensions/OrderedQueue/OrderedQueue_v2.adoc

@@ -241,6 +241,9 @@ void *aligned_alloc(size_t Alignment, size_t Size, const queue &Q, alloc Kind) {
 /// @param ptr is the USM pointer to query
 /// @param ctxt is the sycl context the ptr was allocated in
 alloc get_pointer_type(const void *Ptr, const context &Ctxt) {
+  if (!Ptr)
+    return alloc::unknown;
+
   // Everything on a host device is just system malloc so call it host
   if (Ctxt.is_host())
     return alloc::host;
@@ -251,8 +254,18 @@ alloc get_pointer_type(const void *Ptr, const context &Ctxt) {
 
   // query type using PI function
   const detail::plugin &Plugin = CtxImpl->getPlugin();
-  Plugin.call<detail::PiApiKind::piextUSMGetMemAllocInfo>(
-      PICtx, Ptr, PI_MEM_ALLOC_TYPE, sizeof(pi_usm_type), &AllocTy, nullptr);
+  RT::PiResult Err =
+      Plugin.call_nocheck<detail::PiApiKind::piextUSMGetMemAllocInfo>(
+          PICtx, Ptr, PI_MEM_ALLOC_TYPE, sizeof(pi_usm_type), &AllocTy,
+          nullptr);
+
+  // PI_INVALID_VALUE means USM doesn't know about this ptr
+  if (Err == PI_INVALID_VALUE)
+    return alloc::unknown;
+  // otherwise PI_SUCCESS is expected
+  if (Err != PI_SUCCESS) {
+    throw runtime_error("Error querying USM pointer: ", Err);
+  }
 
   alloc ResultAlloc;
   switch (AllocTy) {
@@ -278,6 +291,10 @@ alloc get_pointer_type(const void *Ptr, const context &Ctxt) {
 /// @param ptr is the USM pointer to query
 /// @param ctxt is the sycl context the ptr was allocated in
 device get_pointer_device(const void *Ptr, const context &Ctxt) {
+  // Check if ptr is a valid USM pointer
+  if (get_pointer_type(Ptr, Ctxt) == alloc::unknown)
+    throw runtime_error("Ptr not a valid USM allocation!");
+
   // Just return the host device in the host context
   if (Ctxt.is_host())
     return Ctxt.get_devices()[0];

sycl/doc/extensions/OrderedQueue/ordered_queue.h

@@ -92,5 +92,32 @@ int main() {
   }
   free(array, ctxt);
 
+  // Test invalid ptrs
+  Kind = get_pointer_type(nullptr, ctxt);
+  if (Kind != usm::alloc::unknown) {
+    return 11;
+  }
+
+  // next checks only valid for non-host contexts
+  array = (int*)malloc(N*sizeof(int));
+  Kind = get_pointer_type(array, ctxt);
+  if (!ctxt.is_host()) {
+    if (Kind != usm::alloc::unknown) {
+      return 12;
+    }
+    try {
+      D = get_pointer_device(array, ctxt);
+    } catch (runtime_error) {
+      return 0;
+    }
+    return 13;
+  } else {
+    // host ctxts always report host
+    if (Kind != usm::alloc::host) {
+      return 14;
+    }
+  }
+  free(array);
+
   return 0;
 }