Skip to content

Do not use default platform unless it is explicitly set #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fhazubski-Intel wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −11
Open

Do not use default platform unless it is explicitly set #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocl_icd_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ getDefaultPlatformID() {
int num_default_platform;
char *end_scan;
if (! default_platform) {
num_default_platform = 0;
break;
} else {
num_default_platform = strtol(default_platform, &end_scan, 10);
if (*default_platform == '\0' || *end_scan != '\0') {
Expand Down
20 changes: 10 additions & 10 deletions tests/testsuite-default-platform.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ AT_CLEANUP

AT_SETUP([No choice, among 1 => default platform])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/.libs/libdummycl.so])
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
[OCL_ICD_VENDORS],[$abs_top_builddir/.libs/libdummycl.so],
[OCL_ICD_DEFAULT_PLATFORM],[0])
AT_CHECK([ocl_test --default-platform], 0, [stdout], [stderr])
AT_CHECK([cat stdout], 0,
[Found 1 platforms!
Expand Down Expand Up @@ -73,8 +73,8 @@ AT_CLEANUP
AT_SETUP([No choice, among 2 => one platform])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors])
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0])
AT_CHECK([ocl_test --default-platform], 0, [stdout], [stderr])
dnl platforms can be listed in any order
AT_CHECK([env LC_ALL=C sort -u stdout], 0,
Expand Down Expand Up @@ -128,14 +128,14 @@ AT_SETUP([Sort by GPU])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0],
[NB_GPU], [31],
[NB_GPU2], [3],
[NB_CPU], [3],
[NB_CPU2], [31],
[NB_ALL], [3],
[NB_ALL2], [31]
)
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
AT_CHECK([ocl_test --default-platform], 0,
[Found 2 platforms!
ocl-icd ICD test
Expand All @@ -148,14 +148,14 @@ AT_SETUP([Sort by GPU (rev)])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0],
[NB_GPU], [3],
[NB_GPU2], [31],
[NB_CPU], [3],
[NB_CPU2], [31],
[NB_ALL], [3],
[NB_ALL2], [31]
)
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
AT_CHECK([ocl_test --default-platform], 0,
[Found 2 platforms!
ocl-icd ICD test2
Expand All @@ -168,14 +168,14 @@ AT_SETUP([Sort by CPU])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0],
[NB_GPU], [3],
[NB_GPU2], [3],
[NB_CPU], [31],
[NB_CPU2], [3],
[NB_ALL], [3],
[NB_ALL2], [31]
)
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
AT_CHECK([ocl_test --default-platform], 0,
[Found 2 platforms!
ocl-icd ICD test
Expand All @@ -188,14 +188,14 @@ AT_SETUP([Sort by CPU (rev)])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0],
[NB_GPU], [3],
[NB_GPU2], [3],
[NB_CPU], [3],
[NB_CPU2], [31],
[NB_ALL], [3],
[NB_ALL2], [31]
)
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
AT_CHECK([ocl_test --default-platform], 0,
[Found 2 platforms!
ocl-icd ICD test2
Expand All @@ -208,14 +208,14 @@ AT_SETUP([Sort by devices])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0],
[NB_GPU], [3],
[NB_GPU2], [3],
[NB_CPU], [31],
[NB_CPU2], [31],
[NB_ALL], [31],
[NB_ALL2], [3]
)
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
AT_CHECK([ocl_test --default-platform], 0,
[Found 2 platforms!
ocl-icd ICD test
Expand All @@ -228,14 +228,14 @@ AT_SETUP([Sort by devices (rev)])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors],
[OCL_ICD_DEFAULT_PLATFORM],[0],
[NB_GPU], [3],
[NB_GPU2], [3],
[NB_CPU], [3],
[NB_CPU2], [3],
[NB_ALL], [3],
[NB_ALL2], [31]
)
AT_UNSET([OCL_ICD_DEFAULT_PLATFORM])
AT_CHECK([ocl_test --default-platform], 0,
[Found 2 platforms!
ocl-icd ICD test2
Expand Down