Separate positive and negative test generation and refactor

 * Positive and negative tests are now produced entirely in isolation,
if 'both' test types are chosen all positive tests are generated,
then all the negative tests are generated, without combining the two
 * Moved tensor generation out of serialize test and into it's own function

Signed-off-by: Matthew Haddon <matthew.haddon@arm.com>
Change-Id: Id8e9023d2c2966a0b14ae83d2d848a66cb125fcb

1 files changed, 30 insertions, 24 deletions

diff --git a/verif/tosa_verif_build_tests.py b/verif/tosa_verif_build_tests.py
index 040481b..c667e79 100755
--- a/verif/tosa_verif_build_tests.py
+++ b/verif/tosa_verif_build_tests.py
@@ -220,32 +220,38 @@ def main():
 
     ttg = TosaTestGen(args)
 
-    testList = []
-    for op in ttg.TOSA_OP_LIST:
-        if re.match(args.filter + ".*", op):
-            testList.extend(
-                ttg.genOpTestList(
-                    op,
-                    shapeFilter=args.target_shapes,
-                    rankFilter=args.target_ranks,
-                    dtypeFilter=args.target_dtypes,
-                    testType=args.test_type
+    if args.test_type == 'both':
+        testType = ['positive', 'negative']
+    else:
+        testType = [args.test_type]
+    results = []
+    for test_type in testType:
+        testList = []
+        for op in ttg.TOSA_OP_LIST:
+            if re.match(args.filter + ".*", op):
+                testList.extend(
+                    ttg.genOpTestList(
+                        op,
+                        shapeFilter=args.target_shapes,
+                        rankFilter=args.target_ranks,
+                        dtypeFilter=args.target_dtypes,
+                        testType=test_type
+                    )
                 )
-            )
 
-    print("{} matching tests".format(len(testList)))
-    results = []
-    testStrings = []
-    for opName, testStr, dtype, error, shapeList, testArgs in testList:
-        # Check for and skip duplicate tests
-        if testStr in testStrings:
-            continue
-        else:
-            testStrings.append(testStr)
-
-        if args.verbose:
-            print(testStr)
-        results.append(ttg.serializeTest(opName, testStr, dtype, error, shapeList, testArgs))
+        print("{} matching {} tests".format(len(testList), test_type))
+
+        testStrings = []
+        for opName, testStr, dtype, error, shapeList, testArgs in testList:
+            # Check for and skip duplicate tests
+            if testStr in testStrings:
+                continue
+            else:
+                testStrings.append(testStr)
+
+            if args.verbose:
+                print(testStr)
+            results.append(ttg.serializeTest(opName, testStr, dtype, error, shapeList, testArgs))
 
     print(f"Done creating {len(results)} tests")