Skip to content

Commit 001fc36

Browse files
KerilkKerilk
committed
WIP: instance support.
1 parent c8c5295 commit 001fc36

File tree

11 files changed

+462
-34
lines changed

11 files changed

+462
-34
lines changed

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
)
175175
%REG% DELETE HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Release/OpenCLDriverStub.dll /f
176176
%REG% ADD HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Release/OpenCLDriverStubICD2.dll /t REG_DWORD /d 0
177-
%CTEST_EXE% -C Release --output-on-failure --parallel %NUMBER_OF_PROCESSORS% -R opencl_icd_loader_icd2_test
177+
%CTEST_EXE% -C Release --output-on-failure --parallel %NUMBER_OF_PROCESSORS% -R opencl_icd_loader_icd2_test^|opencl_icd_loader_icd2_instance_test
178178
if errorlevel 1 (
179179
exit /b %errorlevel%
180180
)
@@ -186,7 +186,7 @@ jobs:
186186
)
187187
%REG% DELETE HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Debug/OpenCLDriverStub.dll /f
188188
%REG% ADD HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Debug/OpenCLDriverStubICD2.dll /t REG_DWORD /d 0
189-
%CTEST_EXE% -C Debug --output-on-failure --parallel %NUMBER_OF_PROCESSORS% -R opencl_icd_loader_icd2_test
189+
%CTEST_EXE% -C Debug --output-on-failure --parallel %NUMBER_OF_PROCESSORS% -R opencl_icd_loader_icd2_test^|opencl_icd_loader_icd2_instance_test
190190
if errorlevel 1 (
191191
exit /b %errorlevel%
192192
)

