Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 197 insertions, 995 deletions

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