Remove dead code in math_brute_force (#1117)
* Remove dead code
Signed-off-by: Marco Antognini <marco.antognini@arm.com>
* Remove tautological statements
PARALLEL_REFERENCE is unconditionally defined. Remove preprocessor
condition that always hold.
Signed-off-by: Marco Antognini <marco.antognini@arm.com>
* Remove unnecessary declarations
Also removed unused macro.
Signed-off-by: Marco Antognini <marco.antognini@arm.com>
* Format code
An unnecessary scope was removed. This formats the code using
clang-format.
Signed-off-by: Marco Antognini <marco.antognini@arm.com>
diff --git a/test_conformance/math_brute_force/binary_two_results_i.cpp b/test_conformance/math_brute_force/binary_two_results_i.cpp
index 5065b28..1130e93 100644
--- a/test_conformance/math_brute_force/binary_two_results_i.cpp
+++ b/test_conformance/math_brute_force/binary_two_results_i.cpp
@@ -19,8 +19,6 @@
#include <string.h>
#include "FunctionList.h"
-#define PARALLEL_REFERENCE
-
int TestFunc_FloatI_Float_Float(const Func *f, MTdata, bool relaxedMode);
int TestFunc_DoubleI_Double_Double(const Func *f, MTdata, bool relaxedMode);
@@ -248,7 +246,6 @@
info->programs + i, info->relaxedMode);
}
-#if defined PARALLEL_REFERENCE
typedef struct ComputeReferenceInfoF_
{
const float *x;
@@ -315,8 +312,6 @@
return CL_SUCCESS;
}
-#endif
-
int TestFunc_FloatI_Float_Float(const Func *f, MTdata d, bool relaxedMode)
{
uint64_t i;
@@ -333,9 +328,7 @@
size_t bufferSize = (gWimpyMode) ? gWimpyBufferSize : BUFFER_SIZE;
uint64_t step = getTestStep(sizeof(float), bufferSize);
-#if defined PARALLEL_REFERENCE
cl_uint threadCount = GetThreadCount();
-#endif
logFunctionInfo(f->name, sizeof(cl_float), relaxedMode);
if (gIsEmbedded)
@@ -354,11 +347,6 @@
&build_info)))
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -457,7 +445,6 @@
float *s = (float *)gIn;
float *s2 = (float *)gIn2;
-#if defined PARALLEL_REFERENCE
if (threadCount > 1)
{
ComputeReferenceInfoF cri;
@@ -472,14 +459,11 @@
}
else
{
-#endif
float *r = (float *)gOut_Ref;
int *r2 = (int *)gOut_Ref2;
for (j = 0; j < bufferSize / sizeof(float); j++)
r[j] = (float)f->func.f_ffpI(s[j], s2[j], r2 + j);
-#if defined PARALLEL_REFERENCE
}
-#endif
// Read the data back
for (j = gMinVectorSizeIndex; j < gMaxVectorSizeIndex; j++)
@@ -848,9 +832,7 @@
logFunctionInfo(f->name, sizeof(cl_double), relaxedMode);
-#if defined PARALLEL_REFERENCE
cl_uint threadCount = GetThreadCount();
-#endif
Force64BitFPUPrecision();
@@ -867,11 +849,6 @@
return error;
}
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels +
- i, programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -970,7 +947,6 @@
double *s = (double *)gIn;
double *s2 = (double *)gIn2;
-#if defined PARALLEL_REFERENCE
if (threadCount > 1)
{
ComputeReferenceInfoD cri;
@@ -985,14 +961,11 @@
}
else
{
-#endif
double *r = (double *)gOut_Ref;
int *r2 = (int *)gOut_Ref2;
for (j = 0; j < bufferSize / sizeof(double); j++)
r[j] = (double)f->dfunc.f_ffpI(s[j], s2[j], r2 + j);
-#if defined PARALLEL_REFERENCE
}
-#endif
// Read the data back
for (j = gMinVectorSizeIndex; j < gMaxVectorSizeIndex; j++)
@@ -1034,180 +1007,164 @@
&& t2[j] == q2[j])
continue;
- // if( t[j] != q[j] || t2[j] != q2[j] )
+ double test = ((double *)q)[j];
+ int correct2 = INT_MIN;
+ long double correct = f->dfunc.f_ffpI(s[j], s2[j], &correct2);
+ float err = Bruteforce_Ulp_Error_Double(test, correct);
+ int64_t iErr;
+
+ // in case of remquo, we only care about the sign and last
+ // seven bits of integer as per the spec.
+ if (testingRemquo)
+ iErr = (long long)(q2[j] & 0x0000007f)
+ - (long long)(correct2 & 0x0000007f);
+ else
+ iErr = (long long)q2[j] - (long long)correct2;
+
+ // For remquo, if y = 0, x is infinite, or either is NaN
+ // then the standard either neglects to say what is returned
+ // in iptr or leaves it undefined or implementation defined.
+ int iptrUndefined = fabs(((double *)gIn)[j]) == INFINITY
+ || ((double *)gIn2)[j] == 0.0 || isnan(((double *)gIn2)[j])
+ || isnan(((double *)gIn)[j]);
+ if (iptrUndefined) iErr = 0;
+
+ int fail = !(fabsf(err) <= f->double_ulps && iErr == 0);
+ if (ftz && fail)
{
- double test = ((double *)q)[j];
- int correct2 = INT_MIN;
- long double correct =
- f->dfunc.f_ffpI(s[j], s2[j], &correct2);
- float err = Bruteforce_Ulp_Error_Double(test, correct);
- int64_t iErr;
-
- // in case of remquo, we only care about the sign and last
- // seven bits of integer as per the spec.
- if (testingRemquo)
- iErr = (long long)(q2[j] & 0x0000007f)
- - (long long)(correct2 & 0x0000007f);
- else
- iErr = (long long)q2[j] - (long long)correct2;
-
- // For remquo, if y = 0, x is infinite, or either is NaN
- // then the standard either neglects to say what is returned
- // in iptr or leaves it undefined or implementation defined.
- int iptrUndefined = fabs(((double *)gIn)[j]) == INFINITY
- || ((double *)gIn2)[j] == 0.0
- || isnan(((double *)gIn2)[j])
- || isnan(((double *)gIn)[j]);
- if (iptrUndefined) iErr = 0;
-
- int fail = !(fabsf(err) <= f->double_ulps && iErr == 0);
- if (ftz && fail)
+ // retry per section 6.5.3.2
+ if (IsDoubleResultSubnormal(correct, f->double_ulps))
{
- // retry per section 6.5.3.2
- if (IsDoubleResultSubnormal(correct, f->double_ulps))
+ fail = fail && !(test == 0.0f && iErr == 0);
+ if (!fail) err = 0.0f;
+ }
+
+ // retry per section 6.5.3.3
+ if (IsDoubleSubnormal(s[j]))
+ {
+ int correct3i, correct4i;
+ long double correct3 =
+ f->dfunc.f_ffpI(0.0, s2[j], &correct3i);
+ long double correct4 =
+ f->dfunc.f_ffpI(-0.0, s2[j], &correct4i);
+ float err2 =
+ Bruteforce_Ulp_Error_Double(test, correct3);
+ float err3 =
+ Bruteforce_Ulp_Error_Double(test, correct4);
+ int64_t iErr3 = (long long)q2[j] - (long long)correct3i;
+ int64_t iErr4 = (long long)q2[j] - (long long)correct4i;
+ fail = fail
+ && ((!(fabsf(err2) <= f->double_ulps && iErr3 == 0))
+ && (!(fabsf(err3) <= f->double_ulps
+ && iErr4 == 0)));
+ if (fabsf(err2) < fabsf(err)) err = err2;
+ if (fabsf(err3) < fabsf(err)) err = err3;
+ if (llabs(iErr3) < llabs(iErr)) iErr = iErr3;
+ if (llabs(iErr4) < llabs(iErr)) iErr = iErr4;
+
+ // retry per section 6.5.3.4
+ if (IsDoubleResultSubnormal(correct2, f->double_ulps)
+ || IsDoubleResultSubnormal(correct3,
+ f->double_ulps))
{
- fail = fail && !(test == 0.0f && iErr == 0);
+ fail = fail
+ && !(test == 0.0f
+ && (iErr3 == 0 || iErr4 == 0));
if (!fail) err = 0.0f;
}
- // retry per section 6.5.3.3
- if (IsDoubleSubnormal(s[j]))
+ // try with both args as zero
+ if (IsDoubleSubnormal(s2[j]))
{
- int correct3i, correct4i;
- long double correct3 =
- f->dfunc.f_ffpI(0.0, s2[j], &correct3i);
- long double correct4 =
- f->dfunc.f_ffpI(-0.0, s2[j], &correct4i);
- float err2 =
- Bruteforce_Ulp_Error_Double(test, correct3);
- float err3 =
- Bruteforce_Ulp_Error_Double(test, correct4);
- int64_t iErr3 =
- (long long)q2[j] - (long long)correct3i;
- int64_t iErr4 =
- (long long)q2[j] - (long long)correct4i;
+ int correct7i, correct8i;
+ correct3 = f->dfunc.f_ffpI(0.0, 0.0, &correct3i);
+ correct4 = f->dfunc.f_ffpI(-0.0, 0.0, &correct4i);
+ long double correct7 =
+ f->dfunc.f_ffpI(0.0, -0.0, &correct7i);
+ long double correct8 =
+ f->dfunc.f_ffpI(-0.0, -0.0, &correct8i);
+ err2 = Bruteforce_Ulp_Error_Double(test, correct3);
+ err3 = Bruteforce_Ulp_Error_Double(test, correct4);
+ float err4 =
+ Bruteforce_Ulp_Error_Double(test, correct7);
+ float err5 =
+ Bruteforce_Ulp_Error_Double(test, correct8);
+ iErr3 = (long long)q2[j] - (long long)correct3i;
+ iErr4 = (long long)q2[j] - (long long)correct4i;
+ int64_t iErr7 =
+ (long long)q2[j] - (long long)correct7i;
+ int64_t iErr8 =
+ (long long)q2[j] - (long long)correct8i;
fail = fail
&& ((!(fabsf(err2) <= f->double_ulps
&& iErr3 == 0))
&& (!(fabsf(err3) <= f->double_ulps
- && iErr4 == 0)));
+ && iErr4 == 0))
+ && (!(fabsf(err4) <= f->double_ulps
+ && iErr7 == 0))
+ && (!(fabsf(err5) <= f->double_ulps
+ && iErr8 == 0)));
if (fabsf(err2) < fabsf(err)) err = err2;
if (fabsf(err3) < fabsf(err)) err = err3;
+ if (fabsf(err4) < fabsf(err)) err = err4;
+ if (fabsf(err5) < fabsf(err)) err = err5;
if (llabs(iErr3) < llabs(iErr)) iErr = iErr3;
if (llabs(iErr4) < llabs(iErr)) iErr = iErr4;
+ if (llabs(iErr7) < llabs(iErr)) iErr = iErr7;
+ if (llabs(iErr8) < llabs(iErr)) iErr = iErr8;
// retry per section 6.5.3.4
- if (IsDoubleResultSubnormal(correct2,
+ if (IsDoubleResultSubnormal(correct3,
f->double_ulps)
- || IsDoubleResultSubnormal(correct3,
+ || IsDoubleResultSubnormal(correct4,
+ f->double_ulps)
+ || IsDoubleResultSubnormal(correct7,
+ f->double_ulps)
+ || IsDoubleResultSubnormal(correct8,
f->double_ulps))
{
fail = fail
&& !(test == 0.0f
- && (iErr3 == 0 || iErr4 == 0));
- if (!fail) err = 0.0f;
- }
-
- // try with both args as zero
- if (IsDoubleSubnormal(s2[j]))
- {
- int correct7i, correct8i;
- correct3 =
- f->dfunc.f_ffpI(0.0, 0.0, &correct3i);
- correct4 =
- f->dfunc.f_ffpI(-0.0, 0.0, &correct4i);
- long double correct7 =
- f->dfunc.f_ffpI(0.0, -0.0, &correct7i);
- long double correct8 =
- f->dfunc.f_ffpI(-0.0, -0.0, &correct8i);
- err2 =
- Bruteforce_Ulp_Error_Double(test, correct3);
- err3 =
- Bruteforce_Ulp_Error_Double(test, correct4);
- float err4 =
- Bruteforce_Ulp_Error_Double(test, correct7);
- float err5 =
- Bruteforce_Ulp_Error_Double(test, correct8);
- iErr3 = (long long)q2[j] - (long long)correct3i;
- iErr4 = (long long)q2[j] - (long long)correct4i;
- int64_t iErr7 =
- (long long)q2[j] - (long long)correct7i;
- int64_t iErr8 =
- (long long)q2[j] - (long long)correct8i;
- fail = fail
- && ((!(fabsf(err2) <= f->double_ulps
- && iErr3 == 0))
- && (!(fabsf(err3) <= f->double_ulps
- && iErr4 == 0))
- && (!(fabsf(err4) <= f->double_ulps
- && iErr7 == 0))
- && (!(fabsf(err5) <= f->double_ulps
- && iErr8 == 0)));
- if (fabsf(err2) < fabsf(err)) err = err2;
- if (fabsf(err3) < fabsf(err)) err = err3;
- if (fabsf(err4) < fabsf(err)) err = err4;
- if (fabsf(err5) < fabsf(err)) err = err5;
- if (llabs(iErr3) < llabs(iErr)) iErr = iErr3;
- if (llabs(iErr4) < llabs(iErr)) iErr = iErr4;
- if (llabs(iErr7) < llabs(iErr)) iErr = iErr7;
- if (llabs(iErr8) < llabs(iErr)) iErr = iErr8;
-
- // retry per section 6.5.3.4
- if (IsDoubleResultSubnormal(correct3,
- f->double_ulps)
- || IsDoubleResultSubnormal(correct4,
- f->double_ulps)
- || IsDoubleResultSubnormal(correct7,
- f->double_ulps)
- || IsDoubleResultSubnormal(correct8,
- f->double_ulps))
- {
- fail = fail
- && !(test == 0.0f
- && (iErr3 == 0 || iErr4 == 0
- || iErr7 == 0 || iErr8 == 0));
- if (!fail) err = 0.0f;
- }
- }
- }
- else if (IsDoubleSubnormal(s2[j]))
- {
- int correct3i, correct4i;
- long double correct3 =
- f->dfunc.f_ffpI(s[j], 0.0, &correct3i);
- long double correct4 =
- f->dfunc.f_ffpI(s[j], -0.0, &correct4i);
- float err2 =
- Bruteforce_Ulp_Error_Double(test, correct3);
- float err3 =
- Bruteforce_Ulp_Error_Double(test, correct4);
- int64_t iErr3 =
- (long long)q2[j] - (long long)correct3i;
- int64_t iErr4 =
- (long long)q2[j] - (long long)correct4i;
- fail = fail
- && ((!(fabsf(err2) <= f->double_ulps
- && iErr3 == 0))
- && (!(fabsf(err3) <= f->double_ulps
- && iErr4 == 0)));
- if (fabsf(err2) < fabsf(err)) err = err2;
- if (fabsf(err3) < fabsf(err)) err = err3;
- if (llabs(iErr3) < llabs(iErr)) iErr = iErr3;
- if (llabs(iErr4) < llabs(iErr)) iErr = iErr4;
-
- // retry per section 6.5.3.4
- if (IsDoubleResultSubnormal(correct2,
- f->double_ulps)
- || IsDoubleResultSubnormal(correct3,
- f->double_ulps))
- {
- fail = fail
- && !(test == 0.0f
- && (iErr3 == 0 || iErr4 == 0));
+ && (iErr3 == 0 || iErr4 == 0
+ || iErr7 == 0 || iErr8 == 0));
if (!fail) err = 0.0f;
}
}
}
+ else if (IsDoubleSubnormal(s2[j]))
+ {
+ int correct3i, correct4i;
+ long double correct3 =
+ f->dfunc.f_ffpI(s[j], 0.0, &correct3i);
+ long double correct4 =
+ f->dfunc.f_ffpI(s[j], -0.0, &correct4i);
+ float err2 =
+ Bruteforce_Ulp_Error_Double(test, correct3);
+ float err3 =
+ Bruteforce_Ulp_Error_Double(test, correct4);
+ int64_t iErr3 = (long long)q2[j] - (long long)correct3i;
+ int64_t iErr4 = (long long)q2[j] - (long long)correct4i;
+ fail = fail
+ && ((!(fabsf(err2) <= f->double_ulps && iErr3 == 0))
+ && (!(fabsf(err3) <= f->double_ulps
+ && iErr4 == 0)));
+ if (fabsf(err2) < fabsf(err)) err = err2;
+ if (fabsf(err3) < fabsf(err)) err = err3;
+ if (llabs(iErr3) < llabs(iErr)) iErr = iErr3;
+ if (llabs(iErr4) < llabs(iErr)) iErr = iErr4;
+
+ // retry per section 6.5.3.4
+ if (IsDoubleResultSubnormal(correct2, f->double_ulps)
+ || IsDoubleResultSubnormal(correct3,
+ f->double_ulps))
+ {
+ fail = fail
+ && !(test == 0.0f
+ && (iErr3 == 0 || iErr4 == 0));
+ if (!fail) err = 0.0f;
+ }
+ }
+ }
if (fabsf(err) > maxError)
{
maxError = fabsf(err);
@@ -1236,7 +1193,6 @@
error = -1;
goto exit;
}
- }
}
}
diff --git a/test_conformance/math_brute_force/i_unary.cpp b/test_conformance/math_brute_force/i_unary.cpp
index 7e20737..5b8b424 100644
--- a/test_conformance/math_brute_force/i_unary.cpp
+++ b/test_conformance/math_brute_force/i_unary.cpp
@@ -248,11 +248,6 @@
gMaxVectorSizeIndex - gMinVectorSizeIndex,
&build_info)))
return error;
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -502,11 +497,6 @@
{
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels +
- i, programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
diff --git a/test_conformance/math_brute_force/mad.cpp b/test_conformance/math_brute_force/mad.cpp
index 9292649..a510e5b 100644
--- a/test_conformance/math_brute_force/mad.cpp
+++ b/test_conformance/math_brute_force/mad.cpp
@@ -248,8 +248,6 @@
cl_program programs[VECTOR_SIZE_COUNT];
cl_kernel kernels[VECTOR_SIZE_COUNT];
float maxError = 0.0f;
- // int ftz = f->ftz || gForceFTZ || 0 == (CL_FP_DENORM &
- // gFloatCapabilities);
float maxErrorVal = 0.0f;
float maxErrorVal2 = 0.0f;
float maxErrorVal3 = 0.0f;
@@ -263,11 +261,6 @@
gMaxVectorSizeIndex - gMinVectorSizeIndex,
&build_info)))
return error;
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -380,247 +373,8 @@
if (gSkipCorrectnessTesting) break;
- // Verify data -- Commented out on purpose. no verification possible.
+ // Verify data -- No verification possible.
// MAD is a random number generator.
- /*
- uint32_t *t = gOut_Ref;
- for( j = 0; j < bufferSize / sizeof( float ); j++ )
- {
- for( k = gMinVectorSizeIndex; k < gMaxVectorSizeIndex; k++ )
- {
- uint32_t *q = gOut[k];
-
- // If we aren't getting the correctly rounded result
- if( t[j] != q[j] )
- {
- float test = ((float*) q)[j];
- double correct = f->func.f_fff( s[j], s2[j], s3[j]
- ); float err = Ulp_Error( test, correct ); int fail = ! (fabsf(err) <=
- f->float_ulps);
-
- if( fail && ftz )
- {
- // retry per section 6.5.3.2
- if( IsFloatSubnormal(correct) )
- { // look at me,
- fail = fail && ( test != 0.0f );
- if( ! fail )
- err = 0.0f;
- }
-
- // retry per section 6.5.3.3
- if( fail && IsFloatSubnormal( s[j] ) )
- { // look at me,
- double correct2 = f->func.f_fff( 0.0, s2[j],
- s3[j] ); double correct3 = f->func.f_fff( -0.0, s2[j], s3[j] ); float
- err2 = Ulp_Error( test, correct2 ); float err3 = Ulp_Error( test,
- correct3 ); fail = fail && ((!(fabsf(err2) <= f->float_ulps)) &&
- (!(fabsf(err3) <= f->float_ulps))); if( fabsf( err2 ) < fabsf(err ) )
- err = err2;
- if( fabsf( err3 ) < fabsf(err ) )
- err = err3;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) )
- { // look at me now,
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
-
- //try with first two args as zero
- if( IsFloatSubnormal( s2[j] ) )
- { // its fun to have fun,
- correct2 = f->func.f_fff( 0.0, 0.0,
- s3[j] ); correct3 = f->func.f_fff( -0.0, 0.0, s3[j] ); double correct4
- = f->func.f_fff( 0.0, -0.0, s3[j] ); double correct5 = f->func.f_fff(
- -0.0, -0.0, s3[j] ); err2 = Ulp_Error( test, correct2 ); err3 =
- Ulp_Error( test, correct3 ); float err4 = Ulp_Error( test, correct4 );
- float err5 = Ulp_Error( test, correct5
- ); fail = fail && ((!(fabsf(err2) <= f->float_ulps)) && (!(fabsf(err3)
- <= f->float_ulps)) &&
- (!(fabsf(err4) <=
- f->float_ulps)) && (!(fabsf(err5) <= f->float_ulps))); if( fabsf( err2
- ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) ) err =
- err3; if( fabsf( err4 ) < fabsf(err ) ) err = err4; if( fabsf( err5 ) <
- fabsf(err ) ) err = err5;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) ||
- IsFloatResultSubnormal(correct4,
- f->float_ulps ) || IsFloatResultSubnormal(correct5, f->float_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
-
- if( IsFloatSubnormal( s3[j] ) )
- { // but you have to know how!
- correct2 = f->func.f_fff( 0.0, 0.0,
- 0.0f ); correct3 = f->func.f_fff( -0.0, 0.0, 0.0f ); correct4 =
- f->func.f_fff( 0.0, -0.0, 0.0f ); correct5 = f->func.f_fff( -0.0, -0.0,
- 0.0f ); double correct6 = f->func.f_fff( 0.0, 0.0, -0.0f ); double
- correct7 = f->func.f_fff( -0.0, 0.0, -0.0f ); double correct8 =
- f->func.f_fff( 0.0, -0.0, -0.0f ); double correct9 = f->func.f_fff(
- -0.0, -0.0, -0.0f ); err2 = Ulp_Error( test, correct2 ); err3 =
- Ulp_Error( test, correct3 ); err4 = Ulp_Error( test, correct4 ); err5
- = Ulp_Error( test, correct5 ); float err6 = Ulp_Error( test, correct6
- ); float err7 = Ulp_Error( test, correct7 ); float err8 = Ulp_Error(
- test, correct8 ); float err9 = Ulp_Error( test, correct9 ); fail =
- fail && ((!(fabsf(err2) <= f->float_ulps)) && (!(fabsf(err3) <=
- f->float_ulps)) &&
- (!(fabsf(err4) <=
- f->float_ulps)) && (!(fabsf(err5) <= f->float_ulps)) &&
- (!(fabsf(err5) <=
- f->float_ulps)) && (!(fabsf(err6) <= f->float_ulps)) &&
- (!(fabsf(err7) <=
- f->float_ulps)) && (!(fabsf(err8) <= f->float_ulps))); if( fabsf( err2
- ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) ) err =
- err3; if( fabsf( err4 ) < fabsf(err ) ) err = err4; if( fabsf( err5 ) <
- fabsf(err ) ) err = err5; if( fabsf( err6 ) < fabsf(err ) ) err = err6;
- if( fabsf( err7 ) < fabsf(err ) )
- err = err7;
- if( fabsf( err8 ) < fabsf(err ) )
- err = err8;
- if( fabsf( err9 ) < fabsf(err ) )
- err = err9;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) ||
- IsFloatResultSubnormal(correct4,
- f->float_ulps ) || IsFloatResultSubnormal(correct5, f->float_ulps ) ||
- IsFloatResultSubnormal(
- correct6, f->float_ulps ) || IsFloatResultSubnormal(correct7,
- f->float_ulps ) || IsFloatResultSubnormal(correct8, f->float_ulps ) ||
- IsFloatResultSubnormal( correct9, f->float_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
- else if( IsFloatSubnormal( s3[j] ) )
- {
- correct2 = f->func.f_fff( 0.0, s2[j],
- 0.0 ); correct3 = f->func.f_fff( -0.0, s2[j], 0.0 ); double correct4 =
- f->func.f_fff( 0.0, s2[j], -0.0 ); double correct5 = f->func.f_fff(
- -0.0, s2[j], -0.0 ); err2 = Ulp_Error( test, correct2 ); err3 =
- Ulp_Error( test, correct3 ); float err4 = Ulp_Error( test, correct4 );
- float err5 = Ulp_Error( test, correct5
- ); fail = fail && ((!(fabsf(err2) <= f->float_ulps)) && (!(fabsf(err3)
- <= f->float_ulps)) &&
- (!(fabsf(err4) <=
- f->float_ulps)) && (!(fabsf(err5) <= f->float_ulps))); if( fabsf( err2
- ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) ) err =
- err3; if( fabsf( err4 ) < fabsf(err ) ) err = err4; if( fabsf( err5 ) <
- fabsf(err ) ) err = err5;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) ||
- IsFloatResultSubnormal(correct4,
- f->float_ulps ) || IsFloatResultSubnormal(correct5, f->float_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
- else if( fail && IsFloatSubnormal( s2[j] ) )
- {
- double correct2 = f->func.f_fff( s[j], 0.0,
- s3[j] ); double correct3 = f->func.f_fff( s[j], -0.0, s3[j] ); float
- err2 = Ulp_Error( test, correct2 ); float err3 = Ulp_Error( test,
- correct3 ); fail = fail && ((!(fabsf(err2) <= f->float_ulps)) &&
- (!(fabsf(err3) <= f->float_ulps))); if( fabsf( err2 ) < fabsf(err ) )
- err = err2;
- if( fabsf( err3 ) < fabsf(err ) )
- err = err3;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
-
- //try with second two args as zero
- if( IsFloatSubnormal( s3[j] ) )
- {
- correct2 = f->func.f_fff( s[j], 0.0, 0.0
- ); correct3 = f->func.f_fff( s[j], -0.0, 0.0 ); double correct4 =
- f->func.f_fff( s[j], 0.0, -0.0 ); double correct5 = f->func.f_fff(
- s[j], -0.0, -0.0 ); err2 = Ulp_Error( test, correct2 ); err3 =
- Ulp_Error( test, correct3 ); float err4 = Ulp_Error( test, correct4 );
- float err5 = Ulp_Error( test, correct5
- ); fail = fail && ((!(fabsf(err2) <= f->float_ulps)) && (!(fabsf(err3)
- <= f->float_ulps)) &&
- (!(fabsf(err4) <=
- f->float_ulps)) && (!(fabsf(err5) <= f->float_ulps))); if( fabsf( err2
- ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) ) err =
- err3; if( fabsf( err4 ) < fabsf(err ) ) err = err4; if( fabsf( err5 ) <
- fabsf(err ) ) err = err5;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) ||
- IsFloatResultSubnormal(correct4,
- f->float_ulps ) || IsFloatResultSubnormal(correct5, f->float_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
- else if( fail && IsFloatSubnormal(s3[j]) )
- {
- double correct2 = f->func.f_fff( s[j],
- s2[j], 0.0 ); double correct3 = f->func.f_fff( s[j], s2[j], -0.0 );
- float err2 = Ulp_Error( test, correct2 );
- float err3 = Ulp_Error( test, correct3 );
- fail = fail && ((!(fabsf(err2) <=
- f->float_ulps)) && (!(fabsf(err3) <= f->float_ulps))); if( fabsf( err2
- ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) ) err =
- err3;
-
- // retry per section 6.5.3.4
- if( IsFloatResultSubnormal(correct2,
- f->float_ulps ) || IsFloatResultSubnormal(correct3, f->float_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
-
- if( fabsf(err ) > maxError )
- {
- maxError = fabsf(err);
- maxErrorVal = s[j];
- maxErrorVal2 = s2[j];
- maxErrorVal3 = s3[j];
- }
-
- if( fail )
- {
- vlog_error( "\nERROR: %s%s: %f ulp error at {%a,
- %a, %a}: *%a vs. %a\n", f->name, sizeNames[k], err, s[j], s2[j], s3[j],
- ((float*) gOut_Ref)[j], test ); error = -1; goto exit;
- }
- }
- }
- }
- */
if (0 == (i & 0x0fffffff))
{
vlog(".");
@@ -758,7 +512,6 @@
cl_program programs[VECTOR_SIZE_COUNT];
cl_kernel kernels[VECTOR_SIZE_COUNT];
float maxError = 0.0f;
- // int ftz = f->ftz || gForceFTZ;
double maxErrorVal = 0.0f;
double maxErrorVal2 = 0.0f;
double maxErrorVal3 = 0.0f;
@@ -776,11 +529,6 @@
{
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels +
- i, programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -893,266 +641,8 @@
if (gSkipCorrectnessTesting) break;
- // Verify data -- Commented out on purpose. no verification possible.
+ // Verify data -- No verification possible.
// MAD is a random number generator.
- /*
- uint64_t *t = gOut_Ref;
- for( j = 0; j < bufferSize / sizeof( double ); j++ )
- {
- for( k = gMinVectorSizeIndex; k < gMaxVectorSizeIndex; k++ )
- {
- uint64_t *q = gOut[k];
-
- // If we aren't getting the correctly rounded result
- if( t[j] != q[j] )
- {
- double test = ((double*) q)[j];
- long double correct = f->dfunc.f_fff( s[j], s2[j],
- s3[j] ); float err = Bruteforce_Ulp_Error_Double( test, correct ); int
- fail = ! (fabsf(err) <= f->double_ulps);
-
- if( fail && ftz )
- {
- // retry per section 6.5.3.2
- if( IsDoubleResultSubnormal(correct,
- f->double_ulps) ) { // look at me, fail = fail && ( test != 0.0f ); if(
- ! fail ) err = 0.0f;
- }
-
- // retry per section 6.5.3.3
- if( fail && IsDoubleSubnormal( s[j] ) )
- { // look at me,
- long double correct2 = f->dfunc.f_fff( 0.0,
- s2[j], s3[j] ); long double correct3 = f->dfunc.f_fff( -0.0, s2[j],
- s3[j] ); float err2 = Bruteforce_Ulp_Error_Double( test, correct2 );
- float err3 = Bruteforce_Ulp_Error_Double(
- test, correct3 ); fail = fail && ((!(fabsf(err2) <= f->double_ulps))
- && (!(fabsf(err3) <= f->double_ulps))); if( fabsf( err2 ) < fabsf(err )
- ) err = err2; if( fabsf( err3 ) < fabsf(err ) ) err = err3;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal( correct2,
- f->double_ulps ) || IsDoubleResultSubnormal( correct3, f->double_ulps )
- ) { // look at me now, fail = fail && ( test != 0.0f); if( ! fail ) err
- = 0.0f;
- }
-
- //try with first two args as zero
- if( IsDoubleSubnormal( s2[j] ) )
- { // its fun to have fun,
- correct2 = f->dfunc.f_fff( 0.0, 0.0,
- s3[j] ); correct3 = f->dfunc.f_fff( -0.0, 0.0, s3[j] ); long double
- correct4 = f->dfunc.f_fff( 0.0, -0.0, s3[j] ); long double correct5 =
- f->dfunc.f_fff( -0.0, -0.0, s3[j] ); err2 =
- Bruteforce_Ulp_Error_Double( test, correct2 ); err3 =
- Bruteforce_Ulp_Error_Double( test, correct3 ); float err4 =
- Bruteforce_Ulp_Error_Double( test, correct4 ); float err5 =
- Bruteforce_Ulp_Error_Double( test, correct5 ); fail = fail &&
- ((!(fabsf(err2) <= f->double_ulps)) && (!(fabsf(err3) <=
- f->double_ulps)) &&
- (!(fabsf(err4) <=
- f->double_ulps)) && (!(fabsf(err5) <= f->double_ulps))); if( fabsf(
- err2 ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) )
- err = err3;
- if( fabsf( err4 ) < fabsf(err ) )
- err = err4;
- if( fabsf( err5 ) < fabsf(err ) )
- err = err5;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal( correct2,
- f->double_ulps ) || IsDoubleResultSubnormal( correct3, f->double_ulps )
- || IsDoubleResultSubnormal( correct4, f->double_ulps ) ||
- IsDoubleResultSubnormal( correct5, f->double_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
-
- if( IsDoubleSubnormal( s3[j] ) )
- { // but you have to know how!
- correct2 = f->dfunc.f_fff( 0.0, 0.0,
- 0.0f ); correct3 = f->dfunc.f_fff( -0.0, 0.0, 0.0f ); correct4 =
- f->dfunc.f_fff( 0.0, -0.0, 0.0f ); correct5 = f->dfunc.f_fff( -0.0,
- -0.0, 0.0f ); long double correct6 = f->dfunc.f_fff( 0.0, 0.0, -0.0f );
- long double correct7 =
- f->dfunc.f_fff( -0.0, 0.0, -0.0f ); long double correct8 =
- f->dfunc.f_fff( 0.0, -0.0, -0.0f ); long double correct9 =
- f->dfunc.f_fff( -0.0, -0.0, -0.0f ); err2 =
- Bruteforce_Ulp_Error_Double( test, correct2 ); err3 =
- Bruteforce_Ulp_Error_Double( test, correct3 ); err4 =
- Bruteforce_Ulp_Error_Double( test, correct4 ); err5 =
- Bruteforce_Ulp_Error_Double( test, correct5 ); float err6 =
- Bruteforce_Ulp_Error_Double( test, correct6 ); float err7 =
- Bruteforce_Ulp_Error_Double( test, correct7 ); float err8 =
- Bruteforce_Ulp_Error_Double( test, correct8 ); float err9 =
- Bruteforce_Ulp_Error_Double( test, correct9 ); fail = fail &&
- ((!(fabsf(err2) <= f->double_ulps)) && (!(fabsf(err3) <=
- f->double_ulps)) &&
- (!(fabsf(err4) <=
- f->double_ulps)) && (!(fabsf(err5) <= f->double_ulps)) &&
- (!(fabsf(err5) <=
- f->double_ulps)) && (!(fabsf(err6) <= f->double_ulps)) &&
- (!(fabsf(err7) <=
- f->double_ulps)) && (!(fabsf(err8) <= f->double_ulps))); if( fabsf(
- err2 ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) )
- err = err3;
- if( fabsf( err4 ) < fabsf(err ) )
- err = err4;
- if( fabsf( err5 ) < fabsf(err ) )
- err = err5;
- if( fabsf( err6 ) < fabsf(err ) )
- err = err6;
- if( fabsf( err7 ) < fabsf(err ) )
- err = err7;
- if( fabsf( err8 ) < fabsf(err ) )
- err = err8;
- if( fabsf( err9 ) < fabsf(err ) )
- err = err9;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal(
- correct2, f->double_ulps ) || IsDoubleResultSubnormal( correct3,
- f->double_ulps ) || IsDoubleResultSubnormal( correct4, f->double_ulps
- ) || IsDoubleResultSubnormal( correct5, f->double_ulps ) ||
- IsDoubleResultSubnormal(
- correct6, f->double_ulps ) || IsDoubleResultSubnormal( correct7,
- f->double_ulps ) || IsDoubleResultSubnormal( correct8, f->double_ulps
- ) || IsDoubleResultSubnormal( correct9, f->double_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
- else if( IsDoubleSubnormal( s3[j] ) )
- {
- correct2 = f->dfunc.f_fff( 0.0, s2[j],
- 0.0 ); correct3 = f->dfunc.f_fff( -0.0, s2[j], 0.0 ); long double
- correct4 = f->dfunc.f_fff( 0.0, s2[j], -0.0 ); long double correct5 =
- f->dfunc.f_fff( -0.0, s2[j], -0.0 ); err2 =
- Bruteforce_Ulp_Error_Double( test, correct2 ); err3 =
- Bruteforce_Ulp_Error_Double( test, correct3 ); float err4 =
- Bruteforce_Ulp_Error_Double( test, correct4 ); float err5 =
- Bruteforce_Ulp_Error_Double( test, correct5 ); fail = fail &&
- ((!(fabsf(err2) <= f->double_ulps)) && (!(fabsf(err3) <=
- f->double_ulps)) &&
- (!(fabsf(err4) <=
- f->double_ulps)) && (!(fabsf(err5) <= f->double_ulps))); if( fabsf(
- err2 ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) )
- err = err3;
- if( fabsf( err4 ) < fabsf(err ) )
- err = err4;
- if( fabsf( err5 ) < fabsf(err ) )
- err = err5;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal( correct2,
- f->double_ulps ) || IsDoubleResultSubnormal( correct3, f->double_ulps )
- || IsDoubleResultSubnormal( correct4, f->double_ulps ) ||
- IsDoubleResultSubnormal( correct5, f->double_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
- else if( fail && IsDoubleSubnormal( s2[j] ) )
- {
- long double correct2 = f->dfunc.f_fff( s[j],
- 0.0, s3[j] ); long double correct3 = f->dfunc.f_fff( s[j], -0.0, s3[j]
- ); float err2 = Bruteforce_Ulp_Error_Double( test, correct2 ); float
- err3 = Bruteforce_Ulp_Error_Double( test, correct3 ); fail = fail &&
- ((!(fabsf(err2) <= f->double_ulps)) && (!(fabsf(err3) <=
- f->double_ulps))); if( fabsf( err2 ) < fabsf(err ) ) err = err2; if(
- fabsf( err3 ) < fabsf(err ) ) err = err3;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal( correct2,
- f->double_ulps ) || IsDoubleResultSubnormal( correct3, f->double_ulps
- ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
-
- //try with second two args as zero
- if( IsDoubleSubnormal( s3[j] ) )
- {
- correct2 = f->dfunc.f_fff( s[j], 0.0,
- 0.0 ); correct3 = f->dfunc.f_fff( s[j], -0.0, 0.0 ); long double
- correct4 = f->dfunc.f_fff( s[j], 0.0, -0.0 ); long double correct5 =
- f->dfunc.f_fff( s[j], -0.0, -0.0 ); err2 = Bruteforce_Ulp_Error_Double(
- test, correct2 ); err3 = Bruteforce_Ulp_Error_Double( test, correct3
- ); float err4 = Bruteforce_Ulp_Error_Double( test, correct4 ); float
- err5 = Bruteforce_Ulp_Error_Double( test, correct5 ); fail = fail &&
- ((!(fabsf(err2) <= f->double_ulps)) && (!(fabsf(err3) <=
- f->double_ulps)) &&
- (!(fabsf(err4) <=
- f->double_ulps)) && (!(fabsf(err5) <= f->double_ulps))); if( fabsf(
- err2 ) < fabsf(err ) ) err = err2; if( fabsf( err3 ) < fabsf(err ) )
- err = err3;
- if( fabsf( err4 ) < fabsf(err ) )
- err = err4;
- if( fabsf( err5 ) < fabsf(err ) )
- err = err5;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal( correct2,
- f->double_ulps ) || IsDoubleResultSubnormal( correct3, f->double_ulps )
- || IsDoubleResultSubnormal( correct4, f->double_ulps ) ||
- IsDoubleResultSubnormal( correct5, f->double_ulps ) )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
- else if( fail && IsDoubleSubnormal(s3[j]) )
- {
- long double correct2 = f->dfunc.f_fff( s[j],
- s2[j], 0.0 ); long double correct3 = f->dfunc.f_fff( s[j], s2[j], -0.0
- ); float err2 = Bruteforce_Ulp_Error_Double( test, correct2 ); float
- err3 = Bruteforce_Ulp_Error_Double( test, correct3 ); fail = fail &&
- ((!(fabsf(err2) <= f->double_ulps)) && (!(fabsf(err3) <=
- f->double_ulps))); if( fabsf( err2 ) < fabsf(err ) ) err = err2; if(
- fabsf( err3 ) < fabsf(err ) ) err = err3;
-
- // retry per section 6.5.3.4
- if( IsDoubleResultSubnormal( correct2,
- f->double_ulps ) || IsDoubleResultSubnormal( correct3, f->double_ulps )
- )
- {
- fail = fail && ( test != 0.0f);
- if( ! fail )
- err = 0.0f;
- }
- }
- }
-
- if( fabsf(err ) > maxError )
- {
- maxError = fabsf(err);
- maxErrorVal = s[j];
- maxErrorVal2 = s2[j];
- maxErrorVal3 = s3[j];
- }
-
- if( fail )
- {
- vlog_error( "\nERROR: %sD%s: %f ulp error at
- {%a, %a, %a}: *%a vs. %a\n", f->name, sizeNames[k], err, s[j], s2[j],
- s3[j], ((double*) gOut_Ref)[j], test ); error = -1; goto exit;
- }
- }
- }
- }
- */
if (0 == (i & 0x0fffffff))
{
vlog(".");
diff --git a/test_conformance/math_brute_force/reference_math.cpp b/test_conformance/math_brute_force/reference_math.cpp
index 1a5a669..cfa5417 100644
--- a/test_conformance/math_brute_force/reference_math.cpp
+++ b/test_conformance/math_brute_force/reference_math.cpp
@@ -36,9 +36,6 @@
#define M_PI_4 (M_PI / 4)
#endif
-#define EVALUATE(x) x
-#define CONCATENATE(x, y) x##EVALUATE(y)
-
#pragma STDC FP_CONTRACT OFF
static void __log2_ep(double *hi, double *lo, double x);
@@ -51,7 +48,6 @@
#define cl_make_nan() _CL_NAN.d
-static double reduce1(double x);
static double reduce1(double x)
{
if (fabs(x) >= HEX_DBL(+, 1, 0, +, 53))
@@ -71,29 +67,6 @@
return x - z;
}
-/*
-static double reduceHalf( double x );
-static double reduceHalf( double x )
-{
- if( fabs(x) >= HEX_DBL( +, 1, 0, +, 52 ) )
- {
- if( fabs(x) == INFINITY )
- return cl_make_nan();
-
- return 0.0; //we patch up the sign for sinPi and cosPi later, since they
-need different signs
- }
-
- // Find the nearest multiple of 1
- const double r = copysign( HEX_DBL( +, 1, 0, +, 52 ), x );
- double z = x + r;
- z -= r;
-
- // subtract it from x. Value is now in the range -0.5 <= x <= 0.5
- return x - z;
-}
-*/
-
double reference_acospi(double x) { return reference_acos(x) / M_PI; }
double reference_asinpi(double x) { return reference_asin(x) / M_PI; }
double reference_atanpi(double x) { return reference_atan(x) / M_PI; }
@@ -196,7 +169,6 @@
return fu;
}
-static inline int extractf(float, cl_uint *);
static inline int extractf(float x, cl_uint *mant)
{
static float (*frexppf)(float, int *) = NULL;
@@ -217,7 +189,6 @@
// Shift right by shift bits. Any bits lost on the right side are bitwise OR'd
// together and ORd into the LSB of the result
-static inline void shift_right_sticky_64(cl_ulong *p, int shift);
static inline void shift_right_sticky_64(cl_ulong *p, int shift)
{
cl_ulong sticky = 0;
@@ -240,7 +211,6 @@
// Add two 64 bit mantissas. Bits that are below the LSB of the result are OR'd
// into the LSB of the result
-static inline void add64(cl_ulong *p, cl_ulong c, int *exponent);
static inline void add64(cl_ulong *p, cl_ulong c, int *exponent)
{
cl_ulong carry;
@@ -260,7 +230,6 @@
}
// IEEE-754 round to nearest, ties to even rounding
-static float round_to_nearest_even_float(cl_ulong p, int exponent);
static float round_to_nearest_even_float(cl_ulong p, int exponent)
{
union {
@@ -312,7 +281,6 @@
return u.d;
}
-static float round_to_nearest_even_float_ftz(cl_ulong p, int exponent);
static float round_to_nearest_even_float_ftz(cl_ulong p, int exponent)
{
extern int gCheckTininessBeforeRounding;
@@ -370,7 +338,6 @@
// IEEE-754 round toward zero.
-static float round_toward_zero_float(cl_ulong p, int exponent);
static float round_toward_zero_float(cl_ulong p, int exponent)
{
union {
@@ -411,7 +378,6 @@
return u.d;
}
-static float round_toward_zero_float_ftz(cl_ulong p, int exponent);
static float round_toward_zero_float_ftz(cl_ulong p, int exponent)
{
extern int gCheckTininessBeforeRounding;
@@ -452,7 +418,6 @@
}
// Subtract two significands.
-static inline void sub64(cl_ulong *c, cl_ulong p, cl_uint *signC, int *expC);
static inline void sub64(cl_ulong *c, cl_ulong p, cl_uint *signC, int *expC)
{
cl_ulong carry;
@@ -688,9 +653,6 @@
return reference_fmin(x, y);
}
-// double my_nextafter( double x, double y ){ return (double) nextafterf(
-// (float) x, (float) y ); }
-
double reference_relaxed_mad(double a, double b, double c)
{
return ((float)a) * ((float)b) + (float)c;
@@ -733,7 +695,7 @@
}
double reference_rsqrt(double x) { return 1.0 / reference_sqrt(x); }
-// double reference_sincos( double x, double *c ){ *c = cos(x); return sin(x); }
+
double reference_sinpi(double x)
{
double r = reduce1(x);
@@ -888,7 +850,6 @@
}
-// double my_fdim( double x, double y){ return fdimf( (float) x, (float) y ); }
double reference_add(double x, double y)
{
volatile float a = (float)x;
@@ -1005,8 +966,6 @@
return a;
}
-// double reference_divide( double x, double y ){ return (float) x / (float) y;
-// }
double reference_multiply(double x, double y)
{
volatile float a = (float)x;
@@ -1080,18 +1039,6 @@
return a;
}
-/*double my_remquo( double x, double y, int *iptr )
-{
- if( isnan(x) || isnan(y) ||
- fabs(x) == INFINITY ||
- y == 0.0 )
- {
- *iptr = 0;
- return NAN;
- }
-
- return (double) remquof( (float) x, (float) y, iptr );
-}*/
double reference_lgamma_r(double x, int *signp)
{
// This is not currently tested
@@ -1188,22 +1135,6 @@
return reference_copysignd(reference_pow(reference_fabs(x), 1.0 / 3.0), x);
}
-/*
-double reference_scalbn(double x, int i)
-{ // suitable for checking single precision scalbnf only
-
- if( i > 300 )
- return copysign( INFINITY, x);
- if( i < -300 )
- return copysign( 0.0, x);
-
- union{ cl_ulong u; double d;} u;
- u.u = ((cl_ulong) i + 1023) << 52;
-
- return x * u.d;
-}
-*/
-
double reference_rint(double x)
{
if (reference_fabs(x) < HEX_DBL(+, 1, 0, +, 52))
@@ -1763,12 +1694,6 @@
return exponent - 1023;
}
-// double reference_log2( double x )
-//{
-// return log( x ) * 1.44269504088896340735992468100189214;
-//}
-
-
double reference_relaxed_log2(double x) { return reference_log2(x); }
double reference_log2(double x)
@@ -2487,32 +2412,6 @@
// the last 3 terms are two low to appear in the result
- // accumulate from bottom up
-#if 0
- // works but slow
- result.hi = pC;
- result = accum_d( result, pB );
- result = accum_d( result, p7 );
- result = accum_d( result, pA );
- result = accum_d( result, p9 );
- result = accum_d( result, p6 );
- result = accum_d( result, p5 );
- result = accum_d( result, p8 );
- result = accum_d( result, p4 );
- result = accum_d( result, p3 );
- result = accum_d( result, p2 );
- result = accum_d( result, p1 );
- result = accum_d( result, p0 );
-
- // canonicalize the result
- double temp = result.hi;
- result.hi += result.lo;
- result.lo -= (result.hi - temp);
- if( isnan( result.lo ) )
- result.lo = 0.0;
-
- return result;
-#else
// take advantage of the known relative magnitudes of the partial products
// to avoid some sorting Combine 2**-78 and 2**-104 terms. Here we are a bit
// sloppy about canonicalizing the double_doubles
@@ -2554,7 +2453,6 @@
// Add in MSB's, and round to precision
return accum_d(t1, p0); // canonicalizes
-#endif
}
@@ -2742,7 +2640,6 @@
}
// Assumes zeros, infinities and NaNs handed elsewhere
-static inline int extract(double x, cl_ulong *mant);
static inline int extract(double x, cl_ulong *mant)
{
static double (*frexpp)(double, int *) = NULL;
@@ -2762,7 +2659,6 @@
}
// Return 128-bit product of a*b as (hi << 64) + lo
-static inline void mul128(cl_ulong a, cl_ulong b, cl_ulong *hi, cl_ulong *lo);
static inline void mul128(cl_ulong a, cl_ulong b, cl_ulong *hi, cl_ulong *lo)
{
cl_ulong alo = a & 0xffffffffULL;
@@ -2799,8 +2695,6 @@
}
static double round_to_nearest_even_double(cl_ulong hi, cl_ulong lo,
- int exponent);
-static double round_to_nearest_even_double(cl_ulong hi, cl_ulong lo,
int exponent)
{
union {
@@ -2846,8 +2740,6 @@
// Shift right. Bits lost on the right will be OR'd together and OR'd with the
// LSB
-static inline void shift_right_sticky_128(cl_ulong *hi, cl_ulong *lo,
- int shift);
static inline void shift_right_sticky_128(cl_ulong *hi, cl_ulong *lo, int shift)
{
cl_ulong sticky = 0;
@@ -2887,8 +2779,6 @@
// If the 129 bit result doesn't fit, bits lost off the right end will be OR'd
// with the LSB
static inline void add128(cl_ulong *hi, cl_ulong *lo, cl_ulong chi,
- cl_ulong clo, int *exp);
-static inline void add128(cl_ulong *hi, cl_ulong *lo, cl_ulong chi,
cl_ulong clo, int *exponent)
{
cl_ulong carry, carry2;
@@ -2916,8 +2806,6 @@
// 128-bit subtract of ((chi << 64) + clo) - ((*hi << 64) + *lo)
static inline void sub128(cl_ulong *chi, cl_ulong *clo, cl_ulong hi,
- cl_ulong lo, cl_ulong *signC, int *expC);
-static inline void sub128(cl_ulong *chi, cl_ulong *clo, cl_ulong hi,
cl_ulong lo, cl_ulong *signC, int *expC)
{
cl_ulong rHi = *chi;
@@ -3096,9 +2984,6 @@
return a * b + c;
}
-// long double my_nextafterl(long double x, long double y){ return (long
-// double) nextafter( (double) x, (double) y ); }
-
long double reference_recipl(long double x) { return 1.0L / x; }
long double reference_rootnl(long double x, int i)
@@ -3150,8 +3035,7 @@
}
long double reference_rsqrtl(long double x) { return 1.0L / sqrtl(x); }
-// long double reference_sincosl( long double x, long double *c ){ *c =
-// reference_cosl(x); return reference_sinl(x); }
+
long double reference_sinpil(long double x)
{
double r = reduce1l(x);
@@ -3263,8 +3147,6 @@
return reference_powl(x, y);
}
-// long double my_fdiml( long double x, long double y){ return fdim( (double) x,
-// (double) y ); }
long double reference_addl(long double x, long double y)
{
volatile double a = (double)x;
@@ -3316,27 +3198,12 @@
return (long double)a;
}
-/*long double my_remquol( long double x, long double y, int *iptr )
-{
- if( isnan(x) || isnan(y) ||
- fabs(x) == INFINITY ||
- y == 0.0 )
- {
- *iptr = 0;
- return NAN;
- }
-
- return remquo( (double) x, (double) y, iptr );
-}*/
long double reference_lgamma_rl(long double x, int *signp)
{
- // long double lgamma_val = (long double)reference_lgamma( (double)x );
- // *signp = signgam;
*signp = 0;
return x;
}
-
int reference_isequall(long double x, long double y) { return x == y; }
int reference_isfinitel(long double x) { return 0 != isfinite(x); }
int reference_isgreaterl(long double x, long double y) { return x > y; }
@@ -3457,45 +3324,6 @@
return reference_copysignl(powxy, x);
}
-/*
-long double scalbnl( long double x, int i )
-{
- //suitable for checking double precision scalbn only
-
- if( i > 3000 )
- return copysignl( INFINITY, x);
- if( i < -3000 )
- return copysignl( 0.0L, x);
-
- if( i > 0 )
- {
- while( i >= 1000 )
- {
- x *= HEX_LDBL( +, 1, 0, +, 1000 );
- i -= 1000;
- }
-
- union{ cl_ulong u; double d;}u;
- u.u = (cl_ulong)( i + 1023 ) << 52;
- x *= (long double) u.d;
- }
- else if( i < 0 )
- {
- while( i <= -1000 )
- {
- x *= HEX_LDBL( +, 1, 0, -, 1000 );
- i += 1000;
- }
-
- union{ cl_ulong u; double d;}u;
- u.u = (cl_ulong)( i + 1023 ) << 52;
- x *= (long double) u.d;
- }
-
- return x;
-}
-*/
-
long double reference_rintl(long double x)
{
#if defined(__PPC__)
@@ -3845,11 +3673,6 @@
return sqrtl(x * x + y * y);
}
-// long double reference_log2l( long double x )
-//{
-// return log( x ) * 1.44269504088896340735992468100189214L;
-//}
-
long double reference_log2l(long double x)
{
if (isnan(x) || x < 0.0 || x == -INFINITY) return NAN;
@@ -3940,14 +3763,12 @@
long double reference_reciprocall(long double x) { return 1.0L / x; }
-long double reference_remainderl(long double x, long double y);
long double reference_remainderl(long double x, long double y)
{
int i;
return reference_remquol(x, y, &i);
}
-long double reference_lgammal(long double x);
long double reference_lgammal(long double x)
{
// lgamma is currently not tested
@@ -3996,8 +3817,6 @@
int sign; // sign of double
} eprep_t;
-static eprep_t double_to_eprep(double x);
-
static eprep_t double_to_eprep(double x)
{
eprep_t result;
@@ -4029,88 +3848,6 @@
return result;
}
-/*
- double eprep_to_double( uint32_t *R, int digits, int index, int sgn )
- {
- d_ui64_t nb, rndcorr;
- uint64_t lowpart, roundbits, t1;
- int expo, expofinal, shift;
- double res;
-
- nb.d = (double) R[0];
-
- t1 = R[1];
- lowpart = (t1 << RADIX) + R[2];
- expo = ((nb.u & 0x7ff0000000000000ULL) >> 52) - 1023;
-
- expofinal = expo + RADIX*index;
-
- if (expofinal > 1023) {
- d_ui64_t inf = { 0x7ff0000000000000ULL };
- res = inf.d;
- }
-
- else if (expofinal >= -1022){
- shift = expo + 2*RADIX - 53;
- roundbits = lowpart << (64-shift);
- lowpart = lowpart >> shift;
- if (lowpart & 0x0000000000000001ULL) {
- if(roundbits == 0) {
- int i;
- for (i=3; i < digits; i++)
- roundbits = roundbits | R[i];
- }
- if(roundbits == 0) {
- if (lowpart & 0x0000000000000002ULL)
- rndcorr.u = (uint64_t) (expo - 52 + 1023) << 52;
- else
- rndcorr.d = 0.0;
- }
- else
- rndcorr.u = (uint64_t) (expo - 52 + 1023) << 52;
- }
- else{
- rndcorr.d = 0.0;
- }
-
- lowpart = lowpart >> 1;
- nb.u = nb.u | lowpart;
- res = nb.d + rndcorr.d;
-
- if(index*RADIX + 1023 > 0) {
- nb.u = 0;
- nb.u = (uint64_t) (index*RADIX + 1023) << 52;
- res *= nb.d;
- }
- else {
- nb.u = 0;
- nb.u = (uint64_t) (index*RADIX + 1023 + 2*RADIX) << 52;
- res *= two_pow_two_mradix.d;
- res *= nb.d;
- }
- }
- else {
- if (expofinal < -1022 - 53 ) {
- res = 0.0;
- }
- else {
- lowpart = lowpart >> (expo + (2*RADIX) - 52);
- nb.u = nb.u | lowpart;
- nb.u = (nb.u & 0x000FFFFFFFFFFFFFULL) | 0x0010000000000000ULL;
- nb.u = nb.u >> (-1023 - expofinal);
- if(nb.u & 0x0000000000000001ULL)
- rndcorr.u = 1;
- else
- rndcorr.d = 0.0;
- res = 0.5*(nb.d + rndcorr.d);
- }
- }
-
- return sgn*res;
- }
- */
-static double eprep_to_double(eprep_t epx);
-
static double eprep_to_double(eprep_t epx)
{
double res = 0.0;
@@ -4122,8 +3859,6 @@
return copysign(res, epx.sign);
}
-static int payne_hanek(double *y, int *exception);
-
static int payne_hanek(double *y, int *exception)
{
double x = *y;
@@ -4812,8 +4547,6 @@
long double reference_powl(long double x, long double y)
{
-
-
// this will be used for testing doubles i.e. arguments will
// be doubles so cast the input back to double ... returned
// result will be long double though .... > 53 bits of precision
@@ -4827,9 +4560,6 @@
// causes errors. So we need to tread y as long double and convert it
// to hi, lo doubles when performing y*log2(x).
- // double x = (double) xx;
- // double y = (double) yy;
-
static const double neg_epsilon = HEX_DBL(+, 1, 0, +, 53);
// if x = 1, return x for any y, even NaN
@@ -5094,8 +4824,6 @@
if (ex - ey >= 0)
{
-
-
int i;
for (i = ex - ey; i > 0; i--)
{
@@ -5137,7 +4865,6 @@
long double reference_remquol(long double xd, long double yd, int *n)
{
-
double xx = (double)xd;
double yy = (double)yd;
@@ -5174,14 +4901,12 @@
if (ex - ey >= -1)
{
-
yr = reference_ldexp(y, -ey);
xr = reference_ldexp(x, -ex);
int i;
if (ex - ey >= 0)
{
-
for (i = ex - ey; i > 0; i--)
{
q <<= 1;
@@ -5484,10 +5209,6 @@
double logxHi, logxLo;
__log2_ep(&logxHi, &logxLo, x);
- // double rhi, rlo;
- // MulDD(&rhi, &rlo, logxHi, logxLo, log2Hi, log2Lo);
- // return (long double) rhi + (long double) rlo;
-
long double lg2 = (long double)log2Hi + (long double)log2Lo;
long double logx = (long double)logxHi + (long double)logxLo;
return logx * lg2;
@@ -5872,10 +5593,6 @@
double logxHi, logxLo;
__log2_ep(&logxHi, &logxLo, x);
- // double rhi, rlo;
- // MulDD(&rhi, &rlo, logxHi, logxLo, log2Hi, log2Lo);
- // return (long double) rhi + (long double) rlo;
-
long double lg2 = (long double)log2Hi + (long double)log2Lo;
long double logx = (long double)logxHi + (long double)logxLo;
return logx * lg2;
diff --git a/test_conformance/math_brute_force/ternary.cpp b/test_conformance/math_brute_force/ternary.cpp
index 448a7c3..015dbc2 100644
--- a/test_conformance/math_brute_force/ternary.cpp
+++ b/test_conformance/math_brute_force/ternary.cpp
@@ -360,11 +360,6 @@
gMaxVectorSizeIndex - gMinVectorSizeIndex,
&build_info)))
return error;
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i, programs +
- i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -1189,11 +1184,6 @@
{
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
diff --git a/test_conformance/math_brute_force/unary_two_results.cpp b/test_conformance/math_brute_force/unary_two_results.cpp
index d468d26..177239a 100644
--- a/test_conformance/math_brute_force/unary_two_results.cpp
+++ b/test_conformance/math_brute_force/unary_two_results.cpp
@@ -261,11 +261,6 @@
gMaxVectorSizeIndex - gMinVectorSizeIndex,
&build_info)))
return error;
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -796,11 +791,6 @@
{
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels +
- i, programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
diff --git a/test_conformance/math_brute_force/unary_two_results_i.cpp b/test_conformance/math_brute_force/unary_two_results_i.cpp
index c71de0e..b79f91a 100644
--- a/test_conformance/math_brute_force/unary_two_results_i.cpp
+++ b/test_conformance/math_brute_force/unary_two_results_i.cpp
@@ -271,11 +271,6 @@
gMaxVectorSizeIndex - gMinVectorSizeIndex,
&build_info)))
return error;
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
@@ -632,11 +627,6 @@
{
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels +
- i, programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
diff --git a/test_conformance/math_brute_force/unary_u.cpp b/test_conformance/math_brute_force/unary_u.cpp
index 397ff87..43e997e 100644
--- a/test_conformance/math_brute_force/unary_u.cpp
+++ b/test_conformance/math_brute_force/unary_u.cpp
@@ -252,11 +252,6 @@
gMaxVectorSizeIndex - gMinVectorSizeIndex,
&build_info)))
return error;
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernel( f->nameInCode, (int) i, kernels + i,
- programs + i) ) ) return error;
- */
if (0 == strcmp(f->name, "half_sin") || 0 == strcmp(f->name, "half_cos"))
{
@@ -563,11 +558,6 @@
{
return error;
}
- /*
- for( i = gMinVectorSizeIndex; i < gMaxVectorSizeIndex; i++ )
- if( (error = BuildKernelDouble( f->nameInCode, (int) i, kernels +
- i, programs + i) ) ) return error;
- */
for (i = 0; i < (1ULL << 32); i += step)
{
