ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-26 08:49:02 +00:00
Code Packages Projects Releases Wiki Activity

Use Version type for cl_khr_spir extension version checks (#953)

Browse Source 
* Use Version type for cl_khr_spir extension version checks

The current method of using `std::find(versions, 1.2f)` is unreliable due to
performing a floating point comparison.  I.e. on some compiles it will
spuriously report that the required version is missing and skip the tests.

* Address clang-format failure.

* Correct typo.
This commit is contained in:
Alastair Murray
2020-09-22 21:49:13 +01:00
committed by GitHub
parent 61cfb505ae
commit 1a3e19c37e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test_conformance/spir/main.cpp
View File

@@ -141,7 +141,8 @@ static bool is_dir_exits(const char* path)
return false; return false;
} }
static void get_spir_version(cl_device_id device, std::vector<float>& versions) static void get_spir_version(cl_device_id device,
std::vector<Version> &versions)
{ {
char version[64] = {0}; char version[64] = {0};
cl_int err; cl_int err;
@@ -162,11 +163,11 @@ static void get_spir_version(cl_device_id device, std::vector<float>& versions)
std::copy(std::istream_iterator<std::string>(versionStream), std::copy(std::istream_iterator<std::string>(versionStream),
std::istream_iterator<std::string>(), std::istream_iterator<std::string>(),
std::back_inserter(versionVector)); std::back_inserter(versionVector));
for(std::list<std::string>::const_iterator it = versionVector.begin(), for (auto &v : versionVector)
e = versionVector.end(); it != e;
it++)
{ {
versions.push_back(atof(it->c_str())); auto major = v[v.find('.') - 1];
auto minor = v[v.find('.') + 1];
versions.push_back(Version{ major - '0', minor - '0' });
} }
} }
@@ -6929,10 +6930,12 @@ int main (int argc, const char* argv[])
cl_device_id device = get_platform_device(device_type, choosen_device_index, choosen_platform_index); cl_device_id device = get_platform_device(device_type, choosen_device_index, choosen_platform_index);
printDeviceHeader(device); printDeviceHeader(device);
std::vector<float> versions; std::vector<Version> versions;
get_spir_version(device, versions); get_spir_version(device, versions);
if (!is_extension_available( device, "cl_khr_spir") ||
std::find(versions.begin(), versions.end(), 1.2f) == versions.end()) if (!is_extension_available(device, "cl_khr_spir")
|| (std::find(versions.begin(), versions.end(), Version{ 1, 2 })
== versions.end()))
{ {
log_info("Spir extension version 1.2 is not supported by the device\n"); log_info("Spir extension version 1.2 is not supported by the device\n");
return 0; return 0;