Main Compliance testing support for AVG_POOL2D

Fix test set 4 to have more symmetrical data set for AVG_POOL2D.
Increased size of AVG_POOL2D test shapes to meet MIN_DOT_PRODUCTS.
Print out sign of bias magnitude in verify library to help debugging.

Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: Icf139cf5788cbc68f2c537567bdfb4cfe31274df

4 files changed, 70 insertions, 5 deletions

diff --git a/reference_model/src/generate/generate_dot_product.cc b/reference_model/src/generate/generate_dot_product.cc
index 0930956..4054472 100644
--- a/reference_model/src/generate/generate_dot_product.cc
+++ b/reference_model/src/generate/generate_dot_product.cc
@@ -327,6 +327,55 @@ bool generateFullyConnected(const TosaReference::GenerateConfig& cfg,
             return false;
     }
 }
+//---------------------------------------------------------------------------//
+//                              Avg Pool 2D                                   //
+//---------------------------------------------------------------------------//
+
+bool generateAvgPool2D(const TosaReference::GenerateConfig& cfg,
+                       TosaReference::IDotProductGenerator& generator,
+                       void* data,
+                       size_t size)
+{
+    if (cfg.dataType != DType::DType_FP32)
+    {
+        WARNING("[Generator][DP][AvgPool2D] Only supports FP32.");
+        return false;
+    }
+    if (cfg.inputPos != 0)
+    {
+        WARNING("[Generator][DP][AvgPool2D] Invalid input tensor slot position to operator.");
+        return false;
+    }
+    if (cfg.dotProductInfo.kernel.size() != 2 || cfg.dotProductInfo.kernel[0] <= 0 || cfg.dotProductInfo.kernel[1] <= 0)
+    {
+        WARNING("[Generator][DP][AvgPool2D] Missing or incorrect kernel size information.");
+        return false;
+    }
+    if (cfg.shape.size() != 4)
+    {
+        WARNING("[Generator][DP][AvgPool2D] Tensor shape expected 4 dimensions.");
+        return false;
+    }
+
+    float* input      = reinterpret_cast<float*>(data);
+    const int64_t T   = TosaReference::numElementsFromShape(cfg.shape);
+    const uint32_t IH = cfg.shape[1];
+    const uint32_t IW = cfg.shape[2];
+    const uint32_t C  = cfg.shape[3];
+    const uint32_t KY = cfg.dotProductInfo.kernel[0];
+    const uint32_t KX = cfg.dotProductInfo.kernel[1];
+
+    for (int64_t t = 0; t < T; ++t)
+    {
+        uint32_t c  = t % C;
+        uint32_t ix = (t / C) % IW;
+        uint32_t iy = ((t / C) / IW) % IH;
+        uint32_t k  = ((iy % KY) * KX + (ix % KX)) * C + c;
+
+        input[t] = generator(k);
+    }
+    return true;
+}
 }    // namespace
 
 namespace TosaReference
@@ -352,6 +401,8 @@ bool generateDotProduct(const GenerateConfig& cfg, void* data, size_t size)
             return generateReduceSum(cfg, *generator, data, size);
         case tosa::Op_FULLY_CONNECTED:
             return generateFullyConnected(cfg, *generator, data, size);
+        case tosa::Op_AVG_POOL2D:
+            return generateAvgPool2D(cfg, *generator, data, size);
         default:
             WARNING("[Generator][DP] Unsupported operator.");
             return false;
diff --git a/reference_model/src/generate/generate_dot_product_states.cc b/reference_model/src/generate/generate_dot_product_states.cc
index 53bef3a..9ce32ff 100644
--- a/reference_model/src/generate/generate_dot_product_states.cc
+++ b/reference_model/src/generate/generate_dot_product_states.cc
@@ -209,9 +209,23 @@ public:
         const float s0 = _set_data0();
         const float s1 = _set_data1();
         if (_p == P0)
-            return (k == _KS / 2) ? +0.5f : s0 < 0 ? 0.f : (_B / std::sqrt(_KS)) * s1;
+            if (k == _KS / 2)
+            {
+                return s0 < 0 ? -0.5f : +0.5f;
+            }
+            else
+            {
+                return s0 < 0 ? 0.f : (_B / std::sqrt(_KS)) * s1;
+            }
         else if (_p == P1)
-            return (k == _KS / 2) ? -0.5f : s0 < 0 ? (_B / std::sqrt(_KS)) * s1 : 0.f;
+            if (k == _KS / 2)
+            {
+                return s0 < 0 ? +0.5f : -0.5f;
+            }
+            else
+            {
+                return s0 < 0 ? (_B / std::sqrt(_KS)) * s1 : 0.f;
+            }
         else
             return 0.f;
     }
diff --git a/reference_model/src/generate/generate_utils.cc b/reference_model/src/generate/generate_utils.cc
index 3b00ba1..5546269 100644
--- a/reference_model/src/generate/generate_utils.cc
+++ b/reference_model/src/generate/generate_utils.cc
@@ -41,6 +41,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(Op,
                                  { Op::Op_ABS, "ABS" },
                                  { Op::Op_ADD, "ADD" },
                                  { Op::Op_ARGMAX, "ARGMAX" },
+                                 { Op::Op_AVG_POOL2D, "AVG_POOL2D" },
                                  { Op::Op_CEIL, "CEIL" },
                                  { Op::Op_CONV2D, "CONV2D" },
                                  { Op::Op_EXP, "EXP" },
diff --git a/reference_model/src/verify/verify_dot_product.cc b/reference_model/src/verify/verify_dot_product.cc
index 863640f..15de427 100644
--- a/reference_model/src/verify/verify_dot_product.cc
+++ b/reference_model/src/verify/verify_dot_product.cc
@@ -86,10 +86,9 @@ bool validateData(const double* ref, const double* bnd, const AccType* imp, size
     if (S >= 3 && S <= 5)
     {
         const double max_bias = 2 * sqrt(KS * T);
-        out_err_sum           = std::abs(out_err_sum);
         // Check error bias magnitude for data sets S which are not positive biased
-        TOSA_REF_REQUIRE(out_err_sum <= max_bias, "[DP] Bias magnitude (%g) is out of range (%g)", out_err_sum,
-                         max_bias);
+        TOSA_REF_REQUIRE(std::abs(out_err_sum) <= max_bias, "[DP] Bias magnitude (abs(%g)) is out of range (%g)",
+                         out_err_sum, max_bias);
     }
     // Check error variance magnitude
     const double max_error = 0.4 * KS * T;