Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 123 insertions, 1467 deletions

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