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                                      | 379 +++++++++++----------
 1 file changed, 192 insertions(+), 187 deletions(-)

(limited to 'operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_DilationSmallerOne_1x14x5x7_i8xi4_acci32_st11_pad0000_dilat-5-5/test.json')

diff --git a/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_DilationSmallerOne_1x14x5x7_i8xi4_acci32_st11_pad0000_dilat-5-5/test.json b/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_DilationSmallerOne_1x14x5x7_i8xi4_acci32_st11_pad0000_dilat-5-5/test.json
index 22c3adf6d..7a8759754 100644
--- a/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_DilationSmallerOne_1x14x5x7_i8xi4_acci32_st11_pad0000_dilat-5-5/test.json
+++ b/operators/tensor/depthwise_conv2d_1x1/depthwise_conv2d_1x1_ERRORIF_DilationSmallerOne_1x14x5x7_i8xi4_acci32_st11_pad0000_dilat-5-5/test.json
@@ -5,205 +5,210 @@
     _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: [
+                  -5,
+                  -5
+                ],
+                input_zp: 59,
+                weight_zp: 0,
+                accum_dtype: "INT32"
+              },
+              inputs: [
+                "input-0",
+                "const-1",
+                "const-2"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                1,
+                14,
+                5,
+                7
+              ],
+              type: "INT8"
+            },
+            {
+              name: "const-1",
+              shape: [
+                1,
+                1,
+                7,
+                3
+              ],
+              type: "INT4",
+              data: [
+                201,
+                26,
+                117,
+                60,
+                221,
+                50,
+                161,
+                223,
+                153,
+                175,
+                4
+              ]
+            },
+            {
+              name: "const-2",
+              shape: [
+                21
+              ],
+              type: "INT32",
+              data: [
+                145,
+                60,
+                103,
+                142,
+                206,
+                164,
+                56,
+                188,
+                245,
+                150,
+                85,
+                124,
+                87,
+                243,
+                86,
+                53,
+                37,
+                44,
+                177,
+                14,
+                33,
+                14,
+                225,
+                131,
+                195,
+                184,
+                46,
+                139,
+                16,
+                51,
+                115,
+                104,
+                144,
+                200,
+                163,
+                76,
+                254,
+                196,
+                53,
+                115,
+                243,
+                130,
+                225,
+                78,
+                214,
+                80,
+                161,
+                128,
+                0,
+                140,
+                57,
+                78,
+                106,
+                150,
+                51,
+                245,
+                249,
+                221,
+                61,
+                49,
+                19,
+                60,
+                240,
+                233,
+                32,
+                5,
+                148,
+                56,
+                232,
+                170,
+                133,
+                87,
+                246,
+                237,
+                121,
+                121,
+                238,
+                186,
+                108,
+                10,
+                159,
+                50,
+                109,
+                199
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                14,
+                5,
+                21
+              ],
+              type: "INT32"
+            }
           ],
-          outputs: [
-            "const-2"
-          ]
-        },
-        {
-          op: "DEPTHWISE_CONV2D",
-          attribute_type: "ConvAttribute",
-          attribute: {
-            pad: [
-              0,
-              0,
-              0,
-              0
-            ],
-            stride: [
-              1,
-              1
-            ],
-            dilation: [
-              -5,
-              -5
-            ],
-            input_zp: 59,
-            weight_zp: 0,
-            accum_dtype: "INT32"
-          },
           inputs: [
-            "input-0",
-            "const-1",
-            "const-2"
+            "input-0"
           ],
           outputs: [
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            1,
-            14,
-            5,
-            7
-          ],
-          type: "INT8"
-        },
-        {
-          name: "const-1",
-          shape: [
-            1,
-            1,
-            7,
-            3
-          ],
-          type: "INT4",
-          data: [
-            201,
-            26,
-            117,
-            60,
-            221,
-            50,
-            161,
-            223,
-            153,
-            175,
-            4
-          ]
-        },
-        {
-          name: "const-2",
-          shape: [
-            21
-          ],
-          type: "INT32",
-          data: [
-            145,
-            60,
-            103,
-            142,
-            206,
-            164,
-            56,
-            188,
-            245,
-            150,
-            85,
-            124,
-            87,
-            243,
-            86,
-            53,
-            37,
-            44,
-            177,
-            14,
-            33,
-            14,
-            225,
-            131,
-            195,
-            184,
-            46,
-            139,
-            16,
-            51,
-            115,
-            104,
-            144,
-            200,
-            163,
-            76,
-            254,
-            196,
-            53,
-            115,
-            243,
-            130,
-            225,
-            78,
-            214,
-            80,
-            161,
-            128,
-            0,
-            140,
-            57,
-            78,
-            106,
-            150,
-            51,
-            245,
-            249,
-            221,
-            61,
-            49,
-            19,
-            60,
-            240,
-            233,
-            32,
-            5,
-            148,
-            56,
-            232,
-            170,
-            133,
-            87,
-            246,
-            237,
-            121,
-            121,
-            238,
-            186,
-            108,
-            10,
-            159,
-            50,
-            109,
-            199
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            14,
-            5,
-            21
-          ],
-          type: "INT32"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]
-- 
cgit v1.2.1