Regen tests after control flow operator support

Includes removing 3 tests that are not needed anymore.

Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: I2c62d95a7b053e9016000d90125e00862f94200e

1 files changed, 307 insertions, 302 deletions

diff --git a/operators/tensor/conv2d_1x1/conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json b/operators/tensor/conv2d_1x1/conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json
index 64de2ec16..4b423956b 100644
--- a/operators/tensor/conv2d_1x1/conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json
+++ b/operators/tensor/conv2d_1x1/conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json
@@ -5,320 +5,325 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "CONST",
-          attribute_type: "NONE",
-          inputs: [
+          name: "main",
+          operators: [
+            {
+              op: "CONST",
+              attribute_type: "NONE",
+              inputs: [
 
-          ],
-          outputs: [
-            "const-1"
-          ]
-        },
-        {
-          op: "CONST",
-          attribute_type: "NONE",
-          inputs: [
+              ],
+              outputs: [
+                "const-1"
+              ]
+            },
+            {
+              op: "CONST",
+              attribute_type: "NONE",
+              inputs: [
 
+              ],
+              outputs: [
+                "const-2"
+              ]
+            },
+            {
+              op: "CONV2D",
+              attribute_type: "ConvAttribute",
+              attribute: {
+                pad: [
+                  0,
+                  0,
+                  0,
+                  0
+                ],
+                stride: [
+                  1,
+                  1
+                ],
+                dilation: [
+                  1,
+                  1
+                ],
+                input_zp: 0,
+                weight_zp: -113,
+                accum_dtype: "INT48"
+              },
+              inputs: [
+                "input-0",
+                "const-1",
+                "const-2"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                1,
+                4,
+                2,
+                9
+              ],
+              type: "INT16"
+            },
+            {
+              name: "const-1",
+              shape: [
+                14,
+                1,
+                1,
+                9
+              ],
+              type: "INT8",
+              data: [
+                53,
+                190,
+                65,
+                10,
+                110,
+                40,
+                100,
+                122,
+                126,
+                62,
+                24,
+                158,
+                226,
+                249,
+                71,
+                22,
+                240,
+                165,
+                55,
+                238,
+                137,
+                200,
+                97,
+                158,
+                231,
+                3,
+                149,
+                170,
+                112,
+                23,
+                181,
+                171,
+                236,
+                57,
+                58,
+                177,
+                57,
+                101,
+                185,
+                134,
+                117,
+                5,
+                70,
+                209,
+                204,
+                185,
+                183,
+                248,
+                155,
+                87,
+                2,
+                106,
+                0,
+                205,
+                3,
+                167,
+                82,
+                56,
+                165,
+                20,
+                9,
+                179,
+                159,
+                66,
+                195,
+                4,
+                191,
+                39,
+                140,
+                219,
+                12,
+                240,
+                28,
+                174,
+                241,
+                65,
+                213,
+                168,
+                89,
+                71,
+                46,
+                76,
+                71,
+                63,
+                2,
+                132,
+                24,
+                197,
+                69,
+                247,
+                103,
+                24,
+                12,
+                107,
+                249,
+                224,
+                223,
+                96,
+                65,
+                169,
+                254,
+                223,
+                37,
+                141,
+                54,
+                62,
+                186,
+                166,
+                32,
+                193,
+                113,
+                70,
+                116,
+                8,
+                112,
+                131,
+                202,
+                128,
+                45,
+                2,
+                201,
+                206,
+                36,
+                174,
+                3,
+                29
+              ]
+            },
+            {
+              name: "const-2",
+              shape: [
+                14
+              ],
+              type: "INT48",
+              data: [
+                111,
+                61,
+                7,
+                208,
+                122,
+                186,
+                174,
+                90,
+                68,
+                227,
+                154,
+                23,
+                31,
+                65,
+                198,
+                146,
+                23,
+                225,
+                31,
+                139,
+                161,
+                153,
+                206,
+                175,
+                165,
+                145,
+                4,
+                213,
+                90,
+                163,
+                125,
+                36,
+                128,
+                229,
+                162,
+                188,
+                88,
+                73,
+                184,
+                19,
+                163,
+                135,
+                43,
+                246,
+                152,
+                104,
+                225,
+                206,
+                251,
+                205,
+                168,
+                128,
+                230,
+                102,
+                246,
+                204,
+                245,
+                37,
+                212,
+                84,
+                158,
+                25,
+                97,
+                163,
+                59,
+                223,
+                6,
+                191,
+                255,
+                212,
+                105,
+                19,
+                114,
+                1,
+                166,
+                138,
+                62,
+                17,
+                244,
+                205,
+                179,
+                36,
+                40,
+                84
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                4,
+                2,
+                14
+              ],
+              type: "INT16"
+            }
           ],
-          outputs: [
-            "const-2"
-          ]
-        },
-        {
-          op: "CONV2D",
-          attribute_type: "ConvAttribute",
-          attribute: {
-            pad: [
-              0,
-              0,
-              0,
-              0
-            ],
-            stride: [
-              1,
-              1
-            ],
-            dilation: [
-              1,
-              1
-            ],
-            input_zp: 0,
-            weight_zp: -113,
-            accum_dtype: "INT48"
-          },
           inputs: [
-            "input-0",
-            "const-1",
-            "const-2"
+            "input-0"
           ],
           outputs: [
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            1,
-            4,
-            2,
-            9
-          ],
-          type: "INT16"
-        },
-        {
-          name: "const-1",
-          shape: [
-            14,
-            1,
-            1,
-            9
-          ],
-          type: "INT8",
-          data: [
-            53,
-            190,
-            65,
-            10,
-            110,
-            40,
-            100,
-            122,
-            126,
-            62,
-            24,
-            158,
-            226,
-            249,
-            71,
-            22,
-            240,
-            165,
-            55,
-            238,
-            137,
-            200,
-            97,
-            158,
-            231,
-            3,
-            149,
-            170,
-            112,
-            23,
-            181,
-            171,
-            236,
-            57,
-            58,
-            177,
-            57,
-            101,
-            185,
-            134,
-            117,
-            5,
-            70,
-            209,
-            204,
-            185,
-            183,
-            248,
-            155,
-            87,
-            2,
-            106,
-            0,
-            205,
-            3,
-            167,
-            82,
-            56,
-            165,
-            20,
-            9,
-            179,
-            159,
-            66,
-            195,
-            4,
-            191,
-            39,
-            140,
-            219,
-            12,
-            240,
-            28,
-            174,
-            241,
-            65,
-            213,
-            168,
-            89,
-            71,
-            46,
-            76,
-            71,
-            63,
-            2,
-            132,
-            24,
-            197,
-            69,
-            247,
-            103,
-            24,
-            12,
-            107,
-            249,
-            224,
-            223,
-            96,
-            65,
-            169,
-            254,
-            223,
-            37,
-            141,
-            54,
-            62,
-            186,
-            166,
-            32,
-            193,
-            113,
-            70,
-            116,
-            8,
-            112,
-            131,
-            202,
-            128,
-            45,
-            2,
-            201,
-            206,
-            36,
-            174,
-            3,
-            29
-          ]
-        },
-        {
-          name: "const-2",
-          shape: [
-            14
-          ],
-          type: "INT48",
-          data: [
-            111,
-            61,
-            7,
-            208,
-            122,
-            186,
-            174,
-            90,
-            68,
-            227,
-            154,
-            23,
-            31,
-            65,
-            198,
-            146,
-            23,
-            225,
-            31,
-            139,
-            161,
-            153,
-            206,
-            175,
-            165,
-            145,
-            4,
-            213,
-            90,
-            163,
-            125,
-            36,
-            128,
-            229,
-            162,
-            188,
-            88,
-            73,
-            184,
-            19,
-            163,
-            135,
-            43,
-            246,
-            152,
-            104,
-            225,
-            206,
-            251,
-            205,
-            168,
-            128,
-            230,
-            102,
-            246,
-            204,
-            245,
-            37,
-            212,
-            84,
-            158,
-            25,
-            97,
-            163,
-            59,
-            223,
-            6,
-            191,
-            255,
-            212,
-            105,
-            19,
-            114,
-            1,
-            166,
-            138,
-            62,
-            17,
-            244,
-            205,
-            179,
-            36,
-            40,
-            84
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            4,
-            2,
-            14
-          ],
-          type: "INT16"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]