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, 356 insertions, 351 deletions

diff --git a/operators/tensor/conv3d_1x1x1/conv3d_1x1x1_ERRORIF_WeightZeroPointNotZero_1x10x9x7x12_f16xf16_accf32_st111_pad000000_dilat111/test.json b/operators/tensor/conv3d_1x1x1/conv3d_1x1x1_ERRORIF_WeightZeroPointNotZero_1x10x9x7x12_f16xf16_accf32_st111_pad000000_dilat111/test.json
index 416b261af..869b25cd9 100644
--- a/operators/tensor/conv3d_1x1x1/conv3d_1x1x1_ERRORIF_WeightZeroPointNotZero_1x10x9x7x12_f16xf16_accf32_st111_pad000000_dilat111/test.json
+++ b/operators/tensor/conv3d_1x1x1/conv3d_1x1x1_ERRORIF_WeightZeroPointNotZero_1x10x9x7x12_f16xf16_accf32_st111_pad000000_dilat111/test.json
@@ -5,369 +5,374 @@
     _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: "CONV3D",
+              attribute_type: "ConvAttribute",
+              attribute: {
+                pad: [
+                  0,
+                  0,
+                  0,
+                  0,
+                  0,
+                  0
+                ],
+                stride: [
+                  1,
+                  1,
+                  1
+                ],
+                dilation: [
+                  1,
+                  1,
+                  1
+                ],
+                input_zp: 0,
+                weight_zp: 48,
+                accum_dtype: "FP32"
+              },
+              inputs: [
+                "input-0",
+                "const-1",
+                "const-2"
+              ],
+              outputs: [
+                "result-0"
+              ]
+            }
+          ],
+          tensors: [
+            {
+              name: "input-0",
+              shape: [
+                1,
+                10,
+                9,
+                7,
+                12
+              ],
+              type: "FP16"
+            },
+            {
+              name: "const-1",
+              shape: [
+                9,
+                1,
+                1,
+                1,
+                12
+              ],
+              type: "FP16",
+              data: [
+                80,
+                41,
+                92,
+                47,
+                112,
+                56,
+                227,
+                57,
+                212,
+                59,
+                224,
+                59,
+                128,
+                58,
+                67,
+                42,
+                61,
+                55,
+                73,
+                42,
+                24,
+                57,
+                1,
+                49,
+                65,
+                57,
+                13,
+                52,
+                55,
+                57,
+                217,
+                57,
+                157,
+                52,
+                239,
+                59,
+                95,
+                51,
+                61,
+                46,
+                172,
+                56,
+                148,
+                54,
+                164,
+                58,
+                33,
+                56,
+                21,
+                52,
+                50,
+                56,
+                232,
+                58,
+                148,
+                51,
+                192,
+                47,
+                252,
+                58,
+                229,
+                58,
+                206,
+                58,
+                99,
+                52,
+                94,
+                58,
+                29,
+                52,
+                247,
+                56,
+                194,
+                47,
+                182,
+                54,
+                66,
+                59,
+                26,
+                37,
+                236,
+                48,
+                29,
+                57,
+                92,
+                58,
+                254,
+                54,
+                26,
+                58,
+                201,
+                59,
+                144,
+                57,
+                22,
+                55,
+                11,
+                57,
+                232,
+                52,
+                31,
+                46,
+                165,
+                48,
+                0,
+                55,
+                136,
+                52,
+                182,
+                41,
+                12,
+                54,
+                209,
+                58,
+                52,
+                45,
+                55,
+                59,
+                25,
+                49,
+                88,
+                55,
+                33,
+                59,
+                242,
+                44,
+                174,
+                56,
+                4,
+                58,
+                156,
+                56,
+                61,
+                41,
+                94,
+                56,
+                186,
+                48,
+                122,
+                54,
+                44,
+                51,
+                13,
+                58,
+                117,
+                58,
+                156,
+                50,
+                33,
+                57,
+                117,
+                58,
+                249,
+                54,
+                86,
+                59,
+                250,
+                50,
+                12,
+                48,
+                230,
+                48,
+                77,
+                59,
+                246,
+                56,
+                120,
+                47,
+                57,
+                54,
+                231,
+                52,
+                4,
+                59,
+                172,
+                53,
+                122,
+                45,
+                159,
+                33,
+                146,
+                56,
+                213,
+                48,
+                241,
+                59,
+                65,
+                59,
+                40,
+                56,
+                152,
+                57,
+                92,
+                50,
+                48,
+                37,
+                192,
+                38,
+                137,
+                56,
+                111,
+                49,
+                184,
+                57,
+                158,
+                57,
+                179,
+                59,
+                45,
+                58,
+                130,
+                56,
+                136,
+                53,
+                169,
+                59
+              ]
+            },
+            {
+              name: "const-2",
+              shape: [
+                9
+              ],
+              type: "FP32",
+              data: [
+                157,
+                19,
+                63,
+                62,
+                242,
+                130,
+                76,
+                62,
+                107,
+                106,
+                33,
+                63,
+                177,
+                161,
+                124,
+                63,
+                242,
+                234,
+                169,
+                61,
+                148,
+                105,
+                125,
+                63,
+                161,
+                241,
+                200,
+                62,
+                177,
+                149,
+                35,
+                63,
+                69,
+                51,
+                47,
+                63
+              ]
+            },
+            {
+              name: "result-0",
+              shape: [
+                1,
+                10,
+                9,
+                7,
+                9
+              ],
+              type: "FP32"
+            }
           ],
