Updating DEPTHWISE_CONV2D_2X2 tests for ofm_depth fix Regen

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

1 files changed, 113 insertions, 401 deletions

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