[SYCL] Make the mock plugin report cl_khr_il_program as supported (#6823)

To make build-log tests not depend on the binary type, this commit makes
the mock plugin report that the cl_khr_il_program is supported. Together
with adding PI_DEVICE_INFO_NAME to mock_piDeviceGetInfo, the
corresponding redefinition from the build-log tests can be removed.

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/unittests/helpers/PiMockPlugin.hpp

@@ -91,7 +91,9 @@ inline pi_result mock_piDeviceGetInfo(pi_device device,
                                       size_t param_value_size,
                                       void *param_value,
                                       size_t *param_value_size_ret) {
-  constexpr char MockSupportedExtensions[] = "cl_khr_fp64 cl_khr_fp16";
+  constexpr char MockDeviceName[] = "Mock device";
+  constexpr char MockSupportedExtensions[] =
+      "cl_khr_fp64 cl_khr_fp16 cl_khr_il_program";
   switch (param_name) {
   case PI_DEVICE_INFO_TYPE: {
     // Act like any device is a GPU.
@@ -102,6 +104,15 @@ inline pi_result mock_piDeviceGetInfo(pi_device device,
       *param_value_size_ret = sizeof(PI_DEVICE_TYPE_GPU);
     return PI_SUCCESS;
   }
+  case PI_DEVICE_INFO_NAME: {
+    if (param_value) {
+      assert(param_value_size == sizeof(MockDeviceName));
+      std::memcpy(param_value, MockDeviceName, sizeof(MockDeviceName));
+    }
+    if (param_value_size_ret)
+      *param_value_size_ret = sizeof(MockDeviceName);
+    return PI_SUCCESS;
+  }
   case PI_DEVICE_INFO_PARENT_DEVICE: {
     if (param_value)
       *static_cast<pi_device **>(param_value) = nullptr;

sycl/unittests/program_manager/BuildLog.cpp

@@ -47,37 +47,9 @@ static pi_result redefinedProgramGetBuildInfo(
   return PI_SUCCESS;
 }
 
-static pi_result redefinedDeviceGetInfo(pi_device device,
-                                        pi_device_info param_name,
-                                        size_t param_value_size,
-                                        void *param_value,
-                                        size_t *param_value_size_ret) {
-  if (param_name == PI_DEVICE_INFO_NAME) {
-    const std::string name = "Test Device";
-    if (param_value_size_ret) {
-      *param_value_size_ret = name.size();
-    }
-    if (param_value) {
-      auto *val = static_cast<char *>(param_value);
-      strcpy(val, name.data());
-    }
-  }
-  if (param_name == PI_DEVICE_INFO_COMPILER_AVAILABLE) {
-    if (param_value_size_ret) {
-      *param_value_size_ret = sizeof(cl_bool);
-    }
-    if (param_value) {
-      auto *val = static_cast<cl_bool *>(param_value);
-      *val = 1;
-    }
-  }
-  return PI_SUCCESS;
-}
-
 static void setupCommonTestAPIs(sycl::unittest::PiMock &Mock) {
   using namespace sycl::detail;
   Mock.redefine<PiApiKind::piProgramGetBuildInfo>(redefinedProgramGetBuildInfo);
-  Mock.redefine<PiApiKind::piDeviceGetInfo>(redefinedDeviceGetInfo);
 }
 
 TEST(BuildLog, OutputNothingOnLevel1) {