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

conversions: restore optimization workaround

Browse Source 
The refactoring of the conversions test dropped the workaround added
by 59a12047a ("Fix for test_conversions failure with Clang build on
Linux #1057 (#1062)", 2021-05-11).

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2023-07-14 13:41:49 +01:00
parent b32d566bca
commit 19bddc90e4
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test_conformance/conversions/conversions_data_info.h
View File

@@ -408,7 +408,9 @@ void DataInfoSpec<InType, OutType>::conv(OutType *out, InType *in)
// always convert to +0.0 // always convert to +0.0
} }
#else #else
*out = (*in == 0 ? 0.0 : (OutType)*in); // Use volatile to prevent optimization by Clang compiler
volatile InType vi = *in;
*out = (vi == 0 ? 0.0 : static_cast<OutType>(vi));
#endif #endif
} }
else if (std::is_same<cl_float, OutType>::value) else if (std::is_same<cl_float, OutType>::value)
@@ -467,12 +469,21 @@ void DataInfoSpec<InType, OutType>::conv(OutType *out, InType *in)
else else
{ {
if (std::is_same<cl_float, OutType>::value) if (std::is_same<cl_float, OutType>::value)
*out = (*in == 0 ? 0.f : *in); // Per IEEE-754-2008 5.4.1, 0's {
// always convert to +0.0 // Use volatile to prevent optimization by Clang compiler
volatile InType vi = *in;
// Per IEEE-754-2008 5.4.1, 0 always converts to +0.0
*out = (vi == 0 ? 0.0f : vi);
}
else if (std::is_same<cl_double, OutType>::value) else if (std::is_same<cl_double, OutType>::value)
{
// Per IEEE-754-2008 5.4.1, 0 always converts to +0.0
*out = (*in == 0 ? 0.0 : *in); *out = (*in == 0 ? 0.0 : *in);
}
else else
{
*out = (OutType)*in; *out = (OutType)*in;
}
} }
} }