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, 286 insertions, 281 deletions

diff --git a/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json b/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json
index 6d75520a1..5661b64a8 100644
--- a/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json
+++ b/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_WrongOutputType_1x4x2x9_i16xi8_acci48_st11_pad0000_dilat11/test.json
@@ -5,299 +5,304 @@
     _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: "DEPTHWISE_CONV2D",
+              attribute_type: "ConvAttribute",
+              attribute: {
+                pad: [
+                  0,
+                  0,
+                  0,
+                  0
+                ],
+                stride: [
+                  1,
+                  1
+                ],
+                dilation: [
+                  1,
+                  1
+                ],
+                input_zp: 0,
+                weight_zp: -81,
+                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: [
+                1,
+                1,
+                9,
+                3
+              ],
+              type: "INT8",
+              data: [
+                167,
+                175,
+                245,
+                7,
+                132,
+                88,
+                45,
+                146,
+                87,
+                135,
+                15,
+                247,
+                0,
+                116,
+                109,
+                199,
+                20,
+                117,
+                58,
+                99,
+                239,
+                200,
+                2,
+                81,
+                109,
+                47,
+                52
+              ]
+            },
+            {
+              name: "const-2",
+              shape: [
+                27
+              ],
+              type: "INT48",
+              data: [
+                209,
+                81,
+                123,
+                59,
+                68,
+                236,
+                105,
+                127,
+                226,
+                201,
+                196,
+                80,
+                43,
+                142,
+                242,
+                64,
+                7,
+                75,
+                1,
+                7,
+                104,
+                148,
+                198,
+                65,
+                207,
+                129,
+                183,
+                179,
+                141,
+                127,
+                194,
+                120,
+                234,
+                202,
+                127,
+                250,
+                162,
+                32,
+                24,
+                129,
+                146,
+                78,
+                151,
+                179,
+                219,
+                97,
+                203,
+                92,
+                190,
+                23,
+                55,
+                150,
+                43,
+                182,
+                129,
+                224,
+                200,
+                221,
+                196,
+                138,
+                25,
+                130,
+                94,
+                151,
+                157,
+                231,
+                126,
+                240,
+                104,
+                24,
+                83,
+                91,
+                143,
+                229,
+                49,
+                172,
+                2,
+                202,
+                102,
+                150,
+                142,
+                221,
+                51,
+                51,
+                172,
+                247,
+                80,
+                145,
+                225,
+                129,
+                30,
+                250,
+                214,
+                41,
+                249,
+                218,
+                214,
+                32,
+                138,
+                128,
+                146,
+                29,
+                19,
+                200,
+                103,
+                196,
+                55,
+                161,
+                112,
+                10,
+                213,
+                7,
+                136,
+                101,
+                7,
+                239,
+                68,
+                146,
+                1,
+                168,
+                112,
+                231,
+                209,
+                58,
+                232,
+                104,
+                87,
+                255,
+                43,
+                74,
+                101,
+                183,
+                43,
+                148,
+                19,
+                12,
+                137,
+                126,
+                19,
+                231,
+                201,
+                207,
+                208,
+                26,
+                118,
+                50,
+                131,
+                160,
+                151,
+                149,
+                88,
+                66,
+                67,
+                2,
+                182,
+                144,
+                252,
+                49,
+                123,
+                17,
+                46,
+                147
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                4,
+                2,
+                27
+              ],
+              type: "INT32"
+            }
           ],
-          outputs: [
-            "const-2"
-          ]
-        },
-        {
-          op: "DEPTHWISE_CONV2D",
-          attribute_type: "ConvAttribute",
-          attribute: {
-            pad: [
-              0,
-              0,
-              0,
-              0
-            ],
-            stride: [
-              1,
-              1
-            ],
-            dilation: [
-              1,
-              1
-            ],
-            input_zp: 0,
-            weight_zp: -81,
-            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: [
-            1,
-            1,
-            9,
-            3
-          ],
-          type: "INT8",
-          data: [
-            167,
-            175,
-            245,
-            7,
-            132,
-            88,
-            45,
-            146,
-            87,
-            135,
-            15,
-            247,
-            0,
-            116,
-            109,
-            199,
-            20,
-            117,
-            58,
-            99,
-            239,
-            200,
-            2,
-            81,
-            109,
-            47,
-            52
-          ]
-        },
-        {
-          name: "const-2",
-          shape: [
-            27
-          ],
-          type: "INT48",
-          data: [
-            209,
-            81,
-            123,
-            59,
-            68,
-            236,
-            105,
-            127,
-            226,
-            201,
-            196,
-            80,
-            43,
-            142,
-            242,
-            64,
-            7,
-            75,
-            1,
-            7,
-            104,
-            148,
-            198,
-            65,
-            207,
-            129,
-            183,
-            179,
-            141,
-            127,
-            194,
-            120,
-            234,
-            202,
-            127,
-            250,
-            162,
-            32,
-            24,
-            129,
-            146,
-            78,
-            151,
-            179,
-            219,
-            97,
-            203,
-            92,
-            190,
-            23,
-            55,
-            150,
-            43,
-            182,
-            129,
-            224,
-            200,
-            221,
-            196,
-            138,
-            25,
-            130,
-            94,
-            151,
-            157,
-            231,
-            126,
-            240,
-            104,
-            24,
-            83,
-            91,
-            143,
-            229,
-            49,
-            172,
-            2,
-            202,
-            102,
-            150,
-            142,
-            221,
-            51,
-            51,
-            172,
-            247,
-            80,
-            145,
-            225,
-            129,
-            30,
-            250,
-            214,
-            41,
-            249,
-            218,
-            214,
-            32,
-            138,
-            128,
-            146,
-            29,
-            19,
-            200,
-            103,
-            196,
-            55,
-            161,
-            112,
-            10,
-            213,
-            7,
-            136,
-            101,
-            7,
-            239,
-            68,
-            146,
-            1,
-            168,
-            112,
-            231,
-            209,
-            58,
-            232,
-            104,
-            87,
-            255,
-            43,
-            74,
-            101,
-            183,
-            43,
-            148,
-            19,
-            12,
-            137,
-            126,
-            19,
-            231,
-            201,
-            207,
-            208,
-            26,
-            118,
-            50,
-            131,
-            160,
-            151,
-            149,
-            88,
-            66,
-            67,
-            2,
-            182,
-            144,
-            252,
-            49,
-            123,
-            17,
-            46,
-            147
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            4,
-            2,
-            27
-          ],
-          type: "INT32"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]