Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 124 insertions, 1468 deletions

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