diff options
author | Jeremy Johnson <jeremy.johnson@arm.com> | 2024-04-11 16:21:54 +0100 |
---|---|---|
committer | Eric Kunze <eric.kunze@arm.com> | 2024-04-18 15:34:50 +0000 |
commit | 1eb1455568e2a23971f2c1b7be1077a8c1494685 (patch) | |
tree | 7979b9e1eaf3e407ff493c7f4b51fcf127f6603c /reference_model | |
parent | 8753f3aa944c87e779db2d2c4ba9d9df241b87b1 (diff) | |
download | reference_model-1eb1455568e2a23971f2c1b7be1077a8c1494685.tar.gz |
Update compliance verify checks
Cope with large error bounds with small reference values.
Change how error bounds of NaN are avoided for ABS_ERRORs.
Update SIN/COS compliance to latest spec and use input value as
magnitude.
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: I55aca59e0255e1cfd255b08edb845c3e33ca7eff
Diffstat (limited to 'reference_model')
-rw-r--r-- | reference_model/src/ops/ewise_unary.cc | 8 | ||||
-rw-r--r-- | reference_model/src/verify/verify_abs_error.cc | 22 | ||||
-rw-r--r-- | reference_model/src/verify/verify_utils.cc | 17 | ||||
-rw-r--r-- | reference_model/src/verify/verify_utils.h | 2 |
4 files changed, 38 insertions, 11 deletions
diff --git a/reference_model/src/ops/ewise_unary.cc b/reference_model/src/ops/ewise_unary.cc index 310a174..6818f8c 100644 --- a/reference_model/src/ops/ewise_unary.cc +++ b/reference_model/src/ops/ewise_unary.cc @@ -181,8 +181,8 @@ int OpCos<Rank, Dtype>::register_fcn() case TOSA_REF_TYPE_FP64: if (g_func_config.abs_mode) { - // ABS_ERROR bounds return 1.0 - this->fcn = [](InEigenType a) -> OutEigenType { return 1.0; }; + // ABS_ERROR bounds return + this->fcn = [](InEigenType a) -> OutEigenType { return a; }; } else { @@ -414,8 +414,8 @@ int OpSin<Rank, Dtype>::register_fcn() case TOSA_REF_TYPE_FP64: if (g_func_config.abs_mode) { - // ABS_ERROR bounds return 1.0 - this->fcn = [](InEigenType a) -> OutEigenType { return 1.0; }; + // ABS_ERROR bounds return + this->fcn = [](InEigenType a) -> OutEigenType { return a; }; } else { diff --git a/reference_model/src/verify/verify_abs_error.cc b/reference_model/src/verify/verify_abs_error.cc index 64f86a3..b49ce48 100644 --- a/reference_model/src/verify/verify_abs_error.cc +++ b/reference_model/src/verify/verify_abs_error.cc @@ -30,15 +30,29 @@ double calcErrorBound(double referenceValue, double boundsValue, const void* cfg { const auto cfg = reinterpret_cast<const AbsErrorVerifyInfo*>(cfgPtr); + double boundsMagnitude; + if (cfg->boundAsMagnitude) + { + // Special case for SIN/COS + // use the input value (stored in the bounds tensor) as the magnitude and value + boundsMagnitude = boundsValue; + boundsValue = std::abs(boundsValue); + } + else + { + // Use the referenceValue as the magnitude + boundsMagnitude = referenceValue; + } + double errorBound = 0.0; - if (std::isfinite(referenceValue) && std::abs(referenceValue) != 0.0) + if (std::isfinite(boundsValue) || std::abs(boundsMagnitude) != 0.0) { - double valBound = std::abs(referenceValue) * boundsValue; + double valueBound = std::abs(boundsMagnitude) * (boundsValue + cfg->boundAddition); if (cfg->lowerBound > 0) { - valBound = std::max(cfg->lowerBound, valBound); + valueBound = std::max(cfg->lowerBound, valueBound); } - errorBound = exp2(-AccPrecision<OutType>::normal_frac / cfg->normalDivisor) * valBound; + errorBound = exp2(-AccPrecision<OutType>::normal_frac / cfg->normalDivisor) * valueBound; } return errorBound; } diff --git a/reference_model/src/verify/verify_utils.cc b/reference_model/src/verify/verify_utils.cc index d4657b3..594158c 100644 --- a/reference_model/src/verify/verify_utils.cc +++ b/reference_model/src/verify/verify_utils.cc @@ -84,6 +84,14 @@ void from_json(const nlohmann::json& j, AbsErrorVerifyInfo& absErrorInfo) { j.at("normal_divisor").get_to(absErrorInfo.normalDivisor); } + if (j.contains("bound_as_magnitude")) + { + j.at("bound_as_magnitude").get_to(absErrorInfo.boundAsMagnitude); + } + if (j.contains("bound_addition")) + { + j.at("bound_addition").get_to(absErrorInfo.boundAddition); + } } void from_json(const nlohmann::json& j, RelativeVerifyInfo& rInfo) @@ -112,8 +120,10 @@ void from_json(const nlohmann::json& j, VerifyConfig& cfg) { j.at("reduce_product_info").get_to(cfg.reduceProductInfo); } - cfg.absErrorInfo.lowerBound = 0; - cfg.absErrorInfo.normalDivisor = 1; + cfg.absErrorInfo.lowerBound = 0; + cfg.absErrorInfo.normalDivisor = 1; + cfg.absErrorInfo.boundAsMagnitude = false; + cfg.absErrorInfo.boundAddition = 0; if (j.contains("abs_error_info")) { j.at("abs_error_info").get_to(cfg.absErrorInfo); @@ -317,7 +327,8 @@ bool tosaCheckFloatBound( if (referenceMin < AccPrecision<OutType>::normal_min) { - referenceMin = 0.0; + // Large error bounds could mean referenceMin is negative + referenceMin = std::min(0.0, referenceMin); } } diff --git a/reference_model/src/verify/verify_utils.h b/reference_model/src/verify/verify_utils.h index 9144317..33491e0 100644 --- a/reference_model/src/verify/verify_utils.h +++ b/reference_model/src/verify/verify_utils.h @@ -83,6 +83,8 @@ struct AbsErrorVerifyInfo double lowerBound; double normalDivisor; + bool boundAsMagnitude; + double boundAddition; }; /// \brief relative verification meta-data |