-          outputs: [
-            "const-2"
-          ]
-        },
-        {
-          op: "CONV3D",
-          attribute_type: "ConvAttribute",
-          attribute: {
-            pad: [
-              0,
-              0,
-              0,
-              0,
-              0,
-              0
-            ],
-            stride: [
-              1,
-              1,
-              1
-            ],
-            dilation: [
-              1,
-              1,
-              1
-            ],
-            input_zp: 0,
-            weight_zp: 48,
-            accum_dtype: "FP32"
-          },
           inputs: [
-            "input-0",
-            "const-1",
-            "const-2"
+            "input-0"
           ],
           outputs: [
             "result-0"
           ]
         }
-      ],
-      tensors: [
-        {
-          name: "input-0",
-          shape: [
-            1,
-            10,
-            9,
-            7,
-            12
-          ],
-          type: "FP16"
-        },
-        {
-          name: "const-1",
-          shape: [
-            9,
-            1,
-            1,
-            1,
-            12
-          ],
-          type: "FP16",
-          data: [
-            80,
-            41,
-            92,
-            47,
-            112,
-            56,
-            227,
-            57,
-            212,
-            59,
-            224,
-            59,
-            128,
-            58,
-            67,
-            42,
-            61,
-            55,
-            73,
-            42,
-            24,
-            57,
-            1,
-            49,
-            65,
-            57,
-            13,
-            52,
-            55,
-            57,
-            217,
-            57,
-            157,
-            52,
-            239,
-            59,
-            95,
-            51,
-            61,
-            46,
-            172,
-            56,
-            148,
-            54,
-            164,
-            58,
-            33,
-            56,
-            21,
-            52,
-            50,
-            56,
-            232,
-            58,
-            148,
-            51,
-            192,
-            47,
-            252,
-            58,
-            229,
-            58,
-            206,
-            58,
-            99,
-            52,
-            94,
-            58,
-            29,
-            52,
-            247,
-            56,
-            194,
-            47,
-            182,
-            54,
-            66,
-            59,
-            26,
-            37,
-            236,
-            48,
-            29,
-            57,
-            92,
-            58,
-            254,
-            54,
-            26,
-            58,
-            201,
-            59,
-            144,
-            57,
-            22,
-            55,
-            11,
-            57,
-            232,
-            52,
-            31,
-            46,
-            165,
-            48,
-            0,
-            55,
-            136,
-            52,
-            182,
-            41,
-            12,
-            54,
-            209,
-            58,
-            52,
-            45,
-            55,
-            59,
-            25,
-            49,
-            88,
-            55,
-            33,
-            59,
-            242,
-            44,
-            174,
-            56,
-            4,
-            58,
-            156,
-            56,
-            61,
-            41,
-            94,
-            56,
-            186,
-            48,
-            122,
-            54,
-            44,
-            51,
-            13,
-            58,
-            117,
-            58,
-            156,
-            50,
-            33,
-            57,
-            117,
-            58,
-            249,
-            54,
-            86,
-            59,
-            250,
-            50,
-            12,
-            48,
-            230,
-            48,
-            77,
-            59,
-            246,
-            56,
-            120,
-            47,
-            57,
-            54,
-            231,
-            52,
-            4,
-            59,
-            172,
-            53,
-            122,
-            45,
-            159,
-            33,
-            146,
-            56,
-            213,
-            48,
-            241,
-            59,
-            65,
-            59,
-            40,
-            56,
-            152,
-            57,
-            92,
-            50,
-            48,
-            37,
-            192,
-            38,
-            137,
-            56,
-            111,
-            49,
-            184,
-            57,
-            158,
-            57,
-            179,
-            59,
-            45,
-            58,
-            130,
-            56,
-            136,
-            53,
-            169,
-            59
-          ]
-        },
-        {
-          name: "const-2",
-          shape: [
-            9
-          ],
-          type: "FP32",
-          data: [
-            157,
-            19,
-            63,
-            62,
-            242,
-            130,
-            76,
-            62,
-            107,
-            106,
-            33,
-            63,
-            177,
-            161,
-            124,
-            63,
-            242,
-            234,
-            169,
-            61,
-            148,
-            105,
-            125,
-            63,
-            161,
-            241,
-            200,
-            62,
-            177,
-            149,
-            35,
-            63,
-            69,
-            51,
-            47,
-            63
-          ]
-        },
-        {
-          name: "result-0",
-          shape: [
-            1,
-            10,
-            9,
-            7,
-            9
-          ],
-          type: "FP32"
-        }
-      ],
-      inputs: [
-        "input-0"
-      ],
-      outputs: [
-        "result-0"
       ]
     }
   ]