‎include/cl_khr_icd2.h‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,51 @@ clIcdSetPlatformDispatchDataKHR_t(
3030
typedef clIcdSetPlatformDispatchDataKHR_t *
3131
clIcdSetPlatformDispatchDataKHR_fn;
3232
#endif // !defined(CL_ICD2_TAG_KHR)
33+
34+
#if !defined(CL_INVALID_INSTANCE_KHR)
35+
#define CL_INVALID_INSTANCE_KHR -1154
36+
37+
typedef struct _cl_instance *cl_instance;
38+
typedef cl_properties cl_instance_properties;
39+
40+
typedef cl_instance CL_API_CALL
41+
clCreateInstanceKHR_t(
42+
const cl_instance_properties *properties,
43+
cl_int *errcode_ret);
44+
45+
typedef clCreateInstanceKHR_t *
46+
clCreateInstanceKHR_fn;
47+
48+
typedef cl_int CL_API_CALL
49+
clDestroyInstanceKHR_t(
50+
cl_instance instance);
51+
52+
typedef clDestroyInstanceKHR_t *
53+
clDestroyInstanceKHR_fn;
54+
55+
typedef cl_int CL_API_CALL
56+
clGetPlatformIDsForInstanceKHR_t(
57+
cl_instance instance,
58+
cl_uint num_entries,
59+
cl_platform_id *platforms,
60+
cl_uint *num_platforms);
61+
62+
typedef clGetPlatformIDsForInstanceKHR_t *
63+
clGetPlatformIDsForInstanceKHR_fn;
64+
65+
typedef cl_platform_id CL_API_CALL
66+
clIcdCreateInstancePlatformKHR_t(
67+
cl_platform_id platform,
68+
cl_int *errcode_ret);
69+
70+
typedef clIcdCreateInstancePlatformKHR_t *
71+
clIcdCreateInstancePlatformKHR_fn;
72+
73+
typedef cl_int CL_API_CALL
74+
clIcdDestroyInstancePlatformKHR_t(
75+
cl_platform_id platform);
76+
77+
typedef clIcdDestroyInstancePlatformKHR_t *
78+
clIcdDestroyInstancePlatformKHR_fn;
79+
80+
#endif // !defined(CL_INVALID_INSTANCE_KHR)

‎loader/icd.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ void khrIcdVendorAdd(const char *libraryName)
5959
#if KHR_LOADER_MANAGED_DISPATCH
6060
clIcdGetFunctionAddressForPlatformKHR_fn p_clIcdGetFunctionAddressForPlatform = NULL;
6161
clIcdSetPlatformDispatchDataKHR_fn p_clIcdSetPlatformDispatchData = NULL;
62+
clIcdCreateInstancePlatformKHR_fn p_clIcdCreateInstancePlatform = NULL;
63+
clIcdDestroyInstancePlatformKHR_fn p_clIcdDestroyInstancePlatform = NULL;
6264
#endif
6365
cl_uint i = 0;
6466
cl_uint platformCount = 0;
@@ -110,6 +112,8 @@ void khrIcdVendorAdd(const char *libraryName)
110112
// try to get clIcdGetFunctionAddressForPlatformKHR and clIcdSetPlatformDispatchDataKHR to detect cl_khr_icd2 support
111113
p_clIcdGetFunctionAddressForPlatform = (clIcdGetFunctionAddressForPlatformKHR_fn)(size_t)p_clGetExtensionFunctionAddress("clIcdGetFunctionAddressForPlatformKHR");
112114
p_clIcdSetPlatformDispatchData = (clIcdSetPlatformDispatchDataKHR_fn)(size_t)p_clGetExtensionFunctionAddress("clIcdSetPlatformDispatchDataKHR");
115+
p_clIcdCreateInstancePlatform = (clIcdCreateInstancePlatformKHR_fn)(size_t)p_clGetExtensionFunctionAddress("clIcdCreateInstancePlatformKHR");
116+
p_clIcdDestroyInstancePlatform = (clIcdDestroyInstancePlatformKHR_fn)(size_t)p_clGetExtensionFunctionAddress("clIcdDestroyInstancePlatformKHR");
113117
#endif
114118

115119
// query the number of platforms available and allocate space to store them
@@ -175,6 +179,12 @@ void khrIcdVendorAdd(const char *libraryName)
175179
khrIcd2PopulateDispatchTable(platforms[i], p_clIcdGetFunctionAddressForPlatform, &vendor->dispData.dispatch);
176180
p_clIcdSetPlatformDispatchData(platforms[i], &vendor->dispData);
177181
KHR_ICD_TRACE("found icd 2 platform, using loader managed dispatch\n");
182+
if (p_clIcdCreateInstancePlatform && p_clIcdDestroyInstancePlatform)
183+
{
184+
vendor->clIcdSetPlatformDispatchData = p_clIcdSetPlatformDispatchData;
185+
vendor->clIcdCreateInstancePlatform = p_clIcdCreateInstancePlatform;
186+
vendor->clIcdDestroyInstancePlatform = p_clIcdDestroyInstancePlatform;
187+
}
178188
}
179189
#endif
180190

‎loader/icd.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,24 @@ struct KHRicdVendorRec
100100
#if KHR_LOADER_MANAGED_DISPATCH
101101
// the loader populated dispatch table for cl_khr_icd2 compliant platforms
102102
struct KHRDisp dispData;
103+
clIcdSetPlatformDispatchDataKHR_fn clIcdSetPlatformDispatchData;
104+
clIcdCreateInstancePlatformKHR_fn clIcdCreateInstancePlatform;
105+
clIcdDestroyInstancePlatformKHR_fn clIcdDestroyInstancePlatform;
103106
#endif
104107

105108
// next vendor in the list vendors
106109
KHRicdVendor *next;
107110
KHRicdVendor *prev;
108111
};
109112

113+
struct _cl_instance
114+
{
115+
cl_uint num_platforms;
116+
cl_platform_id *platforms;
117+
KHRicdVendor **vendors;
118+
struct KHRDisp *dispDatas;
119+
};
120+
110121
// the global state
111122
extern KHRicdVendor * khrIcdVendors;
112123

‎loader/icd_dispatch.c‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,153 @@ clGetICDLoaderInfoOCLICD(
6565
return CL_SUCCESS;
6666
}
6767

