From 93d4390f9aa5c4369f889e1cd336aa4e809ff6a7 Mon Sep 17 00:00:00 2001 From: Jeremy Johnson Date: Tue, 27 Sep 2022 12:26:14 +0100 Subject: Minor fixes & add FP16 support to refmodel testing and conformance gen Improve base inference conformance generation: * Change to target specific dtypes required for conformance tests. * Reduce dimension sizes of ERROR_IF tests. NOTE: Will impact tensor, clamp and all ERROR_IF tests. Add option to change seed on conformance generation for extra testing. Stop creation of convolution tests with negative output dimensions. Improve reporting on failing to allocate tensor due to above issue. Fix runner to correctly pass ref model debug flags. Update reference_model examples. Signed-off-by: Jeremy Johnson Change-Id: I992180dcfe265a7d50edfb151c9f38eeaef5c369 --- verif/conformance/tosa_base_profile_ops_info.json | 434 ++++++++++++++-------- 1 file changed, 279 insertions(+), 155 deletions(-) (limited to 'verif/conformance/tosa_base_profile_ops_info.json') diff --git a/verif/conformance/tosa_base_profile_ops_info.json b/verif/conformance/tosa_base_profile_ops_info.json index 2af4c47..9dd5592 100644 --- a/verif/conformance/tosa_base_profile_ops_info.json +++ b/verif/conformance/tosa_base_profile_ops_info.json @@ -25,12 +25,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int32" + "1,65539,1,1,1" ] ], "params": {}, @@ -69,12 +69,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int32" + "1,65539,1,1,1" ] ], "params": {}, @@ -119,12 +119,12 @@ "2" ], [ + "--target-dtype", + "int8", "--target-shape", "1,3,1,65535", "--target-shape", "1,65538,1,2", - "--target-dtype", - "int8", "--num-rand-permutations", "2" ] @@ -143,6 +143,12 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", "--tensor-dim-range", "16,64", "--target-rank", @@ -153,6 +159,12 @@ "3" ], [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", "--tensor-dim-range", "1,16", "--target-rank", @@ -161,12 +173,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int8" + "1,65539,1,1,1" ] ], "params": {}, @@ -184,6 +196,10 @@ "group": "tensor", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--target-shape", "1,49,42,28", "--target-shape", @@ -191,12 +207,12 @@ "--allow-pooling-and-conv-oversizes" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65535,5,1", "--target-shape", "1,3,65537,1", - "--target-dtype", - "int8", "--allow-pooling-and-conv-oversizes" ] ], @@ -224,6 +240,12 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", "--tensor-dim-range", "1,64", "--target-rank", @@ -244,12 +266,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65536,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int8" + "1,65539,1,1,1" ] ], "params": {}, @@ -266,6 +288,12 @@ "group": "ew_unary", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", "--tensor-dim-range", "2,64", "--target-rank", @@ -286,12 +314,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65537,1", "--target-shape", - "1,65538,1,1,1", - "--target-dtype", - "int8" + "1,65538,1,1,1" ] ], "params": {}, @@ -308,6 +336,12 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", "--tensor-dim-range", "3,64", "--target-rank", @@ -328,12 +362,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65538,1", "--target-shape", - "1,65537,1,1,1", - "--target-dtype", - "int8" + "1,65537,1,1,1" ] ], "params": {}, @@ -350,6 +384,12 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", "--tensor-dim-range", "4,64", "--target-rank", @@ -370,12 +410,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65536,1", "--target-shape", - "1,65536,1,1,1", - "--target-dtype", - "int8" + "1,65536,1,1,1" ] ], "params": {}, @@ -426,12 +466,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535,1,1", "--target-shape", - "1,65538,1,2", - "--target-dtype", - "int8" + "1,65538,1,2" ] ], "params": { @@ -458,6 +498,10 @@ "group": "activation", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--tensor-dim-range", "20,64", "--target-rank", @@ -468,6 +512,10 @@ "3" ], [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--tensor-dim-range", "1,20", "--target-rank", @@ -476,12 +524,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,1,65536", "--target-shape", - "1,3,65537,1,1", - "--target-dtype", - "int8" + "1,3,65537,1,1" ] ], "params": {}, @@ -520,12 +568,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int32" + "1,65539,1,1,1" ] ], "params": {}, @@ -580,12 +628,12 @@ "1" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535,1,1", "--target-shape", "1,65538,1,2", - "--target-dtype", - "int8", "--num-const-inputs-concat", "2" ] @@ -614,10 +662,10 @@ "int32" ], [ - "--target-shape", - "3,22,17,1,2", "--target-dtype", - "int32" + "int32", + "--target-shape", + "3,22,17,1,2" ] ], "params": {}, @@ -668,12 +716,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65537,1,1", "--target-shape", - "1,65530,1,2", - "--target-dtype", - "int8" + "1,65530,1,2" ] ], "params": {}, @@ -690,6 +738,10 @@ "group": "tensor", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--target-shape", "1,49,42,28", "--target-shape", @@ -697,12 +749,12 @@ "--allow-pooling-and-conv-oversizes" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65535,4,1", "--target-shape", "1,5,65536,1", - "--target-dtype", - "int8", "--max-conv-dilation", "1", "--allow-pooling-and-conv-oversizes" @@ -735,23 +787,23 @@ "group": "tensor", "generator_args": [ [ - "--target-shape", - "1,9,21,14,1", - "--target-shape", - "1,9,11,12,3", "--target-dtype", "int8", "--target-dtype", "int16", + "--target-shape", + "1,9,21,14,1", + "--target-shape", + "1,9,11,12,3", "--allow-pooling-and-conv-oversizes" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535,3,1", "--target-shape", "1,1,3,65536,1", - "--target-dtype", - "int8", "--max-conv-dilation", "1", "--allow-pooling-and-conv-oversizes" @@ -785,6 +837,10 @@ "group": "tensor", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--target-shape", "1,9,44,3", "--target-shape", @@ -792,12 +848,12 @@ "--allow-pooling-and-conv-oversizes" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65532,2,1", "--target-shape", "1,4,65537,1", - "--target-dtype", - "int8", "--max-conv-dilation", "1", "--allow-pooling-and-conv-oversizes" @@ -852,12 +908,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65501,1", "--target-shape", - "1,65541,1,1,1", - "--target-dtype", - "int32" + "1,65541,1,1,1" ] ], "params": {}, @@ -880,24 +936,24 @@ "int16" ], [ + "--target-dtype", + "int8", "--target-shape", "444,1", "--target-shape", "3,65538", "--tensor-dim-range", - "1,2", - "--target-dtype", - "int8" + "1,2" ], [ + "--target-dtype", + "int8", "--target-shape", "3,16", "--target-shape", "1,23", "--tensor-dim-range", - "100,200", - "--target-dtype", - "int8" + "100,200" ] ], "params": {}, @@ -922,14 +978,14 @@ "4,64" ], [ + "--target-dtype", + "int8", "--target-shape", "2,65533,1", "--target-shape", "1,2,65533", "--target-shape", - "5000,1,1", - "--target-dtype", - "int8" + "5000,1,1" ] ], "params": {}, @@ -974,12 +1030,12 @@ [ "--filter", "^greater$", + "--target-dtype", + "int32", "--target-shape", "1,2,65530,1", "--target-shape", - "1,65539,1,2,1", - "--target-dtype", - "int32" + "1,65539,1,2,1" ] ], "params": {}, @@ -1018,12 +1074,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,3,1", - "--target-dtype", - "int32" + "1,65539,1,3,1" ] ], "params": {}, @@ -1075,12 +1131,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65536,1,1", "--target-shape", - "1,65531,1,2", - "--target-dtype", - "int8" + "1,65531,1,2" ] ], "params": {}, @@ -1119,12 +1175,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,65533,1", "--target-shape", - "1,1,65539,1,1", - "--target-dtype", - "int32" + "1,1,65539,1,1" ] ], "params": {}, @@ -1141,6 +1197,8 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "bool", "--tensor-dim-range", "1,64", "--target-rank", @@ -1151,6 +1209,8 @@ "3" ], [ + "--target-dtype", + "bool", "--tensor-dim-range", "1,16", "--target-rank", @@ -1159,6 +1219,8 @@ "5" ], [ + "--target-dtype", + "bool", "--target-shape", "1,65538,1", "--target-shape", @@ -1209,12 +1271,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65532,1,1", "--target-shape", - "1,2,1,65538", - "--target-dtype", - "int8" + "1,2,1,65538" ] ], "params": {}, @@ -1231,6 +1293,8 @@ "group": "ew_unary", "generator_args": [ [ + "--target-dtype", + "bool", "--tensor-dim-range", "2,64", "--target-rank", @@ -1241,6 +1305,8 @@ "3" ], [ + "--target-dtype", + "bool", "--tensor-dim-range", "1,15", "--target-rank", @@ -1249,6 +1315,8 @@ "5" ], [ + "--target-dtype", + "bool", "--target-shape", "1,65537,1", "--target-shape", @@ -1269,6 +1337,8 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "bool", "--tensor-dim-range", "3,64", "--target-rank", @@ -1279,6 +1349,8 @@ "3" ], [ + "--target-dtype", + "bool", "--tensor-dim-range", "1,14", "--target-rank", @@ -1287,6 +1359,8 @@ "5" ], [ + "--target-dtype", + "bool", "--target-shape", "1,65536,1", "--target-shape", @@ -1337,12 +1411,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65540,3", "--target-shape", - "2,1,65530,1,1", - "--target-dtype", - "int8" + "2,1,65530,1,1" ] ], "params": {}, @@ -1359,6 +1433,8 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "bool", "--tensor-dim-range", "4,64", "--target-rank", @@ -1369,6 +1445,8 @@ "3" ], [ + "--target-dtype", + "bool", "--tensor-dim-range", "3,16", "--target-rank", @@ -1377,6 +1455,8 @@ "5" ], [ + "--target-dtype", + "bool", "--target-shape", "1,65539,1", "--target-shape", @@ -1413,14 +1493,14 @@ "1,16" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65532,1", "--target-shape", "1,2,65538", "--target-shape", - "2000,1,1", - "--target-dtype", - "int8" + "2000,1,1" ] ], "params": {}, @@ -1459,12 +1539,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int32" + "1,65539,1,1,1" ] ], "params": {}, @@ -1481,6 +1561,10 @@ "group": "tensor", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--target-shape", "1,4,75,3", "--target-shape", @@ -1488,14 +1572,14 @@ "--allow-pooling-and-conv-oversizes" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65535,5,1", "--target-shape", "1,3,65537,1", "--target-shape", "33333,3,2,1", - "--target-dtype", - "int8", "--allow-pooling-and-conv-oversizes" ] ], @@ -1545,12 +1629,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int32" + "1,65539,1,1,1" ] ], "params": {}, @@ -1597,12 +1681,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65500,1", "--target-shape", - "1,68539,1,1,1", - "--target-dtype", - "int8" + "1,68539,1,1,1" ] ], "params": {}, @@ -1651,12 +1735,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "3,1,65540,1", "--target-shape", - "1,1,2,1,65531", - "--target-dtype", - "int8" + "1,1,2,1,65531" ] ], "params": {}, @@ -1673,8 +1757,6 @@ "group": "data_layout", "generator_args": [ [ - "--tensor-dim-range", - "1,64", "--target-dtype", "int8", "--target-dtype", @@ -1683,6 +1765,8 @@ "int32", "--target-dtype", "bool", + "--tensor-dim-range", + "1,64", "--target-rank", "1", "--target-rank", @@ -1691,8 +1775,6 @@ "3" ], [ - "--tensor-dim-range", - "1,16", "--target-dtype", "int8", "--target-dtype", @@ -1701,22 +1783,24 @@ "int32", "--target-dtype", "bool", + "--tensor-dim-range", + "1,16", "--target-rank", "4" ], [ + "--target-dtype", + "int16", "--tensor-dim-range", "1,16", "--target-rank", - "5", - "--target-dtype", - "int16" + "5" ], [ - "--target-shape", - "1,1,65537,1", "--target-dtype", - "int8" + "int8", + "--target-shape", + "1,1,65537,1" ] ], "params": {}, @@ -1743,10 +1827,14 @@ "group": "reduction", "generator_args": [ [ + "--target-dtype", + "bool", "--tensor-dim-range", "1,32" ], [ + "--target-dtype", + "bool", "--target-shape", "65530,1,1,1", "--target-shape", @@ -1768,10 +1856,14 @@ "group": "reduction", "generator_args": [ [ + "--target-dtype", + "bool", "--tensor-dim-range", "1,32" ], [ + "--target-dtype", + "bool", "--target-shape", "65530,1,1,1", "--target-shape", @@ -1803,12 +1895,12 @@ "1,32" ], [ + "--target-dtype", + "int8", "--target-shape", "65530,1,1,1", "--target-shape", - "2,65538,1,1", - "--target-dtype", - "int8" + "2,65538,1,1" ] ], "params": {}, @@ -1836,12 +1928,12 @@ "1,24" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65538,1", "--target-shape", - "2,65535,1,1", - "--target-dtype", - "int8" + "2,65535,1,1" ] ], "params": {}, @@ -1865,12 +1957,12 @@ "1,32" ], [ + "--target-dtype", + "int32", "--target-shape", "3,65532,1,1", "--target-shape", - "65536,1,1,2", - "--target-dtype", - "int32" + "65536,1,1,2" ] ], "params": {}, @@ -1888,6 +1980,18 @@ "group": "type_conversion", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", + "--target-dtype", + "int48", + "--target-dtype", + "uint8", + "--target-dtype", + "uint16", "--tensor-dim-range", "16,32", "--target-rank", @@ -1898,6 +2002,18 @@ "3" ], [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", + "--target-dtype", + "int32", + "--target-dtype", + "int48", + "--target-dtype", + "uint8", + "--target-dtype", + "uint16", "--tensor-dim-range", "1,16", "--target-rank", @@ -1906,12 +2022,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1", - "--target-dtype", - "int8" + "1,65539,1,1" ] ], "params": { @@ -1967,12 +2083,12 @@ "2" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535,1", "--target-shape", "1,65538,1,2", - "--target-dtype", - "int8", "--num-rand-permutations", "2" ] @@ -1999,10 +2115,10 @@ "int16" ], [ - "--target-shape", - "1,3,16383,1", "--target-dtype", "int8", + "--target-shape", + "1,3,16383,1", "--max-resize-output-dim", "9500" ] @@ -2033,12 +2149,12 @@ "1,32" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535", "--target-shape", - "1,65540,1,2", - "--target-dtype", - "int8" + "1,65540,1,2" ] ], "params": {}, @@ -2063,14 +2179,14 @@ "4,64" ], [ + "--target-dtype", + "int8", "--target-shape", "1,65540,1", "--target-shape", "1,1,65533", "--target-shape", - "3000,7,1", - "--target-dtype", - "int8" + "3000,7,1" ] ], "params": {}, @@ -2121,12 +2237,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535,1", "--target-shape", "1,65538,1,2", - "--target-dtype", - "int8", "--num-rand-permutations", "2" ] @@ -2181,12 +2297,12 @@ "2" ], [ + "--target-dtype", + "int8", "--target-shape", "1,1,65535,1", "--target-shape", "1,65538,1,2", - "--target-dtype", - "int8", "--num-rand-permutations", "2" ] @@ -2228,12 +2344,12 @@ "5" ], [ + "--target-dtype", + "int32", "--target-shape", "1,2,65533,1", "--target-shape", - "1,65539,1,1,1", - "--target-dtype", - "int32" + "1,65539,1,1,1" ] ], "params": {}, @@ -2250,6 +2366,10 @@ "group": "ew_binary", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--tensor-dim-range", "16,64", "--target-rank", @@ -2260,6 +2380,10 @@ "3" ], [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--tensor-dim-range", "1,16", "--target-rank", @@ -2268,12 +2392,12 @@ "5" ], [ + "--target-dtype", + "int8", "--target-shape", "1,2,65536,1", "--target-shape", - "1,65537,1,1,3", - "--target-dtype", - "int8" + "1,65537,1,1,3" ] ], "params": {}, @@ -2298,12 +2422,12 @@ "4,32" ], [ + "--target-dtype", + "int8", "--target-shape", "65533", "--target-shape", - "1,2,65540,1", - "--target-dtype", - "int8" + "1,2,65540,1" ] ], "params": {}, @@ -2352,12 +2476,12 @@ [ "--filter", "^transpose$", + "--target-dtype", + "int8", "--target-shape", "1,65537,1,2", "--target-shape", "65535,1,1,1", - "--target-dtype", - "int8", "--num-rand-permutations", "1" ] @@ -2377,21 +2501,21 @@ "group": "tensor", "generator_args": [ [ + "--target-dtype", + "int8", + "--target-dtype", + "int16", "--target-shape", "1,49,33,1", "--target-shape", "2,11,33,3", - "--target-dtype", - "int16", - "--target-dtype", - "int8", "--allow-pooling-and-conv-oversizes" ], [ - "--target-shape", - "1,65536,1,1", "--target-dtype", "int8", + "--target-shape", + "1,65536,1,1", "--max-conv-dilation", "1" ] @@ -2427,12 +2551,12 @@ "int32" ], [ + "--target-dtype", + "int32", "--target-shape", "3,22,17,1,2", "--target-shape", - "1,65537,2,1", - "--target-dtype", - "int32" + "1,65537,2,1" ] ], "params": {}, -- cgit v1.2.1