ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Change the name of the default device provided by the new registration framework (#2186)

Browse Source 
The code base uses a mix of 'device' and 'deviceID'. I suggest we
standardise on 'device' which is shorter and slightly more prevalent.

Contributes to #2181

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
Kévin Petit
2024-12-12 21:24:04 +00:00
committed by GitHub
parent 56d383b2e9
commit 5b7af4b36d
42 changed files with 174 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test_conformance/spirv_new/test_linkage.cpp
View File

@@ -80,13 +80,13 @@ static int test_linkage_compile(cl_device_id deviceID,
REGISTER_TEST(linkage_export_function_compile)
{
clProgramWrapper prog;
return test_linkage_compile(deviceID, context, queue, "linkage_export", prog);
return test_linkage_compile(device, context, queue, "linkage_export", prog);
}
REGISTER_TEST(linkage_import_function_compile)
{
clProgramWrapper prog;
return test_linkage_compile(deviceID, context, queue, "linkage_import", prog);
return test_linkage_compile(device, context, queue, "linkage_import", prog);
}
REGISTER_TEST(linkage_import_function_link)
@@ -94,16 +94,19 @@ REGISTER_TEST(linkage_import_function_link)
int err = 0;
clProgramWrapper prog_export;
err = test_linkage_compile(deviceID, context, queue, "linkage_export", prog_export);
err = test_linkage_compile(device, context, queue, "linkage_export",
prog_export);
SPIRV_CHECK_ERROR(err, "Failed to compile export program");
clProgramWrapper prog_import;
err = test_linkage_compile(deviceID, context, queue, "linkage_import", prog_import);
err = test_linkage_compile(device, context, queue, "linkage_import",
prog_import);
SPIRV_CHECK_ERROR(err, "Failed to compile import program");
cl_program progs[] = {prog_export, prog_import};
clProgramWrapper prog = clLinkProgram(context, 1, &deviceID, NULL, 2, progs, NULL, NULL, &err);
clProgramWrapper prog =
clLinkProgram(context, 1, &device, NULL, 2, progs, NULL, NULL, &err);
SPIRV_CHECK_ERROR(err, "Failed to link programs");
clKernelWrapper kernel = clCreateKernel(prog, "test_linkage", &err);
@@ -214,7 +217,7 @@ static int test_linkonce_odr_helper(cl_device_id deviceID, cl_context context,
REGISTER_TEST(linkage_linkonce_odr)
{
if (!is_extension_available(deviceID, "cl_khr_spirv_linkonce_odr"))
if (!is_extension_available(device, "cl_khr_spirv_linkonce_odr"))
{
log_info("Extension cl_khr_spirv_linkonce_odr not supported; skipping "
"tests.\n");
@@ -226,13 +229,13 @@ REGISTER_TEST(linkage_linkonce_odr)
// For this test, use the default main module, which has an "a" function
// with the linkonce_odr linkage type. This ensures that having two "a"
// functions with linkonce_odr works properly.
result |= test_linkonce_odr_helper(deviceID, context, queue,
result |= test_linkonce_odr_helper(device, context, queue,
"linkage_linkonce_odr_main");
// For this test, use a main module without the "a" function. This ensures
// that the "a" function is properly exported with the linkonce_odr linkage
// type.
result |= test_linkonce_odr_helper(deviceID, context, queue,
result |= test_linkonce_odr_helper(device, context, queue,
"linkage_linkonce_odr_noa_main");
return result;