mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Fixes several compile issues I am seeing for my version of Visual Studio related to an ambiguous call to `fpclassify`, which is called by `isnan` and other similar functions, specifically for the `cl_half` type: ``` 19>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt\corecrt_math.h(401,1): error C2668: 'fpclassify': ambiguous call to overloaded function 19>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt\corecrt_math.h(298,31): message : could be 'int fpclassify(long double) throw()' 19>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt\corecrt_math.h(293,31): message : or 'int fpclassify(double) throw()' 19>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt\corecrt_math.h(288,31): message : or 'int fpclassify(float) throw()' 19>C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\ucrt\corecrt_math.h(401,1): message : while trying to match the argument list '(_Ty)' ``` Some of these issues seem like differences in compiler behavior, but at least one appears to have identified a legitimate bug. Specifically, this change: * Removes the special-case checks for finite half numbers for commonfns, since this is already handled by `UlpFn`. (test with: `test_commonfns degrees radians`) * Assigns to temporary variables to eliminate the ambiguous function call for relationals. (test with: `test_relationals relational*`) * Properly converts from half to float when checking for NaNs for select. This is the one that seems like a legitimate bug. (test with: `test_select select_half_ushort select_half_short`) * Uses `std::enable_if` to disambiguate a function call for spirv_new. (test with: `test_spirv_new decorate_saturated*`) If it's helpful, my specific Visual Studio version is: ``` Microsoft Visual Studio Professional 2019 Version 16.11.20 VisualStudio.16.Release/16.11.20+32929.386 ``` I also have the Windows Software Development Kit 10.0.19041.685 installed.
226 lines
6.0 KiB
C++
226 lines
6.0 KiB
C++
// Copyright (c) 2023 The Khronos Group Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
#ifndef TEST_COMMONFNS_BASE_H
|
|
#define TEST_COMMONFNS_BASE_H
|
|
|
|
#include <vector>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <cmath>
|
|
|
|
#include <CL/cl_half.h>
|
|
#include <CL/cl_ext.h>
|
|
|
|
#include "harness/conversions.h"
|
|
#include "harness/mt19937.h"
|
|
#include "harness/testHarness.h"
|
|
#include "harness/typeWrappers.h"
|
|
|
|
#define kVectorSizeCount 5
|
|
#define kStrangeVectorSizeCount 1
|
|
#define kTotalVecCount (kVectorSizeCount + kStrangeVectorSizeCount)
|
|
|
|
extern int g_arrVecSizes[kVectorSizeCount + kStrangeVectorSizeCount];
|
|
|
|
template <typename T>
|
|
using VerifyFuncBinary = int (*)(const T *const, const T *const, const T *const,
|
|
const int num, const int vs, const int vp);
|
|
|
|
template <typename T>
|
|
using VerifyFuncUnary = int (*)(const T *const, const T *const, const int num);
|
|
|
|
using half = cl_half;
|
|
|
|
struct BaseFunctionTest
|
|
{
|
|
BaseFunctionTest(cl_device_id device, cl_context context,
|
|
cl_command_queue queue, int num_elems, const char *fn,
|
|
bool vsp)
|
|
: device(device), context(context), queue(queue), num_elems(num_elems),
|
|
fnName(fn), vecParam(vsp)
|
|
{}
|
|
|
|
// Test body returning an OpenCL error code
|
|
virtual cl_int Run() = 0;
|
|
|
|
cl_device_id device;
|
|
cl_context context;
|
|
cl_command_queue queue;
|
|
|
|
int num_elems;
|
|
std::string fnName;
|
|
bool vecParam;
|
|
|
|
static std::map<size_t, std::string> type2name;
|
|
static cl_half_rounding_mode halfRoundingMode;
|
|
};
|
|
|
|
struct MinTest : BaseFunctionTest
|
|
{
|
|
MinTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct MaxTest : BaseFunctionTest
|
|
{
|
|
MaxTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct ClampTest : BaseFunctionTest
|
|
{
|
|
ClampTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct DegreesTest : BaseFunctionTest
|
|
{
|
|
DegreesTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct RadiansTest : BaseFunctionTest
|
|
{
|
|
RadiansTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct SignTest : BaseFunctionTest
|
|
{
|
|
SignTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct SmoothstepTest : BaseFunctionTest
|
|
{
|
|
SmoothstepTest(cl_device_id device, cl_context context,
|
|
cl_command_queue queue, int num_elems, const char *fn,
|
|
bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct StepTest : BaseFunctionTest
|
|
{
|
|
StepTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
struct MixTest : BaseFunctionTest
|
|
{
|
|
MixTest(cl_device_id device, cl_context context, cl_command_queue queue,
|
|
int num_elems, const char *fn, bool vsp)
|
|
: BaseFunctionTest(device, context, queue, num_elems, fn, vsp)
|
|
{}
|
|
|
|
cl_int Run() override;
|
|
};
|
|
|
|
template <typename T> inline double conv_to_dbl(const T &val)
|
|
{
|
|
if (std::is_same<T, half>::value)
|
|
return (double)cl_half_to_float(val);
|
|
else
|
|
return (double)val;
|
|
}
|
|
|
|
template <typename T> inline double conv_to_flt(const T &val)
|
|
{
|
|
if (std::is_same<T, half>::value)
|
|
return (float)cl_half_to_float(val);
|
|
else
|
|
return (float)val;
|
|
}
|
|
|
|
template <typename T> inline half conv_to_half(const T &val)
|
|
{
|
|
if (std::is_floating_point<T>::value)
|
|
return cl_half_from_float(val, BaseFunctionTest::halfRoundingMode);
|
|
return 0;
|
|
}
|
|
|
|
template <typename T> float UlpFn(const T &val, const double &r)
|
|
{
|
|
if (std::is_same<T, half>::value)
|
|
{
|
|
if (conv_to_half(r) == val)
|
|
{
|
|
return 0.0f;
|
|
}
|
|
|
|
return Ulp_Error_Half(val, r);
|
|
}
|
|
else if (std::is_same<T, float>::value)
|
|
{
|
|
return Ulp_Error(val, r);
|
|
}
|
|
else if (std::is_same<T, double>::value)
|
|
{
|
|
return Ulp_Error_Double(val, r);
|
|
}
|
|
else
|
|
{
|
|
log_error("UlpFn: unsupported data type\n");
|
|
}
|
|
|
|
return -1.f; // wrong val
|
|
}
|
|
|
|
template <class T>
|
|
int MakeAndRunTest(cl_device_id device, cl_context context,
|
|
cl_command_queue queue, int num_elements,
|
|
const char *fn = "", bool vsp = false)
|
|
{
|
|
auto test_fixture = T(device, context, queue, num_elements, fn, vsp);
|
|
|
|
cl_int error = test_fixture.Run();
|
|
test_error_ret(error, "Test Failed", TEST_FAIL);
|
|
|
|
return TEST_PASS;
|
|
}
|
|
|
|
#endif // TEST_COMMONFNS_BASE_H
|