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

remove min max macros (#1310)

Browse Source 
* remove the MIN and MAX macros and use the std versions instead

* fix formatting

* fix Arm build

* remove additional MIN and MAX macros from compat.h
This commit is contained in:
Ben Ashbaugh
2021-09-13 05:25:32 -07:00
committed by GitHub
parent 1f26e1d8ba
commit 02bf24d2b1
31 changed files with 241 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test_conformance/integer_ops/test_integers.cpp
View File

@@ -16,14 +16,9 @@
#include "testBase.h"
#include "harness/conversions.h"
#define TEST_SIZE 512
#include <algorithm>
#ifndef MIN
#define MIN( _a, _b ) ((_a) < (_b) ? (_a) : (_b))
#endif
#ifndef MAX
#define MAX( _a, _b ) ((_a) > (_b) ? (_a) : (_b))
#endif
#define TEST_SIZE 512
const char *singleParamIntegerKernelSourcePattern =
"__kernel void sample_test(__global %s *sourceA, __global %s *destValues)\n"
@@ -1512,19 +1507,20 @@ bool verify_integer_clamp( void *sourceA, void *sourceB, void *sourceC, void *de
switch( vecAType )
{
case kULong:
((cl_ulong*) destination)[0] = MAX(MIN(valueA, valueC), valueB);
((cl_ulong *)destination)[0] =
std::max(std::min(valueA, valueC), valueB);
break;
case kUInt:
((cl_uint*) destination)[0] = (cl_uint)
(MAX(MIN(valueA, valueC), valueB));
((cl_uint *)destination)[0] =
(cl_uint)(std::max(std::min(valueA, valueC), valueB));
break;
case kUShort:
((cl_ushort*) destination)[0] = (cl_ushort)
(MAX(MIN(valueA, valueC), valueB));
((cl_ushort *)destination)[0] =
(cl_ushort)(std::max(std::min(valueA, valueC), valueB));
break;
case kUChar:
((cl_uchar*) destination)[0] = (cl_uchar)
(MAX(MIN(valueA, valueC), valueB));
((cl_uchar *)destination)[0] =
(cl_uchar)(std::max(std::min(valueA, valueC), valueB));
break;
default:
//error -- should never get here
@@ -1576,19 +1572,20 @@ bool verify_integer_clamp( void *sourceA, void *sourceB, void *sourceC, void *de
switch( vecAType )
{
case kLong:
((cl_long*) destination)[0] = MAX(MIN(valueA, valueC), valueB);
((cl_long *)destination)[0] =
std::max(std::min(valueA, valueC), valueB);
break;
case kInt:
((cl_int*) destination)[0] = (cl_int)
(MAX(MIN(valueA, valueC), valueB));
((cl_int *)destination)[0] =
(cl_int)(std::max(std::min(valueA, valueC), valueB));
break;
case kShort:
((cl_short*) destination)[0] = (cl_short)
(MAX(MIN(valueA, valueC), valueB));
((cl_short *)destination)[0] =
(cl_short)(std::max(std::min(valueA, valueC), valueB));
break;
case kChar:
((cl_char*) destination)[0] = (cl_char)
(MAX(MIN(valueA, valueC), valueB));
((cl_char *)destination)[0] =
(cl_char)(std::max(std::min(valueA, valueC), valueB));
break;
default:
//error -- should never get here
@@ -1654,13 +1651,16 @@ bool verify_integer_mad_sat( void *sourceA, void *sourceB, void *sourceC, void *
((cl_ulong*) destination)[0] = multLo;
break;
case kUInt:
((cl_uint*) destination)[0] = (cl_uint) MIN( multLo, (cl_ulong) CL_UINT_MAX );
((cl_uint *)destination)[0] =
(cl_uint)std::min(multLo, (cl_ulong)CL_UINT_MAX);
break;
case kUShort:
((cl_ushort*) destination)[0] = (cl_ushort) MIN( multLo, (cl_ulong) CL_USHRT_MAX );
((cl_ushort *)destination)[0] =
(cl_ushort)std::min(multLo, (cl_ulong)CL_USHRT_MAX);
break;
case kUChar:
((cl_uchar*) destination)[0] = (cl_uchar) MIN( multLo, (cl_ulong) CL_UCHAR_MAX );
((cl_uchar *)destination)[0] =
(cl_uchar)std::min(multLo, (cl_ulong)CL_UCHAR_MAX);
break;
default:
//error -- should never get here
@@ -1744,18 +1744,18 @@ bool verify_integer_mad_sat( void *sourceA, void *sourceB, void *sourceC, void *
((cl_long*) destination)[0] = result;
break;
case kInt:
result = MIN( result, (cl_long) CL_INT_MAX );
result = MAX( result, (cl_long) CL_INT_MIN );
result = std::min(result, (cl_long)CL_INT_MAX);
result = std::max(result, (cl_long)CL_INT_MIN);
((cl_int*) destination)[0] = (cl_int) result;
break;
case kShort:
result = MIN( result, (cl_long) CL_SHRT_MAX );
result = MAX( result, (cl_long) CL_SHRT_MIN );
result = std::min(result, (cl_long)CL_SHRT_MAX);
result = std::max(result, (cl_long)CL_SHRT_MIN);
((cl_short*) destination)[0] = (cl_short) result;
break;
case kChar:
result = MIN( result, (cl_long) CL_CHAR_MAX );
result = MAX( result, (cl_long) CL_CHAR_MIN );
result = std::min(result, (cl_long)CL_CHAR_MAX);
result = std::max(result, (cl_long)CL_CHAR_MIN);
((cl_char*) destination)[0] = (cl_char) result;
break;
default: