Ensure only matching op conformance tests
By always using an exact build_tests filter, to stop
extra operator tests such as add_shape being created
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: I0fc4dd04276f9cd24c333e6a5c6b40d27d00e6ea
diff --git a/verif/conformance/tosa_base_profile_ops_info.json b/verif/conformance/tosa_base_profile_ops_info.json
index 01f78d6..6301b1d 100644
--- a/verif/conformance/tosa_base_profile_ops_info.json
+++ b/verif/conformance/tosa_base_profile_ops_info.json
@@ -1659,8 +1659,6 @@
"standard": {
"generator_args": [
[
- "--filter",
- "^greater$",
"--target-dtype",
"int32",
"--tensor-dim-range",
@@ -1673,8 +1671,6 @@
"3"
],
[
- "--filter",
- "^greater$",
"--target-dtype",
"int32",
"--tensor-dim-range",
@@ -1685,8 +1681,6 @@
"5"
],
[
- "--filter",
- "^greater$",
"--target-dtype",
"int32",
"--target-shape",
@@ -1700,8 +1694,6 @@
"no_negative_tests": "true",
"generator_args": [
[
- "--filter",
- "^greater$",
"--target-dtype",
"int32",
"--tensor-dim-range",
@@ -3950,8 +3942,6 @@
"standard": {
"generator_args": [
[
- "--filter",
- "^transpose$",
"--target-dtype",
"int8",
"--target-rank",
@@ -3962,8 +3952,6 @@
"2"
],
[
- "--filter",
- "^transpose$",
"--target-dtype",
"int8",
"--target-dtype",
@@ -3980,8 +3968,6 @@
"2"
],
[
- "--filter",
- "^transpose$",
"--target-dtype",
"int8",
"--target-shape",
@@ -3997,8 +3983,6 @@
"no_negative_tests": "true",
"generator_args": [
[
- "--filter",
- "^transpose$",
"--target-dtype",
"int8",
"--target-dtype",
diff --git a/verif/conformance/tosa_main_profile_ops_info.json b/verif/conformance/tosa_main_profile_ops_info.json
index 7559c62..18e078a 100644
--- a/verif/conformance/tosa_main_profile_ops_info.json
+++ b/verif/conformance/tosa_main_profile_ops_info.json
@@ -1425,8 +1425,6 @@
"standard": {
"generator_args": [
[
- "--filter",
- "^greater$",
"--target-dtype",
"fp32",
"--target-dtype",
@@ -1445,8 +1443,6 @@
"3"
],
[
- "--filter",
- "^greater$",
"--target-dtype",
"bf16",
"--fp-values-range",
@@ -1459,8 +1455,6 @@
"5"
],
[
- "--filter",
- "^greater$",
"--target-dtype",
"fp32",
"--fp-values-range",
@@ -1622,8 +1616,6 @@
"standard": {
"generator_args": [
[
- "--filter",
- "^log$",
"--target-dtype",
"fp32",
"--target-dtype",
@@ -1642,8 +1634,6 @@
"3"
],
[
- "--filter",
- "^log$",
"--target-dtype",
"fp32",
"--fp-values-range",
@@ -1656,8 +1646,6 @@
"5"
],
[
- "--filter",
- "^log$",
"--target-dtype",
"fp16",
"--fp-values-range",
@@ -2489,8 +2477,6 @@
"standard": {
"generator_args": [
[
- "--filter",
- "^transpose$",
"--target-dtype",
"fp32",
"--target-dtype",
@@ -2505,8 +2491,6 @@
"2"
],
[
- "--filter",
- "^transpose$",
"--target-dtype",
"fp32",
"--target-dtype",
@@ -2523,8 +2507,6 @@
"2"
],
[
- "--filter",
- "^transpose$",
"--target-dtype",
"fp32",
"--fp-values-range",
diff --git a/verif/conformance/tosa_verif_conformance_generator.py b/verif/conformance/tosa_verif_conformance_generator.py
index a10e839..987bef5 100644
--- a/verif/conformance/tosa_verif_conformance_generator.py
+++ b/verif/conformance/tosa_verif_conformance_generator.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (c) 2021-2023, ARM Limited.
+# Copyright (c) 2021-2024, ARM Limited.
# SPDX-License-Identifier: Apache-2.0
"""Build conformance tests.
@@ -115,7 +115,7 @@
"--generate-lib-path",
str(args.generate_lib_path),
"--filter",
- operator,
+ f"^{operator}$",
"-o",
str(op_build_dir),
"--seed",
@@ -138,7 +138,6 @@
if test_type in ["negative", "both"]:
# Get target-dtypes options and any filter string to limit tests
target_dtypes_args = []
- filter_str = None
for arglist in gen_args_list:
idx = 0
while idx < len(arglist):
@@ -146,13 +145,8 @@
if arglist[idx + 1] not in target_dtypes_args:
target_dtypes_args.extend(arglist[idx : idx + 2])
idx += 1 # skip over option (and then argument below)
- elif arglist[idx] == "--filter":
- filter_str = arglist[idx + 1]
- idx += 1 # skip over option (and then argument below)
idx += 1
build_cmd_neg_test = build_cmd_base.copy()
- if filter_str:
- build_cmd_neg_test.extend(["--filter", filter_str])
build_cmd_neg_test.extend(["--test-type", "negative"])
# Limit sizes of negative tests
dim_range = gen_neg_dim_range if gen_neg_dim_range is not None else "1,16"