Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 122 insertions, 1466 deletions

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