Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 127 insertions, 1471 deletions

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