Updating CONV2D_3X1 tests for ofm_depth fix Regen

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

1 files changed, 221 insertions, 1091 deletions

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