[SYCL] Implemented templated kernel_bundle::has_kernel functions (#8070)

Added missing template-based `has_kernel` functions in `kernel_bundle`.
Tried to make implementation align with existing
`kernel_bundle_plain`-based methods as possible.

Author: Andrew Lamzed-Short

sycl/include/sycl/kernel_bundle.hpp

@@ -36,6 +36,8 @@ namespace detail {
 class kernel_id_impl;
 }
 
+template <typename KernelName> kernel_id get_kernel_id();
+
 /// Objects of the class identify kernel is some kernel_bundle related APIs
 ///
 /// \ingroup sycl_api
@@ -236,6 +238,19 @@ class kernel_bundle : public detail::kernel_bundle_plain,
     return kernel_bundle_plain::has_kernel(KernelID, Dev);
   }
 
+  /// \returns true only if the kernel bundle contains the kernel identified by
+  /// KernelName.
+  template <typename KernelName> bool has_kernel() const noexcept {
+    return has_kernel(get_kernel_id<KernelName>());
+  }
+
+  /// \returns true only if the kernel bundle contains the kernel identified by
+  /// KernelName and if that kernel is compatible with the device Dev.
+  template <typename KernelName>
+  bool has_kernel(const device &Dev) const noexcept {
+    return has_kernel(get_kernel_id<KernelName>(), Dev);
+  }
+
   /// \returns a vector of kernel_id's that contained in the kernel_bundle
   std::vector<kernel_id> get_kernel_ids() const {
     return kernel_bundle_plain::get_kernel_ids();
@@ -355,6 +370,8 @@ __SYCL_EXPORT kernel_id get_kernel_id_impl(std::string KernelName);
 
 /// \returns the kernel_id associated with the KernelName
 template <typename KernelName> kernel_id get_kernel_id() {
+  // FIXME: This must fail at link-time if KernelName not in any available
+  // translation units.
   using KI = sycl::detail::KernelInfo<KernelName>;
   return detail::get_kernel_id_impl(KI::getName());
 }

sycl/unittests/SYCL2020/KernelID.cpp

@@ -264,7 +264,26 @@ TEST(KernelID, KernelIDHasKernel) {
   EXPECT_TRUE(InputBundle7.has_kernel(TestKernel3ID));
 }
 
-TEST(KernelID, InvalidKernelName) {
+TEST(KernelID, HasKernelTemplated) {
+  sycl::unittest::PiMock Mock;
+  sycl::platform Plt = Mock.getPlatform();
+
+  const sycl::device Dev = Plt.get_devices()[0];
+  sycl::context Ctx{Dev};
+  sycl::queue Queue{Ctx, Dev};
+
+  sycl::kernel_id TestKernel1ID = sycl::get_kernel_id<TestKernel1>();
+
+  std::vector<sycl::kernel_id> KernelIDs1 = {TestKernel1ID};
+  auto InputBundle1 =
+      sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, KernelIDs1);
+
+  EXPECT_TRUE(InputBundle1.has_kernel<TestKernel1>());
+  EXPECT_FALSE(InputBundle1.has_kernel<TestKernel2>());
+  EXPECT_TRUE(InputBundle1.has_kernel<TestKernel3>());
+}
+
+TEST(KernelID, GetKernelIDInvalidKernelName) {
   sycl::unittest::PiMock Mock;
   sycl::platform Plt = Mock.getPlatform();