Merge pull request #2357 from npmiller/hip-program-info

[HIP] Fix error code for unsupported program info

Author: kbenzie

source/adapters/cuda/program.cpp

@@ -176,17 +176,6 @@ ur_result_t ur_program_handle_t_::getGlobalVariablePointer(
   return UR_RESULT_SUCCESS;
 }
 
-/// Finds kernel names by searching for entry points in the PTX source, as the
-/// CUDA driver API doesn't expose an operation for this.
-/// Note: This is currently only being used by the SYCL program class for the
-///       has_kernel method, so an alternative would be to move the has_kernel
-///       query to UR and use cuModuleGetFunction to check for a kernel.
-/// Note: Another alternative is to add kernel names as metadata, like with
-///       reqd_work_group_size.
-ur_result_t getKernelNames(ur_program_handle_t) {
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
 /// Loads images from a list of PTX or CUBIN binaries.
 /// Note: No calls to CUDA driver API in this function, only store binaries
 /// for later.
@@ -421,8 +410,9 @@ urProgramGetInfo(ur_program_handle_t hProgram, ur_program_info_t propName,
   case UR_PROGRAM_INFO_BINARIES:
     return ReturnValue(&hProgram->Binary, 1);
   case UR_PROGRAM_INFO_KERNEL_NAMES:
-    /* TODO: Add implementation for getKernelNames */
-    UR_ASSERT(getKernelNames(hProgram), UR_RESULT_ERROR_UNSUPPORTED_FEATURE);
+    // CUDA has no way to query a list of kernels from a binary.
+    // In SYCL this is only used in kernel bundle when building from source
+    // which isn't currently supported for CUDA.
     return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
   case UR_PROGRAM_INFO_NUM_KERNELS:
   case UR_PROGRAM_INFO_IL:

source/adapters/hip/program.cpp

@@ -259,15 +259,6 @@ ur_result_t ur_program_handle_t_::getGlobalVariablePointer(
   return UR_RESULT_SUCCESS;
 }
 
-/// Finds kernel names by searching for entry points in the PTX source, as the
-/// HIP driver API doesn't expose an operation for this.
-/// Note: This is currently only being used by the SYCL program class for the
-///       has_kernel method, so an alternative would be to move the has_kernel
-///       query to UR and use hipModuleGetFunction to check for a kernel.
-ur_result_t getKernelNames(ur_program_handle_t) {
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
 /// A program must be specific to a device so this entry point is UNSUPPORTED
 UR_APIEXPORT ur_result_t UR_APICALL
 urProgramCreateWithIL(ur_context_handle_t, const void *, size_t,
@@ -408,7 +399,11 @@ urProgramGetInfo(ur_program_handle_t hProgram, ur_program_info_t propName,
   case UR_PROGRAM_INFO_BINARIES:
     return ReturnValue(&hProgram->Binary, 1);
   case UR_PROGRAM_INFO_KERNEL_NAMES:
-    return getKernelNames(hProgram);
+    // HIP has no way to query a list of kernels from a binary.
+    // In SYCL this is only used in kernel bundle when building from source
+    // which isn't currently supported for HIP.
+    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
+  case UR_PROGRAM_INFO_NUM_KERNELS:
   case UR_PROGRAM_INFO_IL:
     return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
   default:

test/conformance/program/program_adapter_hip.match

@@ -1,9 +1,6 @@
 urProgramBuildTest.BuildFailure/*
 # HIP hasn't implemented urProgramCreateWithNativeHandleTest
 {{OPT}}urProgramCreateWithNativeHandleTest.Success/*
-# HIP doesn't expose kernel numbers or names
-urProgramGetInfoTest.Success/*__UR_PROGRAM_INFO_NUM_KERNELS
-urProgramGetInfoTest.Success/*__UR_PROGRAM_INFO_KERNEL_NAMES
 
 # HIP hasn't implemented urProgramLink
 {{OPT}}urProgramLinkTest.Success/*