From dd2454685b8417e4f2ca7d4ac8cf19f3d803bff9 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Tue, 29 Oct 2024 17:37:51 +0100 Subject: [PATCH] [NFC] math_brute_force: use getAllowedUlpError for half (#2086) Call `getAllowedUlpError` to obtain the allowed ULP error for all of the half type (fp16) tests. The aim is to standardise obtaining the desired ULP requirement and pave the way for adding the Embedded Profile ULP errors. Contributes to https://github.com/KhronosGroup/OpenCL-CTS/issues/867 Contributes to https://github.com/KhronosGroup/OpenCL-CTS/issues/1685 Signed-off-by: Sven van Haastregt --- test_conformance/math_brute_force/binary_half.cpp | 2 +- test_conformance/math_brute_force/binary_i_half.cpp | 2 +- test_conformance/math_brute_force/binary_operator_half.cpp | 2 +- test_conformance/math_brute_force/binary_two_results_i_half.cpp | 2 +- test_conformance/math_brute_force/ternary_half.cpp | 2 +- test_conformance/math_brute_force/unary_half.cpp | 2 +- test_conformance/math_brute_force/unary_two_results_half.cpp | 2 +- test_conformance/math_brute_force/unary_two_results_i_half.cpp | 2 +- test_conformance/math_brute_force/unary_u_half.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test_conformance/math_brute_force/binary_half.cpp b/test_conformance/math_brute_force/binary_half.cpp index 897bd6e7..180034ba 100644 --- a/test_conformance/math_brute_force/binary_half.cpp +++ b/test_conformance/math_brute_force/binary_half.cpp @@ -653,7 +653,7 @@ int TestFunc_Half_Half_Half_common(const Func *f, MTdata d, int isNextafter, } test_info.f = f; - test_info.ulps = f->half_ulps; + test_info.ulps = getAllowedUlpError(f, khalf, relaxedMode); test_info.ftz = f->ftz || gForceFTZ || 0 == (CL_FP_DENORM & gHalfCapabilities); diff --git a/test_conformance/math_brute_force/binary_i_half.cpp b/test_conformance/math_brute_force/binary_i_half.cpp index 2d6e827f..0f167fc9 100644 --- a/test_conformance/math_brute_force/binary_i_half.cpp +++ b/test_conformance/math_brute_force/binary_i_half.cpp @@ -427,7 +427,7 @@ int TestFunc_Half_Half_Int(const Func *f, MTdata d, bool relaxedMode) } test_info.f = f; - test_info.ulps = f->half_ulps; + test_info.ulps = getAllowedUlpError(f, khalf, relaxedMode); test_info.ftz = f->ftz || gForceFTZ || 0 == (CL_FP_DENORM & gHalfCapabilities); diff --git a/test_conformance/math_brute_force/binary_operator_half.cpp b/test_conformance/math_brute_force/binary_operator_half.cpp index 366e63e8..b4abf490 100644 --- a/test_conformance/math_brute_force/binary_operator_half.cpp +++ b/test_conformance/math_brute_force/binary_operator_half.cpp @@ -564,7 +564,7 @@ int TestFunc_Half_Half_Half_Operator(const Func *f, MTdata d, bool relaxedMode) } test_info.f = f; - test_info.ulps = f->half_ulps; + test_info.ulps = getAllowedUlpError(f, khalf, relaxedMode); test_info.ftz = f->ftz || gForceFTZ || 0 == (CL_FP_DENORM & gHalfCapabilities); diff --git a/test_conformance/math_brute_force/binary_two_results_i_half.cpp b/test_conformance/math_brute_force/binary_two_results_i_half.cpp index 924551c7..3c3ef71a 100644 --- a/test_conformance/math_brute_force/binary_two_results_i_half.cpp +++ b/test_conformance/math_brute_force/binary_two_results_i_half.cpp @@ -91,7 +91,7 @@ int TestFunc_HalfI_Half_Half(const Func *f, MTdata d, bool relaxedMode) cl_uint threadCount = GetThreadCount(); - float half_ulps = f->half_ulps; + float half_ulps = getAllowedUlpError(f, khalf, relaxedMode); int testingRemquo = !strcmp(f->name, "remquo"); diff --git a/test_conformance/math_brute_force/ternary_half.cpp b/test_conformance/math_brute_force/ternary_half.cpp index 339506da..856fa67d 100644 --- a/test_conformance/math_brute_force/ternary_half.cpp +++ b/test_conformance/math_brute_force/ternary_half.cpp @@ -80,7 +80,7 @@ int TestFunc_Half_Half_Half_Half(const Func *f, MTdata d, bool relaxedMode) constexpr size_t bufferElements = BUFFER_SIZE / sizeof(cl_half); std::vector overflow(bufferElements); - float half_ulps = f->half_ulps; + float half_ulps = getAllowedUlpError(f, khalf, relaxedMode); int skipNanInf = (0 == strcmp("fma", f->nameInCode)); logFunctionInfo(f->name, sizeof(cl_half), relaxedMode); diff --git a/test_conformance/math_brute_force/unary_half.cpp b/test_conformance/math_brute_force/unary_half.cpp index 7af16e73..83cdd01f 100644 --- a/test_conformance/math_brute_force/unary_half.cpp +++ b/test_conformance/math_brute_force/unary_half.cpp @@ -362,7 +362,7 @@ int TestFunc_Half_Half(const Func *f, MTdata d, bool relaxedMode) } test_info.f = f; - test_info.ulps = f->half_ulps; + test_info.ulps = getAllowedUlpError(f, khalf, relaxedMode); test_info.ftz = f->ftz || gForceFTZ || 0 == (CL_FP_DENORM & gHalfCapabilities); diff --git a/test_conformance/math_brute_force/unary_two_results_half.cpp b/test_conformance/math_brute_force/unary_two_results_half.cpp index 7593191c..2bf35142 100644 --- a/test_conformance/math_brute_force/unary_two_results_half.cpp +++ b/test_conformance/math_brute_force/unary_two_results_half.cpp @@ -61,7 +61,7 @@ int TestFunc_Half2_Half(const Func *f, MTdata d, bool relaxedMode) logFunctionInfo(f->name, sizeof(cl_half), relaxedMode); - float half_ulps = f->half_ulps; + float half_ulps = getAllowedUlpError(f, khalf, relaxedMode); // Init the kernels BuildKernelInfo build_info{ 1, kernels, programs, f->nameInCode }; diff --git a/test_conformance/math_brute_force/unary_two_results_i_half.cpp b/test_conformance/math_brute_force/unary_two_results_i_half.cpp index df404b8a..7b3431ab 100644 --- a/test_conformance/math_brute_force/unary_two_results_i_half.cpp +++ b/test_conformance/math_brute_force/unary_two_results_i_half.cpp @@ -71,7 +71,7 @@ int TestFunc_HalfI_Half(const Func *f, MTdata d, bool relaxedMode) logFunctionInfo(f->name, sizeof(cl_half), relaxedMode); - float half_ulps = f->half_ulps; + float half_ulps = getAllowedUlpError(f, khalf, relaxedMode); maxiError = half_ulps == INFINITY ? CL_ULONG_MAX : 0; diff --git a/test_conformance/math_brute_force/unary_u_half.cpp b/test_conformance/math_brute_force/unary_u_half.cpp index c9eef431..2970403f 100644 --- a/test_conformance/math_brute_force/unary_u_half.cpp +++ b/test_conformance/math_brute_force/unary_u_half.cpp @@ -54,7 +54,7 @@ int TestFunc_Half_UShort(const Func *f, MTdata d, bool relaxedMode) size_t bufferSize = bufferElements * sizeof(cl_half); logFunctionInfo(f->name, sizeof(cl_half), relaxedMode); const char *name = f->name; - float half_ulps = f->half_ulps; + float half_ulps = getAllowedUlpError(f, khalf, relaxedMode); // Init the kernels BuildKernelInfo build_info = { 1, kernels, programs, f->nameInCode };