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
---
 .../test.json                                      | 301 +++++++++++----------
 1 file changed, 153 insertions(+), 148 deletions(-)

(limited to 'operators/tensor/conv2d_2x2/conv2d_2x2_1x11x44x13_i8xi8_acci32_st11_pad9099_dilat11')

diff --git a/operators/tensor/conv2d_2x2/conv2d_2x2_1x11x44x13_i8xi8_acci32_st11_pad9099_dilat11/test.json b/operators/tensor/conv2d_2x2/conv2d_2x2_1x11x44x13_i8xi8_acci32_st11_pad9099_dilat11/test.json
index 391339e11..7f19129e6 100644
--- a/operators/tensor/conv2d_2x2/conv2d_2x2_1x11x44x13_i8xi8_acci32_st11_pad9099_dilat11/test.json
+++ b/operators/tensor/conv2d_2x2/conv2d_2x2_1x11x44x13_i8xi8_acci32_st11_pad9099_dilat11/test.json
@@ -5,166 +5,171 @@
     _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: [
+                  9,
+                  0,
+                  9,
+                  9
+                ],
+                stride: [
+                  1,
+                  1
+                ],
+                dilation: [
+                  1,
+                  1
+                ],
+                input_zp: -128,
+                weight_zp: 36,
+                accum_dtype: "INT32"
+              },
+              inputs: [
+                "input-0",
+                "const-1",
+                "const-2"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                1,
+                11,
+                44,
+                13
+              ],
+              type: "INT8"
+            },
+            {
+              name: "const-1",
+              shape: [
+                1,
+                2,
+                2,
+                13
+              ],
+              type: "INT8",
+              data: [
+                108,
+                224,
+                49,
+                125,
+                95,
+                29,
+                59,
+                196,
+                11,
+                68,
+                227,
+                15,
+                253,
+                110,
+                7,
+                103,
+                40,
+                92,
+                242,
+                105,
+                25,
+                123,
+                62,
+                204,
+                72,
+                54,
+                70,
+                93,
+                203,
+                210,
+                248,
+                177,
+                149,
+                10,
+                77,
+                155,
+                209,
+                205,
+                114,
+                108,
+                128,
+                179,
+                151,
+                56,
+                109,
+                174,
+                26,
+                106,
+                108,
+                37,
+                200,
+                41
+              ]
+            },
+            {
+              name: "const-2",
+              shape: [
+                1
+              ],
+              type: "INT32",
+              data: [
+                212,
+                238,
+                36,
+                205
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                19,
+                61,
+                1
+              ],
+              type: "INT32"
+            }
           ],
-          outputs: [
-            "const-2"
-          ]
-        },
-        {
-          op: "CONV2D",
-          attribute_type: "ConvAttribute",
-          attribute: {
-            pad: [
-              9,
-              0,
-              9,
-              9
-            ],
-            stride: [
-              1,
-              1
-            ],
-            dilation: [
-              1,
-              1
-            ],
-            input_zp: -128,
-            weight_zp: 36,
-            accum_dtype: "INT32"
-          },
           inputs: [
-            "input-0",
-            "const-1",
-            "const-2"
+            "input-0"
           ],
           outputs: [
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            1,
-            11,
-            44,
-            13
-          ],
-          type: "INT8"
-        },
-        {
-          name: "const-1",
-          shape: [
-            1,
-            2,
-            2,
-            13
-          ],
-          type: "INT8",
-          data: [
-            108,
-            224,
-            49,
-            125,
-            95,
-            29,
-            59,
-            196,
-            11,
-            68,
-            227,
-            15,
-            253,
-            110,
-            7,
-            103,
-            40,
-            92,
-            242,
-            105,
-            25,
-            123,
-            62,
-            204,
-            72,
-            54,
-            70,
-            93,
-            203,
-            210,
-            248,
-            177,
-            149,
-            10,
-            77,
-            155,
-            209,
-            205,
-            114,
-            108,
-            128,
-            179,
-            151,
-            56,
-            109,
-            174,
-            26,
-            106,
-            108,
-            37,
-            200,
-            41
-          ]
-        },
-        {
-          name: "const-2",
-          shape: [
-            1
-          ],
-          type: "INT32",
-          data: [
-            212,
-            238,
-            36,
-            205
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            19,
-            61,
-            1
-          ],
-          type: "INT32"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
-- 
cgit v1.2.1