From 7bf0cb990b55d5738c8dc4291686576654d2d8ab Mon Sep 17 00:00:00 2001
From: Jeremy Johnson <jeremy.johnson@arm.com>
Date: Tue, 31 Oct 2023 14:37:54 +0000
Subject: Main Compliance testing support for ADD, SUB, MINIMUM and MAXIMUM

Added main inference compliance mode data generation and verification.
Improved error reporting in tosa_verif_build_tests.
Fixed pseudo random invalid range check.

Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: Ib538b5999444d67704ebc322be3c7becbe5ad206
---
 reference_model/src/generate/generate_pseudo_random.cc | 5 +++--
 reference_model/src/generate/generate_utils.cc         | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'reference_model/src/generate')

diff --git a/reference_model/src/generate/generate_pseudo_random.cc b/reference_model/src/generate/generate_pseudo_random.cc
index f234796..78013eb 100644
--- a/reference_model/src/generate/generate_pseudo_random.cc
+++ b/reference_model/src/generate/generate_pseudo_random.cc
@@ -126,9 +126,10 @@ bool generatePseudoRandom(const GenerateConfig& cfg, void* data, size_t size)
         WARNING("[Generator][PR] Unknown operator.");
         return false;
     }
-    if (cfg.pseudoRandomInfo.range.size() != 0 || cfg.pseudoRandomInfo.range.size() != 2)
+    if (cfg.pseudoRandomInfo.range.size() != 0 && cfg.pseudoRandomInfo.range.size() != 2)
     {
-        WARNING("[Generator][PR] Invalid range.");
+        WARNING("[Generator][PR] Invalid range");
+        return false;
     }
 
     switch (cfg.dataType)
diff --git a/reference_model/src/generate/generate_utils.cc b/reference_model/src/generate/generate_utils.cc
index ae6dfcb..8ae889a 100644
--- a/reference_model/src/generate/generate_utils.cc
+++ b/reference_model/src/generate/generate_utils.cc
@@ -38,11 +38,15 @@ NLOHMANN_JSON_SERIALIZE_ENUM(DType,
 NLOHMANN_JSON_SERIALIZE_ENUM(Op,
                              {
                                  { Op::Op_UNKNOWN, "UNKNOWN" },
+                                 { Op::Op_ADD, "ADD" },
                                  { Op::Op_CONV2D, "CONV2D" },
                                  { Op::Op_MATMUL, "MATMUL" },
+                                 { Op::Op_MAXIMUM, "MAXIMUM" },
                                  { Op::Op_MAX_POOL2D, "MAX_POOL2D" },
+                                 { Op::Op_MINIMUM, "MINIMUM" },
                                  { Op::Op_MUL, "MUL" },
                                  { Op::Op_PAD, "PAD" },
+                                 { Op::Op_SUB, "SUB" },
                              })
 
 }    // namespace tosa
-- 
cgit v1.2.1