diff options
author | Won Jeon <won.jeon@arm.com> | 2023-06-10 00:20:04 +0000 |
---|---|---|
committer | Eric Kunze <eric.kunze@arm.com> | 2023-06-29 15:47:40 +0000 |
commit | 78155c63024c33d31e3b66e8e198fd5f93837df1 (patch) | |
tree | fcc16affd189eea6d1f4647d8fb4f6ea71a39ff2 /verif | |
parent | eb74106e1bc52127e5631736e10e8f8b0b7a1d07 (diff) | |
download | reference_model-78155c63024c33d31e3b66e8e198fd5f93837df1.tar.gz |
Add support for ERF operator to reference model
Signed-off-by: Won Jeon <won.jeon@arm.com>
Change-Id: Ib42b867287b83a183a0d0fb1f1eb29974f58fae4
Diffstat (limited to 'verif')
-rw-r--r-- | verif/conformance/test_select.py | 6 | ||||
-rw-r--r-- | verif/conformance/tosa_base_profile_framework_ops_info.json | 13 | ||||
-rw-r--r-- | verif/conformance/tosa_main_profile_ops_info.json | 65 | ||||
-rw-r--r-- | verif/frameworks/test_builder.py | 9 | ||||
-rwxr-xr-x | verif/frameworks/tosa_verif_framework_generator.py | 7 | ||||
-rw-r--r-- | verif/generator/tosa_test_gen.py | 48 |
6 files changed, 146 insertions, 2 deletions
diff --git a/verif/conformance/test_select.py b/verif/conformance/test_select.py index 9868a7f..f4e2a61 100644 --- a/verif/conformance/test_select.py +++ b/verif/conformance/test_select.py @@ -518,6 +518,12 @@ class ExpOperator(Operator): name = "exp" +class ErfOperator(Operator): + """Test selector for the ERF operator.""" + + name = "erf" + + class FFT2DOperator(Operator): """Test selector for the FFT2D operator.""" diff --git a/verif/conformance/tosa_base_profile_framework_ops_info.json b/verif/conformance/tosa_base_profile_framework_ops_info.json index 24a23b5..5d7e4a3 100644 --- a/verif/conformance/tosa_base_profile_framework_ops_info.json +++ b/verif/conformance/tosa_base_profile_framework_ops_info.json @@ -85,6 +85,16 @@ "tosa-mi" ] }, + "erf": { + "tests": [ + "erf_13x21x3_qu8", + "erf_14x19_qi8", + "erf_1x8x4x17_qi16" + ], + "profile": [ + "tosa-mi" + ] + }, "fully_connected": { "alternate_names": [ "matmul" @@ -257,8 +267,7 @@ "tanh_1x8x4x17_qi16" ], "profile": [ - "tosa-bi", "tosa-mi" ] } -}
\ No newline at end of file +} diff --git a/verif/conformance/tosa_main_profile_ops_info.json b/verif/conformance/tosa_main_profile_ops_info.json index 5df89d6..07b6af3 100644 --- a/verif/conformance/tosa_main_profile_ops_info.json +++ b/verif/conformance/tosa_main_profile_ops_info.json @@ -2925,5 +2925,70 @@ ] } } + }, + "erf": { + "group": "activation", + "profile": [ + "tosa-mi" + ], + "generation": { + "standard": { + "generator_args": [ + [ + "--target-dtype", + "fp32", + "--target-dtype", + "fp16", + "--target-dtype", + "bf16", + "--fp-values-range", + "-2.0,2.0", + "--tensor-dim-range", + "18,60", + "--target-rank", + "1", + "--target-rank", + "2", + "--target-rank", + "3" + ], + [ + "--target-dtype", + "fp32", + "--target-dtype", + "fp16", + "--target-dtype", + "bf16", + "--fp-values-range", + "-2.0,2.0", + "--tensor-dim-range", + "1,24", + "--target-rank", + "4", + "--target-rank", + "5" + ], + [ + "--target-dtype", + "fp32", + "--fp-values-range", + "-2.0,2.0", + "--target-shape", + "1,65535,2,1,1", + "--target-shape", + "1,65540,1,2" + ] + ] + } + }, + "selection": { + "default": { + "params": {}, + "permutes": [ + "shape", + "type" + ] + } + } } }
\ No newline at end of file diff --git a/verif/frameworks/test_builder.py b/verif/frameworks/test_builder.py index 1b681d2..fcd72a3 100644 --- a/verif/frameworks/test_builder.py +++ b/verif/frameworks/test_builder.py @@ -348,6 +348,15 @@ class TBuilder: def eval(self, a): return tf.math.tanh(a, name=self.result_name) + class Erf: + # tfl.ops cannot be generated right now. + # https://github.com/tensorflow/tensorflow/issues/60809 + def __init__(self, name): + self.result_name = name + + def eval(self, a): + return tf.math.erf(a, name=self.result_name) + class Sin: def __init__(self, name): self.result_name = name diff --git a/verif/frameworks/tosa_verif_framework_generator.py b/verif/frameworks/tosa_verif_framework_generator.py index ccbe742..02ab8aa 100755 --- a/verif/frameworks/tosa_verif_framework_generator.py +++ b/verif/frameworks/tosa_verif_framework_generator.py @@ -338,6 +338,13 @@ TF_OP_LIST = { ), }, }, + "erf": { + "operands": (1, 0), + "build_fcn": (TBuilder.Erf, TGen.tgBasic, ArgGen.agNone), + "types": { + "tf": TYPE_F, + }, + }, "sin": { "operands": (1, 0), "build_fcn": (TBuilder.Sin, TGen.tgBasic, ArgGen.agNone), diff --git a/verif/generator/tosa_test_gen.py b/verif/generator/tosa_test_gen.py index 66084b4..bd371eb 100644 --- a/verif/generator/tosa_test_gen.py +++ b/verif/generator/tosa_test_gen.py @@ -1177,6 +1177,37 @@ class TosaTestGen: self.ser.addOperator(op["op"], input_list, output_list) return result_tens + def build_erf(self, op, a, validator_fcns=None, error_name=None): + result_tens = OutputShaper.unaryOp(self.ser, self.rng, a, error_name) + + # Invalidate Input/Output list for error if checks. + input_list = [a.name] + output_list = [result_tens.name] + pCount, cCount = op["operands"] + num_operands = pCount + cCount + input_list, output_list = TosaErrorIfArgGen.eiInvalidateInputOutputList( + self, error_name, input_list, output_list + ) + + if not TosaErrorValidator.evValidateErrorIfs( + self.ser, + validator_fcns, + error_name, + op=op, + input_shape=a.shape, + output_shape=result_tens.shape, + input_dtype=a.dtype, + output_dtype=result_tens.dtype, + result_tensors=[result_tens], + input_list=input_list, + output_list=output_list, + num_operands=num_operands, + ): + return None + + self.ser.addOperator(op["op"], input_list, output_list) + return result_tens + def build_concat(self, op, *a, validator_fcns=None, error_name=None): if error_name != ErrorIf.WrongInputType: assert type(a[-1]) == int @@ -2907,6 +2938,23 @@ class TosaTestGen: TosaErrorValidator.evWrongOutputList, ), }, + "erf": { + "op": Op.ERF, + "operands": (1, 0), + "build_fcn": ( + build_erf, + TosaTensorGen.tgBasic, + TosaTensorValuesGen.tvgDefault, + None, + ), + "types": TYPE_FP, + "error_if_validators": ( + TosaErrorValidator.evWrongInputType, + TosaErrorValidator.evWrongOutputType, + TosaErrorValidator.evWrongInputList, + TosaErrorValidator.evWrongOutputList, + ), + }, # Elementwise Binary Operators "add": { "op": Op.ADD, |