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, 273 insertions, 268 deletions

diff --git a/operators/control_flow/while_loop/while_loop_ERRORIF_CondGraphOutputShapeNotSizeOne_12_i32_iter0/test.json b/operators/control_flow/while_loop/while_loop_ERRORIF_CondGraphOutputShapeNotSizeOne_12_i32_iter0/test.json
index 6dd005037..ce46dc635 100644
--- a/operators/control_flow/while_loop/while_loop_ERRORIF_CondGraphOutputShapeNotSizeOne_12_i32_iter0/test.json
+++ b/operators/control_flow/while_loop/while_loop_ERRORIF_CondGraphOutputShapeNotSizeOne_12_i32_iter0/test.json
@@ -5,313 +5,318 @@
     _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-0"
+              ]
+            },
+            {
+              op: "WHILE_LOOP",
+              attribute_type: "WhileLoopAttribute",
+              attribute: {
+                cond_branch: "COND_BLOCK",
+                body_branch: "BODY_BLOCK"
+              },
+              inputs: [
+                "input-1",
+                "const-0",
+                "input-2"
+              ],
+              outputs: [
+                "layer-1",
+                "layer-2",
+                "layer-3"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "const-0",
+              shape: [
+                12
+              ],
+              type: "INT32",
+              data: [
+                18,
+                141,
+                255,
+                255,
+                167,
+                23,
+                0,
+                0,
+                158,
+                167,
+                255,
+                255,
+                146,
+                129,
+                255,
+                255,
+                187,
+                9,
+                0,
+                0,
+                18,
+                248,
+                255,
+                255,
+                123,
+                102,
+                0,
+                0,
+                104,
+                201,
+                255,
+                255,
+                100,
+                34,
+                0,
+                0,
+                102,
+                167,
+                255,
+                255,
+                35,
+                20,
+                0,
+                0,
+                177,
+                81,
+                0,
+                0
+              ]
+            },
+            {
+              name: "input-1",
+              shape: [
+
+              ],
+              type: "INT32"
+            },
+            {
+              name: "input-2",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            },
+            {
+              name: "layer-1",
+              shape: [
+
+              ],
+              type: "INT32"
+            },
+            {
+              name: "layer-2",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            },
+            {
+              name: "layer-3",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            }
           ],
