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

11 files changed, 386 insertions, 331 deletions

diff --git a/operators/ew_unary/logical_not/logical_not_1x2x1x65535_b/test.json b/operators/ew_unary/logical_not/logical_not_1x2x1x65535_b/test.json
index 79a378733..de4e4b967 100644
--- a/operators/ew_unary/logical_not/logical_not_1x2x1x65535_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_1x2x1x65535_b/test.json
@@ -5,13 +5,46 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                1,
+                2,
+                1,
+                65535
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                2,
+                1,
+                65535
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,34 +52,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            1,
-            2,
-            1,
-            65535
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            2,
-            1,
-            65535
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_1x65537x1_b/test.json b/operators/ew_unary/logical_not/logical_not_1x65537x1_b/test.json
index 36013b571..e70cc6dbc 100644
--- a/operators/ew_unary/logical_not/logical_not_1x65537x1_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_1x65537x1_b/test.json
@@ -5,13 +5,44 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                1,
+                65537,
+                1
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                65537,
+                1
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,32 +50,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            1,
-            65537,
-            1
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            65537,
-            1
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_29x28x55_b/test.json b/operators/ew_unary/logical_not/logical_not_29x28x55_b/test.json
index ad201dfb7..a9bfeec9a 100644
--- a/operators/ew_unary/logical_not/logical_not_29x28x55_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_29x28x55_b/test.json
@@ -5,13 +5,44 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                29,
+                28,
+                55
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                29,
+                28,
+                55
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,32 +50,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            29,
-            28,
-            55
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            29,
-            28,
-            55
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_2x11x10x7_b/test.json b/operators/ew_unary/logical_not/logical_not_2x11x10x7_b/test.json
index 049af345b..204edf11b 100644
--- a/operators/ew_unary/logical_not/logical_not_2x11x10x7_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_2x11x10x7_b/test.json
@@ -5,13 +5,46 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                2,
+                11,
+                10,
+                7
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                2,
+                11,
+                10,
+                7
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,34 +52,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            2,
-            11,
-            10,
-            7
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            2,
-            11,
-            10,
-            7
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_49x42_b/test.json b/operators/ew_unary/logical_not/logical_not_49x42_b/test.json
index 424d42797..d0150a59a 100644
--- a/operators/ew_unary/logical_not/logical_not_49x42_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_49x42_b/test.json
@@ -5,13 +5,42 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                49,
+                42
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                49,
+                42
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,30 +48,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            49,
-            42
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            49,
-            42
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_7_b/test.json b/operators/ew_unary/logical_not/logical_not_7_b/test.json
index 019258f6e..e2f2e617a 100644
--- a/operators/ew_unary/logical_not/logical_not_7_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_7_b/test.json
@@ -5,13 +5,40 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                7
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                7
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,28 +46,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            7
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            7
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_7x13x2x10x3_b/test.json b/operators/ew_unary/logical_not/logical_not_7x13x2x10x3_b/test.json
index d9a117165..2d3adf116 100644
--- a/operators/ew_unary/logical_not/logical_not_7x13x2x10x3_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_7x13x2x10x3_b/test.json
@@ -5,13 +5,48 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                7,
+                13,
+                2,
+                10,
+                3
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                7,
+                13,
+                2,
+                10,
+                3
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,36 +54,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            7,
-            13,
-            2,
-            10,
-            3
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            7,
-            13,
-            2,
-            10,
-            3
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputList_13x13_b/test.json b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputList_13x13_b/test.json
index 3d6405839..6cd3930f6 100644
--- a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputList_13x13_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputList_13x13_b/test.json
@@ -5,44 +5,49 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
-          inputs: [
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
 
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                13,
+                13
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                13,
+                13
+              ],
+              type: "BOOL"
+            }
+          ],
+          inputs: [
+            "input-0"
           ],
           outputs: [
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            13,
-            13
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            13,
-            13
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputType_10_i16/test.json b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputType_10_i16/test.json
index f03307076..b9ef09bc4 100644
--- a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputType_10_i16/test.json
+++ b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongInputType_10_i16/test.json
@@ -5,13 +5,40 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                10
+              ],
+              type: "INT16"
+            },
+            {
+              name: "result-0",
+              shape: [
+                10
+              ],
+              type: "INT16"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,28 +46,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            10
-          ],
-          type: "INT16"
-        },
-        {
-          name: "result-0",
-          shape: [
-            10
-          ],
-          type: "INT16"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputList_12x10x8x11_b/test.json b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputList_12x10x8x11_b/test.json
index db18c837f..74e355bee 100644
--- a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputList_12x10x8x11_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputList_12x10x8x11_b/test.json
@@ -5,49 +5,54 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0",
+                "eiDummyOutput"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                12,
+                10,
+                8,
+                11
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                12,
+                10,
+                8,
+                11
+              ],
+              type: "BOOL"
+            }
+          ],
           inputs: [
             "input-0"
           ],
           outputs: [
-            "result-0",
-            "eiDummyOutput"
+            "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            12,
-            10,
-            8,
-            11
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            12,
-            10,
-            8,
-            11
-          ],
-          type: "BOOL"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
diff --git a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputType_13x10x11_b/test.json b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputType_13x10x11_b/test.json
index 0dfef5754..d7b5fd773 100644
--- a/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputType_13x10x11_b/test.json
+++ b/operators/ew_unary/logical_not/logical_not_ERRORIF_WrongOutputType_13x10x11_b/test.json
@@ -5,13 +5,44 @@
     _patch: 0,
     _draft: true
   },
-  blocks: [
+  regions: [
     {
       name: "main",
-      operators: [
+      blocks: [
         {
-          op: "LOGICAL_NOT",
-          attribute_type: "NONE",
+          name: "main",
+          operators: [
+            {
+              op: "LOGICAL_NOT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                13,
+                10,
+                11
+              ],
+              type: "BOOL"
+            },
+            {
+              name: "result-0",
+              shape: [
+                13,
+                10,
+                11
+              ],
+              type: "INT32"
+            }
+          ],
           inputs: [
             "input-0"
           ],
@@ -19,32 +50,6 @@
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            13,
-            10,
-            11
-          ],
-          type: "BOOL"
-        },
-        {
-          name: "result-0",
-          shape: [
-            13,
-            10,
-            11
-          ],
-          type: "INT32"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]