Merge from 'sycl' to 'sycl-web' (2 commits)

Author: iclsrc

sycl/doc/extensions/proposed/sycl_ext_oneapi_device_is_integrated_gpu.asciidoc

@@ -0,0 +1,110 @@
+= sycl_ext_oneapi_device_is_integrated_gpu
+
+:source-highlighter: coderay
+:coderay-linenums-mode: table
+
+// This section needs to be after the document title.
+:doctype: book
+:toc2:
+:toc: left
+:encoding: utf-8
+:lang: en
+:dpcpp: pass:[DPC++]
+:endnote: —{nbsp}end{nbsp}note
+
+// Set the default source code type in this document to C++,
+// for syntax highlighting purposes.  This is needed because
+// docbook uses c++ and html5 uses cpp.
+:language: {basebackend@docbook:c++:cpp}
+
+
+== Notice
+
+[%hardbreaks]
+Copyright (C) 2025 Intel Corporation.  All rights reserved.
+
+Khronos(R) is a registered trademark and SYCL(TM) and SPIR(TM) are trademarks
+of The Khronos Group Inc.  OpenCL(TM) is a trademark of Apple Inc. used by
+permission by Khronos.
+
+
+== Contact
+
+To report problems with this extension, please open a new issue at:
+
+https://github.com/intel/llvm/issues
+
+
+== Dependencies
+
+This extension is written against the SYCL 2020 revision 10 specification.
+All references below to the "core SYCL specification" or to section numbers in
+the SYCL specification refer to that revision.
+
+
+== Status
+
+This is a proposed extension specification, intended to gather community
+feedback.  Interfaces defined in this specification may not be implemented yet
+or may be in a preliminary state.  The specification itself may also change in
+incompatible ways before it is finalized.  *Shipping software products should
+not rely on APIs defined in this specification.*
+
+
+== Overview
+
+This extension allows host code to check whether a SYCL GPU device is "integrated"
+or "discrete". An integrated GPU device often shares memory with the host CPU,
+while a discrete GPU is often a separate card with its own memory. However, some
+GPU devices may not fit neatly into either category, so implementors may provide
+their own judgement when categorizing a GPU device as "integrated" vs. "discrete".
+
+
+== Specification
+
+=== Feature test macro
+
+This extension provides a feature-test macro as described in the core SYCL
+specification. An implementation supporting this extension must predefine the
+macro `SYCL_EXT_ONEAPI_DEVICE_IS_INTEGRATED_GPU` to one of the values defined
+in the implementation supports this feature, or applications can test the
+macro's value to determine which of the extension's features the implementation
+supports.
+
+[%header,cols="1,5"]
+|===
+|Value
+|Description
+
+|1
+|The APIs of this experimental extension are not versioned, so the feature-test
+ macro always has this value.
+|===
+
+=== New device aspect
+
+This extension adds new device aspect:
+
+```c++
+namespace sycl {
+
+enum class aspect : /*unspecified*/ {
+  ext_oneapi_is_integrated_gpu
+};
+
+} // namespace sycl
+```
+
+[width="100%",%header,cols="50%,50%"]
+|===
+|Aspect
+|Description
+
+|`ext_oneapi_is_integrated_gpu`
+|Indicates that the implementation identifies this device as integrated GPU. All devices
+that have this aspect also have `aspect::gpu`.
+|===
+
+== Issues
+
+None.

sycl/unittests/helpers/CommandSubmitWrappers.hpp

@@ -10,6 +10,7 @@
 
 #include <sycl/event.hpp>
 #include <sycl/handler.hpp>
