Regen for max-batch-size/ofm_depth bug fixes

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

1 files changed, 927 insertions, 107 deletions

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