[SYCL] aspect_selector implementation (#7068)

This implements the SYCL 2020 `aspect_selector`, with the
aspect_selector returning a SYCL2020 Callable device selector.

Derived from original work at #5696 .
Tests here: intel/llvm-test-suite#1327

Author: cperkinsintel

sycl/include/sycl/device_selector.hpp

@@ -11,6 +11,8 @@
 #include <sycl/detail/defines.hpp>
 #include <sycl/detail/export.hpp>
 
+#include <vector>
+
 // 4.6.1 Device selection class
 
 namespace sycl {
@@ -117,6 +119,17 @@ static constexpr int REJECT_DEVICE_SCORE = -1;
 
 using DSelectorInvocableType = std::function<int(const sycl::device &)>;
 
+template <typename LastT>
+void fill_aspect_vector(std::vector<aspect> &V, LastT L) {
+  V.emplace_back(L);
+}
+
+template <typename FirstT, typename... OtherTs>
+void fill_aspect_vector(std::vector<aspect> &V, FirstT F, OtherTs... O) {
+  V.emplace_back(F);
+  fill_aspect_vector(V, O...);
+}
+
 #if __cplusplus >= 201703L
 
 // Enable if DeviceSelector callable has matching signature, but
@@ -136,6 +149,27 @@ select_device(const DSelectorInvocableType &DeviceSelectorInvocable);
 __SYCL_EXPORT device
 select_device(const DSelectorInvocableType &DeviceSelectorInvocable,
               const context &SyclContext);
+
 } // namespace detail
+
+__SYCL_EXPORT detail::DSelectorInvocableType
+aspect_selector(const std::vector<aspect> &RequireList,
+                const std::vector<aspect> &DenyList = {});
+
+template <typename... AspectListT>
+detail::DSelectorInvocableType aspect_selector(AspectListT... AspectList) {
+  std::vector<aspect> RequireList;
+  RequireList.reserve(sizeof...(AspectList));
+
+  detail::fill_aspect_vector(RequireList, AspectList...);
+
+  return aspect_selector(RequireList, {});
+}
+
+template <aspect... AspectList>
+detail::DSelectorInvocableType aspect_selector() {
+  return aspect_selector({AspectList...}, {});
+}
+
 } // __SYCL_INLINE_VER_NAMESPACE(_V1)
 } // namespace sycl

sycl/source/device_selector.cpp

@@ -247,6 +247,31 @@ int host_selector::operator()(const device &dev) const {
   return detail::REJECT_DEVICE_SCORE;
 }
 
+__SYCL_EXPORT detail::DSelectorInvocableType
+aspect_selector(const std::vector<aspect> &RequireList,
+                const std::vector<aspect> &DenyList /* ={} */) {
+  return [=](const sycl::device &Dev) {
+    auto DevHas = [&](const aspect &Asp) -> bool { return Dev.has(Asp); };
+
+    // All aspects from require list are required.
+    if (!std::all_of(RequireList.begin(), RequireList.end(), DevHas))
+      return detail::REJECT_DEVICE_SCORE;
+
+    // No aspect from deny list is allowed
+    if (std::any_of(DenyList.begin(), DenyList.end(), DevHas))
+      return detail::REJECT_DEVICE_SCORE;
+
+    if (RequireList.size() > 0) {
+      return 1000 + detail::getDevicePreference(Dev);
+    } else {
+      // No required aspects specified.
+      // SYCL 2020 4.6.1.1 "If no aspects are passed in, the generated selector
+      // behaves like default_selector."
+      return default_selector_v(Dev);
+    }
+  };
+}
+
 // -------------- SYCL 1.2.1
 
 // SYCL 1.2.1 device_selector class and sub-classes

sycl/test/abi/sycl_symbols_linux.dump

@@ -3634,6 +3634,7 @@ _ZN4sycl3_V114exception_list8PushBackEONSt15__exception_ptr13exception_ptrE
 _ZN4sycl3_V114exception_list8PushBackERKNSt15__exception_ptr13exception_ptrE
 _ZN4sycl3_V114get_kernel_idsEv
 _ZN4sycl3_V114gpu_selector_vERKNS0_6deviceE
+_ZN4sycl3_V115aspect_selectorERKSt6vectorINS0_6aspectESaIS2_EES6_
 _ZN4sycl3_V115make_error_codeENS0_4errcE
 _ZN4sycl3_V116get_pointer_typeEPKvRKNS0_7contextE
 _ZN4sycl3_V118aligned_alloc_hostEmmRKNS0_5queueERKNS0_13property_listERKNS0_6detail13code_locationE

sycl/test/abi/sycl_symbols_windows.dump

@@ -412,7 +412,9 @@
 ??0gpu_selector@_V1@sycl@@QEAA@$$QEAV012@@Z
 ??0gpu_selector@_V1@sycl@@QEAA@AEBV012@@Z
 ??0gpu_selector@_V1@sycl@@QEAA@XZ
+??0half@host_half_impl@detail@_V1@sycl@@QEAA@$$QEAV01234@@Z
 ??0half@host_half_impl@detail@_V1@sycl@@QEAA@AEBM@Z
+??0half@host_half_impl@detail@_V1@sycl@@QEAA@AEBV01234@@Z
 ??0half@host_half_impl@detail@_V1@sycl@@QEAA@G@Z
 ??0handler@_V1@sycl@@AEAA@V?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@00_N@Z
 ??0handler@_V1@sycl@@AEAA@V?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@_N@Z
@@ -708,6 +710,7 @@
 ?allocateMemBuffer@MemoryManager@detail@_V1@sycl@@SAPEAXV?$shared_ptr@Vcontext_impl@detail@_V1@sycl@@@std@@PEAVSYCLMemObjI@234@PEAX_N_KAEBV?$shared_ptr@Vevent_impl@detail@_V1@sycl@@@6@AEBV56@AEBVproperty_list@34@AEAPEAU_pi_event@@@Z
 ?allocateMemImage@MemoryManager@detail@_V1@sycl@@SAPEAXV?$shared_ptr@Vcontext_impl@detail@_V1@sycl@@@std@@PEAVSYCLMemObjI@234@PEAX_N_KAEBU_pi_image_desc@@AEBU_pi_image_format@@AEBV?$shared_ptr@Vevent_impl@detail@_V1@sycl@@@6@AEBV56@AEBVproperty_list@34@AEAPEAU_pi_event@@@Z
 ?allocateMemSubBuffer@MemoryManager@detail@_V1@sycl@@SAPEAXV?$shared_ptr@Vcontext_impl@detail@_V1@sycl@@@std@@PEAX_K2V?$range@$02@34@V?$vector@V?$shared_ptr@Vevent_impl@detail@_V1@sycl@@@std@@V?$allocator@V?$shared_ptr@Vevent_impl@detail@_V1@sycl@@@std@@@2@@6@AEAPEAU_pi_event@@@Z
+?aspect_selector@_V1@sycl@@YA?AV?$function@$$A6AHAEBVdevice@_V1@sycl@@@Z@std@@AEBV?$vector@W4aspect@_V1@sycl@@V?$allocator@W4aspect@_V1@sycl@@@std@@@4@0@Z
 ?assertion@pi@detail@_V1@sycl@@YAX_NPEBD@Z
 ?associateWithHandler@detail@_V1@sycl@@YAXAEAVhandler@23@PEAVAccessorBaseHost@123@W4target@access@23@@Z
 ?associateWithHandler@handler@_V1@sycl@@AEAAXPEAVAccessorBaseHost@detail@23@W4target@access@23@@Z