+#include <sycl/queue.hpp>
 
 namespace sycl {
 

sycl/unittests/queue/Barrier.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <helpers/CommandSubmitWrappers.hpp>
 #include <helpers/TestKernel.hpp>
 #include <helpers/UrMock.hpp>
 #include <sycl/sycl.hpp>
@@ -15,6 +16,8 @@
 static unsigned NumOfEventsWaitWithBarrierCalls = 0;
 static unsigned NumEventsInWaitList = 0;
 
+class Queue : public testing::TestWithParam<bool> {};
+
 static ur_result_t redefined_urEnqueueEventsWaitWithBarrierExt(void *pParams) {
   NumOfEventsWaitWithBarrierCalls++;
   // Get the number of events in the wait list
@@ -25,92 +28,111 @@ static ur_result_t redefined_urEnqueueEventsWaitWithBarrierExt(void *pParams) {
   return UR_RESULT_SUCCESS;
 }
 
-TEST(Queue, HandlerBarrier) {
+TEST_P(Queue, HandlerBarrier) {
   sycl::unittest::UrMock<> Mock;
   mock::getCallbacks().set_before_callback(
       "urEnqueueEventsWaitWithBarrierExt",
       &redefined_urEnqueueEventsWaitWithBarrierExt);
   NumOfEventsWaitWithBarrierCalls = 0;
+  bool UseShortcutFunction = GetParam();
 
   sycl::queue Q;
 
-  Q.submit([&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
-  Q.submit([&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
+  sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction, Q,
+                                                  [=]() {});
+  sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction, Q,
+                                                  [=]() {});
 
   Q.submit([&](sycl::handler &cgh) { cgh.ext_oneapi_barrier(); });
 
   ASSERT_EQ(NumOfEventsWaitWithBarrierCalls, 1u);
 }
 
-TEST(Queue, ExtOneAPISubmitBarrier) {
+TEST_P(Queue, ExtOneAPISubmitBarrier) {
   sycl::unittest::UrMock<> Mock;
   mock::getCallbacks().set_before_callback(
       "urEnqueueEventsWaitWithBarrierExt",
       &redefined_urEnqueueEventsWaitWithBarrierExt);
   NumOfEventsWaitWithBarrierCalls = 0;
+  bool UseShortcutFunction = GetParam();
 
   sycl::queue Q;
 
-  Q.submit([&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
-  Q.submit([&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
+  sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction, Q,
+                                                  [=]() {});
+  sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction, Q,
+                                                  [=]() {});
 
   Q.ext_oneapi_submit_barrier();
 
   ASSERT_EQ(NumOfEventsWaitWithBarrierCalls, 1u);
 }
 
-TEST(Queue, HandlerBarrierWithWaitList) {
+TEST_P(Queue, HandlerBarrierWithWaitList) {
   sycl::unittest::UrMock<> Mock;
   mock::getCallbacks().set_before_callback(
       "urEnqueueEventsWaitWithBarrierExt",
       &redefined_urEnqueueEventsWaitWithBarrierExt);
   NumOfEventsWaitWithBarrierCalls = 0;
+  bool UseShortcutFunction = GetParam();
 
   sycl::queue Q1;
   sycl::queue Q2;
   sycl::queue Q3;
 
-  auto E1 = Q1.submit(
-      [&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
-  auto E2 = Q2.submit(
-      [&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
+  auto E1 = sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction,
+                                                            Q1, [=]() {});
+  auto E2 = sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction,
+                                                            Q2, [=]() {});
 
   Q3.submit([&](sycl::handler &cgh) { cgh.ext_oneapi_barrier({E1, E2}); });
 
   ASSERT_EQ(NumOfEventsWaitWithBarrierCalls, 1u);
 }
 
-TEST(Queue, ExtOneAPISubmitBarrierWithWaitList) {
+TEST_P(Queue, ExtOneAPISubmitBarrierWithWaitList) {
   sycl::unittest::UrMock<> Mock;
   mock::getCallbacks().set_before_callback(
       "urEnqueueEventsWaitWithBarrierExt",
       &redefined_urEnqueueEventsWaitWithBarrierExt);
   NumOfEventsWaitWithBarrierCalls = 0;
+  bool UseShortcutFunction = GetParam();
 
   sycl::queue Q1;
   sycl::queue Q2;
   sycl::queue Q3;
 
-  auto E1 = Q1.submit(
-      [&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
-  auto E2 = Q2.submit(
-      [&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
+  auto E1 = sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction,
+                                                            Q1, [=]() {});
+  auto E2 = sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction,
+                                                            Q2, [=]() {});
 
   Q3.ext_oneapi_submit_barrier({E1, E2});
 
   ASSERT_EQ(NumOfEventsWaitWithBarrierCalls, 1u);
 }
 
-TEST(Queue, BarrierWithBarrierDep) {
+TEST_P(Queue, BarrierWithBarrierDep) {
   sycl::unittest::UrMock<> Mock;
   mock::getCallbacks().set_before_callback(
       "urEnqueueEventsWaitWithBarrierExt",
       &redefined_urEnqueueEventsWaitWithBarrierExt);
+  bool UseShortcutFunction = GetParam();
+
   sycl::queue Q1(sycl::property::queue::in_order{});
   sycl::queue Q2(sycl::property::queue::in_order{});
-  Q1.submit([&](sycl::handler &cgh) { cgh.single_task<TestKernel>([=]() {}); });
+
+  sycl::unittest::single_task_wrapper<TestKernel>(UseShortcutFunction, Q1,
+                                                  [=]() {});
+
   sycl::event Barrier1 = Q1.ext_oneapi_submit_barrier();
   NumEventsInWaitList = 0;
   Q2.ext_oneapi_submit_barrier({Barrier1});
   ASSERT_EQ(NumEventsInWaitList, 1u);
 }
+
+INSTANTIATE_TEST_SUITE_P(
+    QueueTestInstance, Queue,
+    testing::Values(
+        true,
+        false)); /* Whether to use the shortcut command submission function */