From 962e27dc063ea2788feac32ed73cdff7083ed5e7 Mon Sep 17 00:00:00 2001
From: Jeremy Johnson <jeremy.johnson@arm.com>
Date: Tue, 9 Apr 2024 16:12:35 +0100
Subject: Improve coverage of FP Activation Ops

Add Rank 0 tests.
Random usage of CONST verus INPUTs for tests.
Use new stable random and generator select modes.

Add "random_const_inputs" supports_for to conformance config.

Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: I5a76c1019514ed8426518b3ea7df5093990c9fbd
---
 verif/conformance/tosa_main_profile_ops_info.json  | 36 ++++++++--------------
 .../tosa_verif_conformance_generator.py            |  2 ++
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/verif/conformance/tosa_main_profile_ops_info.json b/verif/conformance/tosa_main_profile_ops_info.json
index ac0f384..88de2d0 100644
--- a/verif/conformance/tosa_main_profile_ops_info.json
+++ b/verif/conformance/tosa_main_profile_ops_info.json
@@ -472,7 +472,7 @@
         "profile": [
             "tosa-mi"
         ],
-        "support_for": [ "lazy_data_gen" ],
+        "support_for": [ "lazy_data_gen", "generator_select", "stable_random_gen", "random_const_inputs" ],
         "generation": {
             "standard": {
                 "generator_args": [
@@ -488,6 +488,8 @@
                         "--tensor-dim-range",
                         "20,64",
                         "--target-rank",
+                        "0",
+                        "--target-rank",
                         "1",
                         "--target-rank",
                         "2",
@@ -525,11 +527,6 @@
         },
         "selection": {
             "default": {
-                "params": {},
-                "permutes": [
-                    "shape",
-                    "type"
-                ]
             }
         }
     },
@@ -3505,7 +3502,7 @@
         "profile": [
             "tosa-mi"
         ],
-        "support_for": [ "lazy_data_gen" ],
+        "support_for": [ "lazy_data_gen", "generator_select", "stable_random_gen", "random_const_inputs" ],
         "generation": {
             "standard": {
                 "generator_args": [
@@ -3521,6 +3518,8 @@
                         "--tensor-dim-range",
                         "16,64",
                         "--target-rank",
+                        "0",
+                        "--target-rank",
                         "1",
                         "--target-rank",
                         "2",
@@ -3558,11 +3557,6 @@
         },
         "selection": {
             "default": {
-                "params": {},
-                "permutes": [
-                    "shape",
-                    "type"
-                ]
             }
         }
     },
@@ -3729,7 +3723,7 @@
         "profile": [
             "tosa-mi"
         ],
-        "support_for": [ "lazy_data_gen" ],
+        "support_for": [ "lazy_data_gen", "generator_select", "stable_random_gen", "random_const_inputs" ],
         "generation": {
             "standard": {
                 "generator_args": [
@@ -3745,6 +3739,8 @@
                         "--tensor-dim-range",
                         "18,60",
                         "--target-rank",
+                        "0",
+                        "--target-rank",
                         "1",
                         "--target-rank",
                         "2",
@@ -3782,11 +3778,6 @@
         },
         "selection": {
             "default": {
-                "params": {},
-                "permutes": [
-                    "shape",
-                    "type"
-                ]
             }
         }
     },
@@ -3795,7 +3786,7 @@
         "profile": [
             "tosa-mi"
         ],
-        "support_for": [ "lazy_data_gen" ],
+        "support_for": [ "lazy_data_gen", "generator_select", "stable_random_gen", "random_const_inputs" ],
         "generation": {
             "standard": {
                 "generator_args": [
@@ -3811,6 +3802,8 @@
                         "--tensor-dim-range",
                         "18,60",
                         "--target-rank",
+                        "0",
+                        "--target-rank",
                         "1",
                         "--target-rank",
                         "2",
@@ -3848,11 +3841,6 @@
         },
         "selection": {
             "default": {
-                "params": {},
-                "permutes": [
-                    "shape",
-                    "type"
-                ]
             }
         }
     }
diff --git a/verif/conformance/tosa_verif_conformance_generator.py b/verif/conformance/tosa_verif_conformance_generator.py
index 3b7c2df..433a33f 100644
--- a/verif/conformance/tosa_verif_conformance_generator.py
+++ b/verif/conformance/tosa_verif_conformance_generator.py
@@ -142,6 +142,8 @@ def build_op_tests(
         build_cmd_base.append("--lazy-data-generation")
     if "stable_random_gen" in supports and not args.global_random_generation:
         build_cmd_base.append("--stable-random-generation")
+    if "random_const_inputs" in supports:
+        build_cmd_base.append("--random-const-inputs")
 
     if "generator_select" in supports:
         if selector_info is None:
-- 
cgit v1.2.1