-          outputs: [
-            "const-0"
-          ]
-        },
-        {
-          op: "WHILE_LOOP",
-          attribute_type: "WhileLoopAttribute",
-          attribute: {
-            cond_branch: "COND_BLOCK",
-            body_branch: "BODY_BLOCK"
-          },
           inputs: [
             "input-1",
-            "const-0",
             "input-2"
           ],
           outputs: [
-            "layer-1",
-            "layer-2",
             "layer-3"
           ]
-        }
-      ],
-      tensors: [
-        {
-          name: "const-0",
-          shape: [
-            12
-          ],
-          type: "INT32",
-          data: [
-            18,
-            141,
-            255,
-            255,
-            167,
-            23,
-            0,
-            0,
-            158,
-            167,
-            255,
-            255,
-            146,
-            129,
-            255,
-            255,
-            187,
-            9,
-            0,
-            0,
-            18,
-            248,
-            255,
-            255,
-            123,
-            102,
-            0,
-            0,
-            104,
-            201,
-            255,
-            255,
-            100,
-            34,
-            0,
-            0,
-            102,
-            167,
-            255,
-            255,
-            35,
-            20,
-            0,
-            0,
-            177,
-            81,
-            0,
-            0
-          ]
         },
         {
-          name: "input-1",
-          shape: [
+          name: "COND_BLOCK",
+          operators: [
+            {
+              op: "CONST",
+              attribute_type: "NONE",
+              inputs: [
 
+              ],
+              outputs: [
+                "const-3"
+              ]
+            },
+            {
+              op: "GREATER",
+              attribute_type: "NONE",
+              inputs: [
+                "input-1",
+                "const-3"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
           ],
-          type: "INT32"
-        },
-        {
-          name: "input-2",
-          shape: [
-            12
-          ],
-          type: "INT32"
-        },
-        {
-          name: "layer-1",
-          shape: [
+          tensors: [
+            {
+              name: "input-1",
+              shape: [
 
-          ],
-          type: "INT32"
-        },
-        {
-          name: "layer-2",
-          shape: [
-            12
-          ],
-          type: "INT32"
-        },
-        {
-          name: "layer-3",
-          shape: [
-            12
-          ],
-          type: "INT32"
-        }
-      ],
-      inputs: [
-        "input-1",
-        "input-2"
-      ],
-      outputs: [
-        "layer-3"
-      ]
-    },
-    {
-      name: "COND_BLOCK",
-      operators: [
-        {
-          op: "CONST",
-          attribute_type: "NONE",
-          inputs: [
+              ],
+              type: "INT32"
+            },
+            {
+              name: "const-0",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            },
+            {
+              name: "input-2",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            },
+            {
+              name: "const-3",
+              shape: [
 
+              ],
+              type: "INT32",
+              data: [
+                0,
+                0,
+                0,
+                0
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                3
+              ],
+              type: "BOOL"
+            }
           ],
-          outputs: [
-            "const-3"
-          ]
-        },
-        {
-          op: "GREATER",
-          attribute_type: "NONE",
           inputs: [
             "input-1",
-            "const-3"
+            "const-0",
+            "input-2"
           ],
           outputs: [
             "result-0"
           ]
-        }
-      ],
-      tensors: [
-        {
-          name: "input-1",
-          shape: [
-
-          ],
-          type: "INT32"
-        },
-        {
-          name: "const-0",
-          shape: [
-            12
-          ],
-          type: "INT32"
-        },
-        {
-          name: "input-2",
-          shape: [
-            12
-          ],
-          type: "INT32"
         },
         {
-          name: "const-3",
-          shape: [
+          name: "BODY_BLOCK",
+          operators: [
+            {
+              op: "CONST",
+              attribute_type: "NONE",
+              inputs: [
 
+              ],
+              outputs: [
+                "const-4"
+              ]
+            },
+            {
+              op: "ADD",
+              attribute_type: "NONE",
+              inputs: [
+                "const-0",
+                "input-2"
+              ],
+              outputs: [
+                "layer-5"
+              ]
+            },
+            {
+              op: "SUB",
+              attribute_type: "NONE",
+              inputs: [
+                "input-1",
+                "const-4"
+              ],
+              outputs: [
+                "layer-4"
+              ]
+            }
           ],
-          type: "INT32",
-          data: [
-            0,
-            0,
-            0,
-            0
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            3
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-1",
-        "const-0",
-        "input-2"
-      ],
-      outputs: [
-        "result-0"
-      ]
-    },
-    {
-      name: "BODY_BLOCK",
-      operators: [
-        {
-          op: "CONST",
-          attribute_type: "NONE",
-          inputs: [
+          tensors: [
+            {
+              name: "input-1",
+              shape: [
 
+              ],
+              type: "INT32"
+            },
+            {
+              name: "const-0",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            },
+            {
+              name: "input-2",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            },
+            {
+              name: "const-4",
+              shape: [
+
+              ],
+              type: "INT32",
+              data: [
+                1,
+                0,
+                0,
+                0
+              ]
+            },
+            {
+              name: "layer-4",
+              shape: [
+
+              ],
+              type: "INT32"
+            },
+            {
+              name: "layer-5",
+              shape: [
+                12
+              ],
+              type: "INT32"
+            }
           ],
-          outputs: [
-            "const-4"
-          ]
-        },
-        {
-          op: "ADD",
-          attribute_type: "NONE",
           inputs: [
+            "input-1",
             "const-0",
             "input-2"
           ],
           outputs: [
+            "layer-4",
+            "const-0",
             "layer-5"
           ]
-        },
-        {
-          op: "SUB",
-          attribute_type: "NONE",
-          inputs: [
-            "input-1",
-            "const-4"
-          ],
-          outputs: [
-            "layer-4"
-          ]
-        }
-      ],
-      tensors: [
-        {
-          name: "input-1",
-          shape: [
-
-          ],
-          type: "INT32"
-        },
-        {
-          name: "const-0",
-          shape: [
-            12
-          ],
-          type: "INT32"
-        },
-        {
-          name: "input-2",
-          shape: [
-            12
-          ],
-          type: "INT32"
-        },
-        {
-          name: "const-4",
-          shape: [
-
-          ],
-          type: "INT32",
-          data: [
-            1,
-            0,
-            0,
-            0
-          ]
-        },
-        {
-          name: "layer-4",
-          shape: [
-
-          ],
-          type: "INT32"
-        },
-        {
-          name: "layer-5",
-          shape: [
-            12
-          ],
-          type: "INT32"
         }
-      ],
-      inputs: [
-        "input-1",
-        "const-0",
-        "input-2"
-      ],
-      outputs: [
-        "layer-4",
-        "const-0",
-        "layer-5"
       ]
     }
   ]