Updating CONV2D_3X1 tests for ofm_depth fix Regen

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

1 files changed, 205 insertions, 1171 deletions

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