From af09018205f476ab12e3ccfc25523f3f939a2aa3 Mon Sep 17 00:00:00 2001
From: Jeremy Johnson <jeremy.johnson@arm.com>
Date: Tue, 13 Feb 2024 18:25:39 +0000
Subject: Improved test selection before test generation

Add test list output to tosa_verif_build_tests and test list
capture to file for tosa_verif_conformance_generator

Improve PAD & CONV2D test coverage for tosa-mi conformance

Change to use logging for output to hide info from test lists
Tweak verbosity levels of tosa_verif_conformance_generator

Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: Ic29da5776b02e9ac610db6ee89d0ebfb4994e055
---
 verif/conformance/tosa_main_profile_ops_info.json | 86 +++++++----------------
 1 file changed, 25 insertions(+), 61 deletions(-)

(limited to 'verif/conformance/tosa_main_profile_ops_info.json')

diff --git a/verif/conformance/tosa_main_profile_ops_info.json b/verif/conformance/tosa_main_profile_ops_info.json
index 202e7b7..63a2a9c 100644
--- a/verif/conformance/tosa_main_profile_ops_info.json
+++ b/verif/conformance/tosa_main_profile_ops_info.json
@@ -723,7 +723,7 @@
         "profile": [
             "tosa-mi"
         ],
-        "support_for": [ "lazy_data_gen" ],
+        "support_for": [ "lazy_data_gen", "generator_select" ],
         "gen_filter": "^conv2d",
         "generation": {
             "standard": {
@@ -784,31 +784,11 @@
         },
         "selection": {
             "default": {
-                "params": {
-                    "shape": [],
-                    "type": [],
-                    "kernel": [],
-                    "stride": [],
-                    "pad": [],
-                    "dilation": []
-                },
-                "permutes": [
-                    "kernel",
-                    "shape",
-                    "type",
-                    "pad"
-                ],
-                "preselected": [
-                    {
-                        "shape": "1x34x19x27",
-                        "type": "f32xf32",
-                        "kernel": "3x1",
-                        "pad": "pad0000",
-                        "accum_type": "accf32",
-                        "stride": "st11",
-                        "dilation": "dilat11"
-                    }
-                ]
+                "permutes": [ "rank", "dtype", "kernel", "acc_type" ],
+                "full_params": [ "stride", "dilation" ],
+                "specifics": { "pad": [ "(0, 0, 0, 0)" ] },
+                "groups": [ "s" ],
+                "maximum": 3
             }
         }
     },
@@ -1901,7 +1881,7 @@
         "profile": [
             "tosa-mi"
         ],
-        "support_for": [ "lazy_data_gen" ],
+        "support_for": [ "lazy_data_gen", "generator_select" ],
         "generation": {
             "standard": {
                 "generator_args": [
@@ -1924,24 +1904,22 @@
                         "3"
                     ],
                     [
+                        "--target-dtype",
+                        "fp32",
                         "--target-dtype",
                         "fp16",
-                        "--fp-values-range",
-                        "-max,max",
-                        "--tensor-dim-range",
-                        "1,17",
-                        "--target-rank",
-                        "4"
-                    ],
-                    [
                         "--target-dtype",
                         "bf16",
                         "--fp-values-range",
                         "-max,max",
                         "--tensor-dim-range",
-                        "1,16",
+                        "1,11",
                         "--target-rank",
-                        "5"
+                        "4",
+                        "--target-rank",
+                        "5",
+                        "--target-rank",
+                        "6"
                     ],
                     [
                         "--target-dtype",
@@ -1980,30 +1958,16 @@
         },
         "selection": {
             "default": {
-                "params": {},
-                "permutes": [
-                    "shape",
-                    "type"
-                ],
-                "preselected": [
-                    {
-                        "shape": "50",
-                        "type": "bf16",
-                        "pad": "pad11"
-                    },
-                    {
-                        "shape": "63x46",
-                        "type": "bf16",
-                        "pad": "pad1010"
-                    },
-                    {
-                        "shape": "6",
-                        "type": "f16",
-                        "pad": "pad01"
-                    }
-                ],
-                "sparsity": {
-                    "pad": 21
+                "maximum": 5,
+                "specifics": {
+                    "pad": [
+                        "[[0 0]]",
+                        "[[0 0], [0 0]]",
+                        "[[0 0], [0 0], [0 0]]",
+                        "[[0 0], [0 0], [0 0], [0 0]]",
+                        "[[0 0], [0 0], [0 0], [0 0], [0 0]]",
+                        "[[0 0], [0 0], [0 0], [0 0], [0 0], [0 0]]"
+                    ]
                 }
             }
         }
-- 
cgit v1.2.1