68+
#if KHR_LOADER_MANAGED_DISPATCH
69+
70+
static clCreateInstanceKHR_t clCreateInstanceKHR;
71+
cl_instance CL_API_CALL
72+
clCreateInstanceKHR(
73+
const cl_instance_properties *properties,
74+
cl_int *errcode_ret)
75+
{
76+
#define KHR_ICD_ALLOC_AND_ZERO(var, num, type) \
77+
do \
78+
{ \
79+
var = (type *)malloc(num * sizeof(type)); \
80+
if (!var) \
81+
{ \
82+
err = CL_OUT_OF_HOST_MEMORY; \
83+
goto error; \
84+
} \
85+
memset(var, 0, num * sizeof(type)); \
86+
} while (0)
87+
88+
(void) properties;
89+
cl_int err = CL_SUCCESS;
90+
cl_instance instance = NULL;
91+
cl_uint num_platforms = 0;
92+
93+
if (!khrIcdVendors)
94+
{
95+
err = CL_PLATFORM_NOT_FOUND_KHR;
96+
goto error;
97+
}
98+
99+
for (KHRicdVendor* vendor = khrIcdVendors; vendor; vendor = vendor->next)
100+
{
101+
if (vendor->clIcdCreateInstancePlatform)
102+
num_platforms++;
103+
}
104+
105+
KHR_ICD_ALLOC_AND_ZERO(instance, 1, struct _cl_instance);
106+
KHR_ICD_ALLOC_AND_ZERO(instance->platforms, num_platforms, cl_platform_id);
107+
KHR_ICD_ALLOC_AND_ZERO(instance->vendors, num_platforms, KHRicdVendor *);
108+
KHR_ICD_ALLOC_AND_ZERO(instance->dispDatas, num_platforms, struct KHRDisp);
109+
110+
num_platforms = 0;
111+
for (KHRicdVendor* vendor = khrIcdVendors; vendor; vendor = vendor->next)
112+
{
113+
if (vendor->clIcdCreateInstancePlatform)
114+
{
115+
cl_platform_id platform;
116+
platform = vendor->clIcdCreateInstancePlatform(vendor->platform, &err);
117+
if (CL_SUCCESS != err)
118+
continue;
119+
vendor->clIcdSetPlatformDispatchData(platform, instance->dispDatas + num_platforms);
120+
instance->platforms[num_platforms] = platform;
121+
instance->vendors[num_platforms] = vendor;
122+
memcpy(instance->dispDatas + num_platforms, &vendor->dispData, sizeof(struct KHRDisp));
123+
num_platforms++;
124+
}
125+
}
126+
127+
if (!num_platforms)
128+
{
129+
err = CL_PLATFORM_NOT_FOUND_KHR;
130+
goto error;
131+
}
132+
133+
instance->num_platforms = num_platforms;
134+
135+
if (errcode_ret)
136+
*errcode_ret = CL_SUCCESS;
137+
return instance;
138+
error:
139+
if (instance)
140+
{
141+
free(instance->dispDatas);
142+
free(instance->vendors);
143+
free(instance->platforms);
144+
free(instance);
145+
}
146+
if (errcode_ret)
147+
*errcode_ret = err;
148+
#undef KHR_ICD_ALLOC_AND_ZERO
149+
return NULL;
150+
}
151+
152+
static clDestroyInstanceKHR_t clDestroyInstanceKHR;
153+
cl_int CL_API_CALL
154+
clDestroyInstanceKHR(
155+
cl_instance instance)
156+
{
157+
KHR_ICD_VALIDATE_HANDLE_RETURN_ERROR(instance, CL_INVALID_INSTANCE_KHR);
158+
for (cl_uint i = 0; i < instance->num_platforms; i++)
159+
instance->vendors[i]->clIcdDestroyInstancePlatform(instance->platforms[i]);
160+
free(instance->dispDatas);
161+
free(instance->vendors);
162+
free(instance->platforms);
163+
free(instance);
164+
return CL_SUCCESS;
165+
}
166+
167+
static clGetPlatformIDsForInstanceKHR_t clGetPlatformIDsForInstanceKHR;
168+
cl_int CL_API_CALL
169+
clGetPlatformIDsForInstanceKHR(
170+
cl_instance instance,
171+
cl_uint num_entries,
172+
cl_platform_id* platforms,
173+
cl_uint* num_platforms)
174+
{
175+
cl_uint i;
176+
177+
KHR_ICD_VALIDATE_HANDLE_RETURN_ERROR(instance, CL_INVALID_INSTANCE_KHR);
178+
// should be impossible since create would have refused to
179+
// create an empty instance
180+
if (!instance->num_platforms)
181+
{
182+
return CL_INVALID_INSTANCE_KHR;
183+
}
184+
if (!num_entries && platforms)
185+
{
186+
return CL_INVALID_VALUE;
187+
}
188+
if (!platforms && !num_platforms)
189+
{
190+
return CL_INVALID_VALUE;
191+
}
192+
if (num_platforms)
193+
{
194+
*num_platforms = instance->num_platforms;
195+
}
196+
if (platforms)
197+
{
198+
for (i = 0; i < num_entries; ++i)
199+
{
200+
platforms[i] = NULL;
201+
}
202+
if (instance->num_platforms < num_entries)
203+
{
204+
num_entries = instance->num_platforms;
205+
}
206+
for (i = 0; i < num_entries; ++i)
207+
{
208+
platforms[i] = instance->platforms[i];
209+
}
210+
}
211+
return CL_SUCCESS;
212+
}
213+
#endif //KHR_LOADER_MANAGED_DISPATCH
214+
68215
static void* khrIcdGetExtensionFunctionAddress(const char* function_name)
69216
{
70217
// Most extensions, including multi-vendor KHR and EXT extensions,
@@ -139,6 +286,13 @@ static void* khrIcdGetExtensionFunctionAddress(const char* function_name)
139286
// cl_icdl
140287
KHR_ICD_CHECK_EXTENSION_FUNCTION(clGetICDLoaderInfoOCLICD);
141288

289+
#if KHR_LOADER_MANAGED_DISPATCH
290+
// cl_khr_instances
291+
KHR_ICD_CHECK_EXTENSION_FUNCTION(clCreateInstanceKHR);
292+
KHR_ICD_CHECK_EXTENSION_FUNCTION(clDestroyInstanceKHR);
293+
KHR_ICD_CHECK_EXTENSION_FUNCTION(clGetPlatformIDsForInstanceKHR);
294+
#endif
295+
142296
#undef KHR_ICD_CHECK_EXTENSION_FUNCTION
143297

144298
return NULL;

‎test/CMakeLists.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ add_test (
2222
NAME opencl_icd_loader_icd2_test
2323
COMMAND icd_loader_test
2424
)
25+
add_test (
26+
NAME opencl_icd_loader_icd2_instance_test
27+
COMMAND icd_loader_test
28+
)
2529

2630
if (ENABLE_OPENCL_LAYERINFO)
2731
add_test (
@@ -47,6 +51,13 @@ set_tests_properties(opencl_icd_loader_icd2_test
4751
ENVIRONMENT "OCL_ICD_FILENAMES=$<TARGET_FILE:OpenCLDriverStubICD2>;APP_LOG_FILE=icd_test_app_log_icd2.txt;APP_STUB_FILE=icd_test_stub_log_icd2.txt"
4852
WORKING_DIRECTORY "${TEST_WORKING_DIRECTORY}"
4953
)
54+
if (ENABLE_OPENCL_LOADER_MANAGED_DISPATCH)
55+
set_tests_properties(opencl_icd_loader_icd2_instance_test
56+
PROPERTIES
57+
ENVIRONMENT "OCL_ICD_FILENAMES=$<TARGET_FILE:OpenCLDriverStubICD2>;APP_LOG_FILE=icd_test_app_log_icd2_instance.txt;APP_STUB_FILE=icd_test_stub_log_icd2_instance.txt;USE_INSTANCE=1"
58+
WORKING_DIRECTORY "${TEST_WORKING_DIRECTORY}"
59+
)
60+
endif()
5061
if (ENABLE_OPENCL_LAYERINFO)
5162
set_tests_properties(cllayerinfo_test
5263
PROPERTIES

0 commit comments

Comments
 (0)