Implement cl_khr_icd_unloadable proposal.

Author: Kerilk

loader/icd.c

@@ -84,7 +84,7 @@ void khrIcdVendorAdd(const char *libraryName)
     KHRicdVendor *vendorIterator = NULL;
 
     // require that the library name be valid
-    if (!libraryName) 
+    if (!libraryName)
     {
         goto Done;
     }
@@ -155,6 +155,8 @@ void khrIcdVendorAdd(const char *libraryName)
     for (i = 0; i < platformCount; ++i)
     {
         KHRicdVendor* vendor = NULL;
+        char *extensions;
+        size_t extensionsSize;
         char *suffix;
         size_t suffixSize;
 
@@ -201,15 +203,61 @@ void khrIcdVendorAdd(const char *libraryName)
         }
 #endif
 
-        // call clGetPlatformInfo on the returned platform to get the suffix
-
-        KHR_ICD2_DISPATCH(platforms[i])->clGetPlatformInfo(
+        // call clGetPlatformInfo on the returned platform to get the supported extensions
+        result = KHR_ICD2_DISPATCH(platforms[i])->clGetPlatformInfo(
             platforms[i],
-            CL_PLATFORM_UNLOADABLE_KHR,
-            sizeof(vendor->unloadable),
-            &vendor->unloadable,
+            CL_PLATFORM_EXTENSIONS,
+            0,
+            NULL,
+            &extensionsSize);
+        if (CL_SUCCESS != result)
+        {
+            free(vendor);
+            continue;
+        }
+        extensions = (char *)malloc(extensionsSize);
+        if (!extensions)
+        {
+            KHR_ICD_TRACE("failed to allocate memory\n");
+            free(vendor);
+            continue;
+        }
+        result = KHR_ICD2_DISPATCH(platforms[i])->clGetPlatformInfo(
+            platforms[i],
+            CL_PLATFORM_EXTENSIONS,
+            extensionsSize,
+            extensions,
             NULL);
+        if (CL_SUCCESS != result)
+        {
+            free(extensions);
+            free(vendor);
+            continue;
+        }
+
+        if (strstr(extensions, "cl_khr_icd_unloadable"))
+        {
+            KHR_ICD_TRACE("found cl_khr_icd_unloadable extension support\n");
+            free(extensions);
+            result = KHR_ICD2_DISPATCH(platforms[i])->clGetPlatformInfo(
+                platforms[i],
+                CL_PLATFORM_UNLOADABLE_KHR,
+                sizeof(vendor->unloadable),
+                &vendor->unloadable,
+                NULL);
+            if (vendor->unloadable)
+            {
+                KHR_ICD_TRACE("platform is unloadable\n");
+            }
+            if (CL_SUCCESS != result)
+            {
+                KHR_ICD_TRACE("found cl_khr_icd_unloadable but clGetPlatformInfo CL_PLATFORM_UNLOADABLE_KHR query failed\n");
+                free(vendor);
+                continue;
+            }
+        }
 
+        // call clGetPlatformInfo on the returned platform to get the suffix
         result = KHR_ICD2_DISPATCH(platforms[i])->clGetPlatformInfo(
             platforms[i],
             CL_PLATFORM_ICD_SUFFIX_KHR,
@@ -218,12 +266,14 @@ void khrIcdVendorAdd(const char *libraryName)
             &suffixSize);
         if (CL_SUCCESS != result)
         {
+            KHR_ICD_TRACE("failed query platform ICD suffix\n");
             free(vendor);
             continue;
         }
         suffix = (char *)malloc(suffixSize);
         if (!suffix)
         {
+            KHR_ICD_TRACE("failed to allocate memory\n");
             free(vendor);
             continue;
         }
@@ -232,17 +282,18 @@ void khrIcdVendorAdd(const char *libraryName)
             CL_PLATFORM_ICD_SUFFIX_KHR,
             suffixSize,
             suffix,
-            NULL);            
+            NULL);
         if (CL_SUCCESS != result)
         {
+            KHR_ICD_TRACE("failed query platform ICD suffix\n");
             free(suffix);
             free(vendor);
             continue;
         }
 
         // populate vendor data
         vendor->library = khrIcdOsLibraryLoad(libraryName);
-        if (!vendor->library) 
+        if (!vendor->library)
         {
             free(suffix);
             free(vendor);

test/driver_stub/cl.c

@@ -1968,7 +1968,7 @@ clIcdGetPlatformIDsKHR(cl_uint           num_entries,
 #else
         stub_platform->name = "ICD_LOADER_TEST_OPENCL_STUB";
 #endif
-        stub_platform->extensions = "cl_khr_icd cl_khr_gl cl_khr_d3d10";
+        stub_platform->extensions = "cl_khr_icd cl_khr_icd_unloadable cl_khr_gl cl_khr_d3d10";
         stub_platform->suffix = "ilts";
         initialized = CL_TRUE;
     }