Updating CONV2D_1X1 tests for ofm_depth fix Regen

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

1 files changed, 192 insertions, 906 deletions

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