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

define NOMINMAX in the CMakefile to fix std::min and std::max on MSVC (#1308)

Browse Source
This commit is contained in:
Ben Ashbaugh
2021-08-28 02:21:34 -07:00
committed by GitHub
parent 070f8c0c0e
commit 39fdb462be
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -115,6 +115,8 @@ endif()
if(MSVC) if(MSVC)
# Don't warn when using standard non-secure functions. # Don't warn when using standard non-secure functions.
add_compile_definitions(_CRT_SECURE_NO_WARNINGS) add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
# Fix std::min and std::max handling with windows.harness.
add_compile_definitions(NOMINMAX)
endif() endif()
if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" ) if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )

2
test_common/harness/kernelHelpers.cpp
View File

@@ -1707,7 +1707,7 @@ Version get_max_OpenCL_C_for_context(cl_context context)
else else
{ {
current_version = current_version =
(std::min)(device_version, current_version); std::min(device_version, current_version);
} }
}); });
return current_version; return current_version;

3
test_common/harness/os_helpers.cpp
View File

@@ -333,9 +333,6 @@ std::string exe_dir()
#include <windows.h> #include <windows.h>
#if defined(max)
#undef max
#endif
#include <cctype> #include <cctype>
#include <algorithm> #include <algorithm>

4
test_conformance/basic/test_async_copy2D.cpp
View File

@@ -203,13 +203,13 @@ int test_copy2D(cl_device_id deviceID, cl_context context,
/ (numElementsPerLine + srcStride); / (numElementsPerLine + srcStride);
size_t maxTotalLinesOut = (max_alloc_size / elementSize + dstStride) size_t maxTotalLinesOut = (max_alloc_size / elementSize + dstStride)
/ (numElementsPerLine + dstStride); / (numElementsPerLine + dstStride);
size_t maxTotalLines = (std::min)(maxTotalLinesIn, maxTotalLinesOut); size_t maxTotalLines = std::min(maxTotalLinesIn, maxTotalLinesOut);
size_t maxLocalWorkgroups = size_t maxLocalWorkgroups =
maxTotalLines / (localWorkgroupSize * lineCopiesPerWorkItem); maxTotalLines / (localWorkgroupSize * lineCopiesPerWorkItem);
size_t localBufferSize = localWorkgroupSize * localStorageSpacePerWorkitem size_t localBufferSize = localWorkgroupSize * localStorageSpacePerWorkitem
- (localIsDst ? dstStride : srcStride); - (localIsDst ? dstStride : srcStride);
size_t numberOfLocalWorkgroups = (std::min)(1111, (int)maxLocalWorkgroups); size_t numberOfLocalWorkgroups = std::min(1111, (int)maxLocalWorkgroups);
size_t totalLines = size_t totalLines =
numberOfLocalWorkgroups * localWorkgroupSize * lineCopiesPerWorkItem; numberOfLocalWorkgroups * localWorkgroupSize * lineCopiesPerWorkItem;
size_t inBufferSize = elementSize size_t inBufferSize = elementSize

4
test_conformance/basic/test_async_copy3D.cpp
View File

@@ -230,13 +230,13 @@ int test_copy3D(cl_device_id deviceID, cl_context context,
size_t maxTotalPlanesOut = ((max_alloc_size / elementSize) + dstPlaneStride) size_t maxTotalPlanesOut = ((max_alloc_size / elementSize) + dstPlaneStride)
/ ((numLines * numElementsPerLine + numLines * dstLineStride) / ((numLines * numElementsPerLine + numLines * dstLineStride)
+ dstPlaneStride); + dstPlaneStride);
size_t maxTotalPlanes = (std::min)(maxTotalPlanesIn, maxTotalPlanesOut); size_t maxTotalPlanes = std::min(maxTotalPlanesIn, maxTotalPlanesOut);
size_t maxLocalWorkgroups = size_t maxLocalWorkgroups =
maxTotalPlanes / (localWorkgroupSize * planesCopiesPerWorkItem); maxTotalPlanes / (localWorkgroupSize * planesCopiesPerWorkItem);
size_t localBufferSize = localWorkgroupSize * localStorageSpacePerWorkitem size_t localBufferSize = localWorkgroupSize * localStorageSpacePerWorkitem
- (localIsDst ? dstPlaneStride : srcPlaneStride); - (localIsDst ? dstPlaneStride : srcPlaneStride);
size_t numberOfLocalWorkgroups = (std::min)(1111, (int)maxLocalWorkgroups); size_t numberOfLocalWorkgroups = std::min(1111, (int)maxLocalWorkgroups);
size_t totalPlanes = size_t totalPlanes =
numberOfLocalWorkgroups * localWorkgroupSize * planesCopiesPerWorkItem; numberOfLocalWorkgroups * localWorkgroupSize * planesCopiesPerWorkItem;
size_t inBufferSize = elementSize size_t inBufferSize = elementSize

5
test_conformance/integer_ops/test_integer_dot_product.cpp
View File

@@ -14,11 +14,6 @@
// limitations under the License. // limitations under the License.
// //
// This is needed for std::numeric_limits<>::min() and max() to work on Windows.
#if defined(_WIN32)
#define NOMINMAX
#endif
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include <numeric> #include <numeric>