Add test of explicit OoO, style changes, and deprecated attr

Signed-off-by: James Brodman <[email protected]>

Author: jbrodman

sycl/include/CL/sycl/ordered_queue.hpp

@@ -26,46 +26,56 @@ class context;
 class device;
 class ordered_queue {
 public:
+  [[deprecated("Replaced by the in_order property in queue")]]
   explicit ordered_queue(const property_list &propList = {})
       : ordered_queue(default_selector(), async_handler{}, propList) {}
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const async_handler &asyncHandler,
                 const property_list &propList = {})
       : ordered_queue(default_selector(), asyncHandler, propList) {}
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const device_selector &deviceSelector,
                 const property_list &propList = {})
       : ordered_queue(deviceSelector.select_device(), async_handler{},
                       propList) {}
-
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const device_selector &deviceSelector,
                 const async_handler &asyncHandler,
                 const property_list &propList = {})
       : ordered_queue(deviceSelector.select_device(), asyncHandler, propList) {}
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const device &syclDevice, const property_list &propList = {})
       : ordered_queue(syclDevice, async_handler{}, propList) {}
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const device &syclDevice, const async_handler &asyncHandler,
                 const property_list &propList = {});
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const context &syclContext,
                 const device_selector &deviceSelector,
                 const property_list &propList = {})
       : ordered_queue(syclContext, deviceSelector,
                       detail::getSyclObjImpl(syclContext)->get_async_handler(),
                       propList) {}
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const context &syclContext,
                 const device_selector &deviceSelector,
                 const async_handler &asyncHandler,
                 const property_list &propList = {});
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(cl_command_queue cl_Queue, const context &syclContext,
                 const async_handler &asyncHandler = {});
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(const ordered_queue &rhs) = default;
 
+  [[deprecated("Replaced by the in_order property in queue")]]
   ordered_queue(ordered_queue &&rhs) = default;
 
   ordered_queue &operator=(const ordered_queue &rhs) = default;

sycl/source/queue.cpp

@@ -19,9 +19,8 @@ namespace detail {
 QueueOrder getQueueOrder(const property_list &propList) {
   if (propList.has_property<property::queue::in_order>()) {
     return QueueOrder::Ordered;
-  } else {
-    return QueueOrder::OOO;
   }
+  return QueueOrder::OOO;
 }
 
 } // namespace detail

sycl/test/ordered_queue/prop.cpp

@@ -0,0 +1,44 @@
+// RUN: %clangxx -fsycl %s -o %t1.out -lOpenCL
+// RUN: %CPU_RUN_PLACEHOLDER %t1.out
+// RUN: %GPU_RUN_PLACEHOLDER %t1.out
+
+//==----------- ordered_dmemll.cpp - Device Memory Linked List test --------==//
+// It uses an ordered queue where explicit waiting is not necessary between
+// kernels
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+constexpr int numNodes = 4;
+
+bool getQueueOrder(cl_command_queue cq) {
+  cl_command_queue_properties reportedProps;
+  cl_int iRet = clGetCommandQueueInfo(
+      cq, CL_QUEUE_PROPERTIES, sizeof(reportedProps), &reportedProps, nullptr);
+  assert(CL_SUCCESS == iRet && "Failed to obtain queue info from ocl device");
+  return (reportedProps & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE) ? true
+                                                                  : false;
+}
+
+int main() {
+  queue q{property::queue::out_of_order()};
+  auto dev = q.get_device();
+  
+  cl_command_queue cq = q.get(); 
+  bool expected_result = dev.is_host() ? true : getQueueOrder(cq);
+  if (!expected_result) {
+    std::cout << "Resulting queue order is in order but expected order is OOO"
+              << std::endl;
+
+    return -1;
+  }
+
+  return 0;
+}