Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 128 insertions, 1472 deletions

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