Updating CONV2D_1X1 tests for ofm_depth fix Regen

Signed-off-by: James Ward <james.ward@arm.com>
Change-Id: I9cd4cb91b2996145247028e8aafa6cf1b77aa71f

1 files changed, 120 insertions, 1464 deletions

diff --git a/operators/tensor/conv2d_1x1/conv2d_1x1_1x16x51x7_bf16xbf16_accf32_st12_pad1000_dilat21/test.json b/operators/tensor/conv2d_1x1/conv2d_1x1_1x16x51x7_bf16xbf16_accf32_st12_pad1000_dilat21/test.json
index 081f7900b..061923319 100644
--- a/operators/tensor/conv2d_1x1/conv2d_1x1_1x16x51x7_bf16xbf16_accf32_st12_pad1000_dilat21/test.json
+++ b/operators/tensor/conv2d_1x1/conv2d_1x1_1x16x51x7_bf16xbf16_accf32_st12_pad1000_dilat21/test.json
@@ -77,7 +77,7 @@
             {
               name: "const-1",
               shape: [
-                55,
+                13,
                 1,
                 1,
                 7
@@ -86,1773 +86,429 @@
               data: [
                 0,
                 0,
-                178,
-                191,
-                0,
-                0,
-                219,
-                191,
-                0,
-                0,
-                47,
-                63,
-                0,
-                0,
-                248,
-                63,
-                0,
-                0,
-                183,
-                62,
-                0,
-                0,
-                59,
-                191,
-                0,
-                0,
-                36,
-                191,
-                0,
-                0,
-                112,
-                63,
-                0,
-                0,
-                202,
-                63,
-                0,
-                0,
-                172,
-                63,
-                0,
-                0,
-                254,
-                63,
-                0,
-                0,
-                183,
-                63,
-                0,
-                0,
-                184,
-                190,
-                0,
-                0,
-                90,
-                61,
-                0,
-                0,
-                213,
-                191,
-                0,
-                0,
-                87,
-                191,
-                0,
-                0,
-                40,
+                212,
                 191,
                 0,
                 0,
                 161,
-                63,
-                0,
-                0,
-                77,
-                63,
-                0,
-                0,
-                155,
                 191,
                 0,
                 0,
-                161,
+                155,
                 191,
                 0,
                 0,
-                140,
-                63,
-                0,
-                0,
-                235,
+                250,
                 63,
                 0,
                 0,
-                143,
-                191,
-                0,
-                0,
+                10,
                 190,
-                191,
                 0,
                 0,
                 199,
-                63,
-                0,
-                0,
-                183,
-                63,
-                0,
-                0,
-                138,
-                190,
-                0,
-                0,
-                83,
-                63,
-                0,
-                0,
-                191,
-                190,
-                0,
-                0,
-                89,
-                191,
-                0,
-                0,
-                133,
-                63,
-                0,
-                0,
-                142,
-                63,
-                0,
-                0,
-                40,
-                190,
-                0,
-                0,
-                133,
-                191,
-                0,
-                0,
-                103,
-                63,
-                0,
-                0,
-                115,
-                63,
-                0,
-                0,
-                226,
-                191,
-                0,
-                0,
-                174,
-                63,
-                0,
-                0,
-                172,
-                63,
-                0,
-                0,
-                178,
-                63,
-                0,
-                0,
-                14,
-                191,
-                0,
-                0,
-                202,
-                191,
-                0,
-                0,
-                226,
-                63,
-                0,
-                0,
-                16,
-                63,
-                0,
-                0,
-                212,
-                63,
-                0,
-                0,
-                204,
-                63,
-                0,
-                0,
-                113,
-                191,
-                0,
-                0,
-                95,
-                191,
-                0,
-                0,
-                134,
                 191,
                 0,
                 0,
-                169,
-                191,
-                0,
-                0,
-                185,
-                190,
-                0,
-                0,
-                40,
-                191,
-                0,
-                0,
-                253,
-                190,
-                0,
-                0,
-                202,
-                191,
-                0,
-                0,
-                158,
-                63,
-                0,
-                0,
-                180,
-                191,
-                0,
-                0,
-                3,
-                191,
-                0,
-                0,
-                91,
-                191,
-                0,
-                0,
-                24,
-                191,
-                0,
-                0,
-                87,
-                190,
-                0,
-                0,
-                163,
-                63,
-                0,
-                0,
-                243,
-                191,
-                0,
-                0,
-                112,
-                63,
-                0,
-                0,
-                197,
-                63,
+                156,
+                62,
                 0,
                 0,
-                147,
+                194,
                 191,
                 0,
                 0,
-                214,
-                63,
-                0,
-                0,
-                239,
-                63,
-                0,
-                0,
-                187,
-                190,
-                0,
-                0,
-                64,
-                62,
-                0,
-                0,
-                3,
+                55,
                 191,
                 0,
                 0,
                 166,
-                63,
-                0,
-                0,
-                108,
-                63,
-                0,
-                0,
-                21,
-                62,
-                0,
-                0,
-                113,
-                62,
-                0,
-                0,
-                172,
                 191,
                 0,
                 0,
-                248,
-                62,
-                0,
-                0,
-                204,
-                63,
-                0,
-                0,
-                167,
-                63,
+                228,
+                60,
                 0,
                 0,
                 162,
-                63,
-                0,
-                0,
-                176,
-                190,
-                0,
-                0,
-                205,
-                63,
-                0,
-                0,
-                45,
-                190,
-                0,
-                0,
-                184,
-                190,
-                0,
-                0,
-                197,
-                63,
-                0,
-                0,
-                42,
-                63,
-                0,
-                0,
-                255,
-                191,
-                0,
-                0,
-                148,
-                62,
-                0,
-                0,
-                149,
-                63,
-                0,
-                0,
-                59,
-                63,
-                0,
-                0,
-                89,
-                191,
-                0,
-                0,
-                243,
                 191,
                 0,
                 0,
                 33,
-                63,
-                0,
-                0,
-                89,
-                63,
-                0,
-                0,
-                44,
-                63,
-                0,
-                0,
-                250,
-                191,
-                0,
-                0,
-                238,
-                63,
-                0,
-                0,
-                245,
-                63,
-                0,
-                0,
-                204,
-                191,
-                0,
-                0,
-                165,
-                63,
-                0,
-                0,
-                93,
-                191,
-                0,
-                0,
-                219,
                 190,
                 0,
                 0,
-                209,
-                191,
-                0,
-                0,
-                255,
-                191,
-                0,
-                0,
                 202,
-                63,
-                0,
-                0,
-                238,
-                191,
-                0,
-                0,
-                176,
-                191,
-                0,
-                0,
-                216,
-                63,
-                0,
-                0,
-                186,
-                191,
-                0,
-                0,
-                238,
-                191,
-                0,
-                0,
-                248,
                 190,
                 0,
                 0,
-                200,
-                63,
-                0,
-                0,
-                208,
-                191,
-                0,
-                0,
-                108,
+                126,
                 63,
                 0,
                 0,
-                23,
-                191,
-                0,
-                0,
-                40,
-                191,
-                0,
-                0,
                 198,
                 191,
                 0,
                 0,
-                148,
-                63,
-                0,
-                0,
-                30,
-                63,
-                0,
-                0,
-                74,
-                63,
-                0,
-                0,
-                159,
-                191,
-                0,
-                0,
-                170,
-                191,
-                0,
-                0,
-                195,
-                190,
-                0,
-                0,
-                174,
-                191,
-                0,
-                0,
-                9,
-                191,
-                0,
-                0,
-                231,
-                191,
-                0,
-                0,
-                86,
-                191,
-                0,
-                0,
-                169,
-                63,
-                0,
-                0,
-                225,
-                63,
-                0,
-                0,
-                223,
-                62,
-                0,
-                0,
-                212,
-                191,
-                0,
-                0,
-                152,
-                61,
-                0,
-                0,
-                200,
+                36,
                 63,
                 0,
                 0,
-                243,
-                191,
-                0,
-                0,
-                213,
+                82,
                 191,
                 0,
                 0,
-                247,
-                63,
+                82,
+                189,
                 0,
                 0,
-                103,
+                143,
                 62,
                 0,
                 0,
-                223,
-                191,
-                0,
-                0,
-                245,
-                191,
-                0,
-                0,
-                161,
-                63,
-                0,
-                0,
-                20,
-                191,
-                0,
-                0,
-                19,
-                191,
-                0,
-                0,
-                71,
-                63,
-                0,
-                0,
-                155,
+                105,
                 63,
                 0,
                 0,
                 164,
-                61,
-                0,
-                0,
-                173,
-                62,
-                0,
-                0,
-                179,
                 63,
                 0,
                 0,
-                30,
-                190,
-                0,
-                0,
-                160,
-                191,
-                0,
-                0,
-                193,
-                191,
-                0,
-                0,
-                22,
-                191,
-                0,
-                0,
-                213,
+                156,
                 63,
                 0,
                 0,
-                133,
-                191,
-                0,
-                0,
-                128,
+                16,
                 63,
                 0,
                 0,
-                50,
-                191,
-                0,
-                0,
-                117,
-                62,
-                0,
-                0,
-                227,
-                191,
-                0,
-                0,
-                245,
-                62,
-                0,
-                0,
-                178,
-                62,
-                0,
-                0,
-                81,
+                164,
                 63,
                 0,
                 0,
-                183,
-                190,
-                0,
-                0,
-                179,
+                6,
                 63,
                 0,
                 0,
-                242,
-                60,
-                0,
-                0,
-                248,
+                152,
                 63,
                 0,
                 0,
-                188,
-                189,
-                0,
-                0,
-                169,
+                38,
                 63,
                 0,
                 0,
-                208,
-                190,
-                0,
-                0,
-                122,
-                191,
-                0,
-                0,
-                255,
-                191,
-                0,
-                0,
-                199,
+                174,
                 63,
                 0,
                 0,
-                141,
-                191,
-                0,
-                0,
-                203,
-                191,
-                0,
-                0,
-                197,
+                143,
                 62,
                 0,
                 0,
-                236,
+                25,
                 191,
                 0,
                 0,
-                166,
-                189,
-                0,
-                0,
-                82,
-                63,
-                0,
-                0,
-                223,
-                191,
-                0,
-                0,
-                10,
-                191,
+                187,
+                62,
                 0,
                 0,
-                165,
+                200,
                 63,
                 0,
                 0,
-                178,
+                206,
                 191,
                 0,
                 0,
-                212,
-                190,
-                0,
-                0,
-                1,
+                183,
                 191,
                 0,
                 0,
-                224,
-                190,
-                0,
-                0,
-                167,
+                247,
                 63,
                 0,
                 0,
+                120,
                 191,
-                63,
                 0,
                 0,
-                167,
+                187,
                 63,
                 0,
                 0,
-                62,
+                72,
                 191,
                 0,
                 0,
-                171,
-                190,
-                0,
-                0,
-                128,
-                63,
-                0,
-                0,
-                173,
+                42,
                 63,
                 0,
                 0,
-                173,
-                191,
-                0,
-                0,
-                248,
+                148,
                 191,
                 0,
                 0,
-                123,
+                130,
                 190,
                 0,
                 0,
-                131,
+                119,
                 191,
                 0,
                 0,
-                7,
-                63,
-                0,
-                0,
-                54,
-                63,
-                0,
-                0,
-                214,
+                17,
                 189,
                 0,
                 0,
-                166,
-                191,
-                0,
-                0,
-                144,
-                63,
-                0,
-                0,
-                174,
-                191,
-                0,
-                0,
-                232,
-                190,
-                0,
-                0,
-                193,
+                248,
                 190,
                 0,
                 0,
-                113,
-                63,
-                0,
-                0,
                 171,
                 191,
                 0,
                 0,
-                162,
-                190,
-                0,
-                0,
-                74,
-                63,
-                0,
-                0,
-                171,
-                191,
-                0,
-                0,
-                1,
-                63,
-                0,
-                0,
-                136,
+                189,
                 63,
                 0,
                 0,
-                161,
+                72,
                 63,
                 0,
                 0,
-                151,
+                76,
                 63,
                 0,
                 0,
-                166,
-                62,
-                0,
-                0,
-                20,
+                61,
                 191,
                 0,
                 0,
-                237,
-                63,
-                0,
-                0,
-                188,
+                62,
                 63,
                 0,
                 0,
-                97,
-                191,
-                0,
-                0,
-                183,
-                191,
-                0,
-                0,
-                186,
+                111,
                 63,
                 0,
                 0,
-                203,
-                191,
-                0,
-                0,
-                174,
+                81,
                 191,
                 0,
                 0,
-                184,
-                190,
-                0,
-                0,
-                96,
+                245,
                 190,
                 0,
                 0,
-                216,
-                191,
-                0,
-                0,
-                56,
-                63,
-                0,
-                0,
-                208,
-                63,
-                0,
-                0,
-                146,
-                63,
-                0,
-                0,
-                228,
-                191,
-                0,
-                0,
-                146,
-                191,
-                0,
-                0,
-                183,
-                191,
-                0,
-                0,
-                168,
-                191,
-                0,
-                0,
-                182,
-                191,
-                0,
-                0,
-                132,
-                63,
-                0,
-                0,
-                39,
-                63,
-                0,
-                0,
-                204,
-                62,
-                0,
-                0,
-                185,
+                150,
                 191,
                 0,
                 0,
-                242,
+                6,
                 191,
                 0,
                 0,
-                178,
+                11,
                 191,
                 0,
                 0,
-                237,
+                134,
                 190,
                 0,
                 0,
-                156,
-                191,
-                0,
-                0,
-                115,
-                191,
-                0,
-                0,
-                93,
-                63,
-                0,
-                0,
-                79,
+                82,
                 191,
                 0,
                 0,
-                148,
+                246,
                 191,
                 0,
                 0,
-                119,
+                147,
                 191,
                 0,
                 0,
-                168,
-                190,
-                0,
-                0,
-                51,
+                203,
                 63,
                 0,
                 0,
-                231,
-                191,
-                0,
-                0,
-                125,
+                170,
                 63,
                 0,
                 0,
-                175,
-                190,
-                0,
-                0,
-                54,
-                62,
-                0,
                 0,
-                194,
                 63,
                 0,
                 0,
-                216,
-                191,
-                0,
-                0,
-                224,
-                191,
-                0,
-                0,
-                206,
-                62,
-                0,
-                0,
-                72,
-                191,
-                0,
-                0,
-                151,
-                191,
-                0,
-                0,
-                156,
-                190,
-                0,
-                0,
-                235,
-                191,
-                0,
-                0,
                 171,
-                62,
-                0,
-                0,
-                28,
-                191,
-                0,
-                0,
-                52,
-                62,
-                0,
-                0,
-                252,
-                63,
-                0,
-                0,
-                192,
-                191,
-                0,
-                0,
-                50,
-                191,
-                0,
-                0,
-                128,
-                191,
-                0,
-                0,
-                162,
-                191,
-                0,
-                0,
-                239,
-                63,
-                0,
-                0,
-                201,
-                191,
-                0,
-                0,
-                157,
-                191,
-                0,
-                0,
-                248,
-                63,
-                0,
-                0,
-                161,
-                63,
-                0,
-                0,
-                180,
                 190,
                 0,
                 0,
-                217,
-                191,
+                157,
+                62,
                 0,
                 0,
-                170,
-                191,
+                57,
+                61,
                 0,
                 0,
-                216,
+                64,
                 191,
                 0,
                 0,
-                250,
+                136,
                 63,
                 0,
                 0,
-                235,
+                147,
                 63,
                 0,
                 0,
-                68,
+                184,
                 191,
                 0,
                 0,
-                150,
-                63,
-                0,
-                0,
                 197,
                 63,
                 0,
                 0,
-                34,
-                191,
-                0,
-                0,
-                224,
-                191,
-                0,
-                0,
-                132,
-                63,
-                0,
-                0,
-                120,
-                191,
-                0,
-                0,
                 216,
-                63,
-                0,
-                0,
-                201,
-                63,
-                0,
-                0,
-                233,
-                63,
-                0,
-                0,
-                221,
-                191,
-                0,
-                0,
-                34,
-                62,
-                0,
-                0,
-                226,
-                62,
-                0,
-                0,
-                92,
-                63,
-                0,
-                0,
-                211,
-                63,
-                0,
-                0,
-                204,
-                63,
-                0,
-                0,
-                138,
-                190,
-                0,
-                0,
-                17,
-                190,
-                0,
-                0,
-                232,
-                190,
-                0,
-                0,
-                159,
-                62,
-                0,
-                0,
-                138,
                 191,
                 0,
                 0,
-                247,
-                62,
-                0,
-                0,
-                48,
-                63,
-                0,
-                0,
-                67,
-                63,
-                0,
-                0,
-                187,
-                190,
-                0,
-                0,
-                179,
-                63,
-                0,
-                0,
-                5,
-                190,
+                38,
+                61,
                 0,
                 0,
-                121,
+                238,
                 63,
                 0,
                 0,
-                75,
-                189,
-                0,
-                0,
-                182,
-                190,
-                0,
-                0,
-                83,
-                191,
-                0,
-                0,
-                67,
-                187,
-                0,
-                0,
-                128,
+                74,
                 63,
                 0,
                 0,
-                200,
-                191,
-                0,
-                0,
-                180,
+                151,
                 191,
                 0,
                 0,
-                255,
+                184,
                 63,
                 0,
                 0,
                 135,
-                189,
-                0,
-                0,
-                70,
-                63,
-                0,
-                0,
-                178,
-                63,
-                0,
-                0,
-                159,
                 191,
                 0,
                 0,
-                161,
-                62,
-                0,
-                0,
-                82,
-                189,
-                0,
-                0,
-                213,
-                62,
-                0,
-                0,
                 85,
                 63,
                 0,
                 0,
-                136,
-                190,
-                0,
-                0,
-                147,
-                191,
-                0,
-                0,
-                233,
-                191,
-                0,
-                0,
-                135,
-                190,
-                0,
-                0,
-                132,
+                179,
                 191,
                 0,
                 0,
-                44,
-                190,
-                0,
-                0,
-                20,
-                62,
-                0,
-                0,
-                87,
-                190,
-                0,
-                0,
-                135,
-                63,
-                0,
-                0,
-                132,
-                63,
-                0,
-                0,
-                39,
-                62,
-                0,
-                0,
-                138,
-                63,
-                0,
-                0,
-                6,
+                149,
                 63,
                 0,
                 0,
-                139,
-                191,
-                0,
-                0,
-                198,
-                191,
-                0,
-                0,
-                141,
-                62,
-                0,
-                0,
-                250,
-                190,
-                0,
-                0,
-                216,
-                190,
-                0,
-                0,
-                132,
+                179,
                 63,
                 0,
                 0,
                 204,
-                190,
-                0,
-                0,
-                97,
-                191,
-                0,
-                0,
-                11,
-                191,
-                0,
-                0,
-                234,
-                63,
-                0,
-                0,
-                221,
-                191,
-                0,
-                0,
-                110,
-                63,
-                0,
-                0,
-                21,
-                63,
-                0,
-                0,
-                122,
-                63,
-                0,
-                0,
-                38,
                 191,
                 0,
                 0,
-                50,
-                191,
-                0,
-                0,
-                66,
-                63,
-                0,
-                0,
-                254,
-                63,
-                0,
-                0,
-                137,
-                62,
-                0,
-                0,
-                218,
-                62,
-                0,
-                0,
-                151,
-                191,
-                0,
-                0,
-                234,
-                63,
-                0,
-                0,
-                162,
-                63,
-                0,
-                0,
-                50,
-                190,
-                0,
-                0,
-                173,
-                191,
-                0,
-                0,
-                74,
-                63,
-                0,
-                0,
                 211,
-                191,
-                0,
-                0,
-                181,
                 63,
                 0,
                 0,
-                61,
-                63,
-                0,
-                0,
-                165,
-                191,
-                0,
-                0,
-                201,
+                99,
                 190,
                 0,
                 0,
-                196,
-                63,
-                0,
-                0,
-                77,
-                191,
+                70,
+                61,
                 0,
                 0,
-                89,
+                198,
                 189,
                 0,
                 0,
-                199,
-                191,
-                0,
-                0,
-                94,
-                191,
-                0,
-                0,
-                118,
-                63,
-                0,
-                0,
-                161,
-                190,
-                0,
-                0,
-                224,
-                63,
-                0,
-                0,
-                150,
-                191,
-                0,
-                0,
-                85,
-                62,
-                0,
-                0,
-                114,
-                62,
-                0,
-                0,
-                1,
-                63,
-                0,
-                0,
-                35,
+                50,
                 63,
                 0,
                 0,
-                241,
-                62,
-                0,
-                0,
-                164,
-                189,
-                0,
-                0,
-                158,
+                167,
                 63,
                 0,
                 0,
-                233,
-                190,
-                0,
-                0,
-                191,
-                191,
-                0,
-                0,
-                221,
-                191,
-                0,
-                0,
-                48,
+                100,
                 191
               ]
             },
             {
               name: "const-2",
               shape: [
-                55
+                13
               ],
               type: "FP32",
               data: [
-                247,
-                90,
-                91,
-                190,
-                166,
-                123,
-                239,
-                191,
-                186,
                 211,
-                152,
+                171,
+                179,
                 63,
-                104,
-                28,
-                197,
-                190,
-                78,
-                5,
-                52,
-                191,
-                53,
-                117,
-                242,
-                189,
-                173,
-                119,
-                140,
-                191,
-                105,
-                45,
-                125,
-                191,
-                158,
-                33,
-                47,
-                191,
-                7,
-                192,
-                15,
+                26,
+                123,
+                149,
                 63,
-                219,
-                215,
-                132,
-                62,
-                60,
-                190,
-                3,
-                191,
-                90,
-                42,
-                19,
-                191,
                 36,
-                191,
-                149,
-                190,
-                123,
-                210,
-                238,
-                190,
+                71,
                 79,
-                134,
-                142,
+                62,
+                161,
+                75,
+                229,
                 63,
-                74,
-                226,
-                159,
-                188,
-                55,
-                142,
-                142,
-                190,
-                47,
-                168,
-                168,
+                67,
+                243,
+                229,
                 63,
-                56,
-                187,
-                89,
-                190,
-                176,
-                41,
-                60,
-                62,
-                140,
-                249,
-                211,
-                190,
-                53,
-                17,
-                245,
-                62,
-                19,
-                109,
-                103,
+                127,
+                167,
+                239,
+                189,
+                186,
+                147,
+                235,
                 63,
-                61,
                 15,
-                192,
-                191,
-                105,
-                89,
-                117,
-                62,
-                169,
-                214,
-                94,
                 191,
-                224,
-                123,
-                248,
-                189,
-                5,
-                184,
-                51,
-                63,
-                193,
-                221,
-                229,
-                62,
-                227,
-                30,
-                203,
+                67,
                 191,
-                70,
-                208,
-                204,
-                63,
-                62,
-                31,
-                62,
-                62,
+                107,
+                146,
                 150,
-                91,
-                14,
-                63,
-                105,
-                140,
-                50,
-                63,
-                47,
-                233,
-                154,
-                63,
-                197,
-                148,
-                92,
-                63,
-                173,
-                110,
-                207,
-                63,
-                218,
-                34,
-                75,
-                63,
-                211,
-                55,
-                225,
                 190,
-                125,
-                6,
-                210,
-                63,
-                237,
-                249,
-                171,
-                191,
-                171,
-                88,
-                228,
-                63,
-                174,
-                223,
-                213,
-                191,
-                158,
-                2,
-                162,
-                62,
-                1,
-                91,
-                22,
+                242,
+                245,
+                116,
+                190,
+                86,
+                204,
+                90,
                 191,
-                20,
-                234,
-                185,
-                189,
-                236,
-                132,
-                82,
-                63,
-                241,
-                51,
-                182,
-                63,
-                56,
-                109,
-                213,
-                189,
-                199,
-                24,
                 239,
+                40,
+                232,
                 63,
-                181,
-                124,
-                225,
-                191,
-                38,
-                34,
-                186,
-                63,
-                124,
-                84,
-                8,
-                63,
+                216,
                 32,
-                113,
-                159,
-                63
+                186,
+                62
               ]
             },
             {
@@ -1861,7 +517,7 @@
                 1,
                 17,
                 26,
-                55
+                13
               ],
               type: "FP32"
             }