From b08fb3e856b7757403ff9aafc9487f9c0ad61fe7 Mon Sep 17 00:00:00 2001
From: Jeremy Johnson <jeremy.johnson@arm.com>
Date: Mon, 16 Jan 2023 15:17:52 +0000
Subject: 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
---
 .../cond_if_binary_47x48x46_i16_cond0/test.json    | 295 +++++++++++----------
 1 file changed, 150 insertions(+), 145 deletions(-)

(limited to 'operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json')

diff --git a/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json b/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json
index 45e1f4256..3d10796d5 100644
--- a/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json
+++ b/operators/control_flow/cond_if_binary/cond_if_binary_47x48x46_i16_cond0/test.json
@@ -5,90 +5,131 @@
     _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-2"
+              ]
+            },
+            {
+              op: "COND_IF",
+              attribute_type: "CondIfAttribute",
+              attribute: {
+                then_branch: "THEN_BLOCK",
+                else_branch: "ELSE_BLOCK"
+              },
+              inputs: [
+                "const-2",
+                "input-0",
+                "input-1"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            },
+            {
+              name: "input-1",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            },
+            {
+              name: "const-2",
+              shape: [
+
+              ],
+              type: "BOOL",
+              data: [
+                0
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            }
           ],
-          outputs: [
-            "const-2"
-          ]
-        },
-        {
-          op: "COND_IF",
-          attribute_type: "CondIfAttribute",
-          attribute: {
-            then_branch: "THEN_BLOCK",
-            else_branch: "ELSE_BLOCK"
-          },
           inputs: [
-            "const-2",
             "input-0",
             "input-1"
           ],
           outputs: [
             "result-0"
           ]
-        }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            47,
-            48,
-            46
-          ],
-          type: "INT16"
         },
         {
-          name: "input-1",
-          shape: [
-            47,
-            48,
-            46
+          name: "THEN_BLOCK",
+          operators: [
+            {
+              op: "LOGICAL_RIGHT_SHIFT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0",
+                "input-1"
+              ],
+              outputs: [
+                "result-1"
+              ]
+            }
           ],
-          type: "INT16"
-        },
-        {
-          name: "const-2",
-          shape: [
-
-          ],
-          type: "BOOL",
-          data: [
-            0
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            47,
-            48,
-            46
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            },
+            {
+              name: "input-1",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            },
+            {
+              name: "result-1",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            }
           ],
-          type: "INT16"
-        }
-      ],
-      inputs: [
-        "input-0",
-        "input-1"
-      ],
-      outputs: [
-        "result-0"
-      ]
-    },
-    {
-      name: "THEN_BLOCK",
-      operators: [
-        {
-          op: "LOGICAL_RIGHT_SHIFT",
-          attribute_type: "NONE",
           inputs: [
             "input-0",
             "input-1"
@@ -96,51 +137,51 @@
           outputs: [
             "result-1"
           ]
-        }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            47,
-            48,
-            46
-          ],
-          type: "INT16"
         },
         {
-          name: "input-1",
-          shape: [
-            47,
-            48,
-            46
+          name: "ELSE_BLOCK",
+          operators: [
+            {
+              op: "LOGICAL_LEFT_SHIFT",
+              attribute_type: "NONE",
+              inputs: [
+                "input-0",
+                "input-1"
+              ],
+              outputs: [
+                "result-2"
+              ]
+            }
           ],
-          type: "INT16"
-        },
-        {
-          name: "result-1",
-          shape: [
-            47,
-            48,
-            46
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            },
+            {
+              name: "input-1",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            },
+            {
+              name: "result-2",
+              shape: [
+                47,
+                48,
+                46
+              ],
+              type: "INT16"
+            }
           ],
-          type: "INT16"
-        }
-      ],
-      inputs: [
-        "input-0",
-        "input-1"
-      ],
-      outputs: [
-        "result-1"
-      ]
-    },
-    {
-      name: "ELSE_BLOCK",
-      operators: [
-        {
-          op: "LOGICAL_LEFT_SHIFT",
-          attribute_type: "NONE",
           inputs: [
             "input-0",
             "input-1"
@@ -149,42 +190,6 @@
             "result-2"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            47,
-            48,
-            46
-          ],
-          type: "INT16"
-        },
-        {
-          name: "input-1",
-          shape: [
-            47,
-            48,
-            46
-          ],
-          type: "INT16"
-        },
-        {
-          name: "result-2",
-          shape: [
-            47,
-            48,
-            46
-          ],
-          type: "INT16"
-        }
-      ],
-      inputs: [
-        "input-0",
-        "input-1"
-      ],
-      outputs: [
-        "result-2"
       ]
     }
   ]
-- 
cgit v1.2.1