Regen TFLite tests for new legalization

Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: I2221bc0a5db3a30bb86d45e8bd4e961e6d10c577

4 files changed, 129 insertions, 25 deletions

diff --git a/frameworks/tflite/operators/add_1_qi16/test_add_1_qi16.json b/frameworks/tflite/operators/add_1_qi16/test_add_1_qi16.json
index 66c8f928f..538181e9d 100644
--- a/frameworks/tflite/operators/add_1_qi16/test_add_1_qi16.json
+++ b/frameworks/tflite/operators/add_1_qi16/test_add_1_qi16.json
@@ -13,6 +13,37 @@
           name: "main",
           operators: [
             {
+              op: "CONST",
+              attribute_type: "NONE",
+              inputs: [
+
+              ],
+              outputs: [
+                "layer_0"
+              ]
+            },
+            {
+              op: "CAST",
+              attribute_type: "NONE",
+              inputs: [
+                "TosaInput_0"
+              ],
+              outputs: [
+                "layer_1"
+              ]
+            },
+            {
+              op: "LOGICAL_LEFT_SHIFT",
+              attribute_type: "NONE",
+              inputs: [
+                "layer_1",
+                "layer_0"
+              ],
+              outputs: [
+                "layer_2"
+              ]
+            },
+            {
               op: "RESCALE",
               attribute_type: "RescaleAttribute",
               attribute: {
@@ -22,17 +53,17 @@
                   2144009193
                 ],
                 shift: [
-                  17
+                  32
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
-                "TosaInput_0"
+                "layer_2"
               ],
               outputs: [
-                "layer_0"
+                "layer_3"
               ]
             },
             {
@@ -48,25 +79,25 @@
                   16
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
                 "TosaInput_1"
               ],
               outputs: [
-                "layer_1"
+                "layer_4"
               ]
             },
             {
               op: "ADD",
               attribute_type: "NONE",
               inputs: [
-                "layer_0",
-                "layer_1"
+                "layer_3",
+                "layer_4"
               ],
               outputs: [
-                "layer_2"
+                "layer_5"
               ]
             },
             {
@@ -86,7 +117,7 @@
                 per_channel: false
               },
               inputs: [
-                "layer_2"
+                "layer_5"
               ],
               outputs: [
                 "TosaOutput_0"
@@ -131,7 +162,14 @@
               ],
               type: "INT32",
               data: [
-
+                15,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0
               ]
             },
             {
@@ -153,6 +191,36 @@
               data: [
 
               ]
+            },
+            {
+              name: "layer_3",
+              shape: [
+                1
+              ],
+              type: "INT32",
+              data: [
+
+              ]
+            },
+            {
+              name: "layer_4",
+              shape: [
+                1
+              ],
+              type: "INT32",
+              data: [
+
+              ]
+            },
+            {
+              name: "layer_5",
+              shape: [
+                1
+              ],
+              type: "INT32",
+              data: [
+
+              ]
             }
           ],
           inputs: [
diff --git a/frameworks/tflite/operators/add_1x32x32x8_qi8/test_add_1x32x32x8_qi8.json b/frameworks/tflite/operators/add_1x32x32x8_qi8/test_add_1x32x32x8_qi8.json
index 35db92dfa..2822b5269 100644
--- a/frameworks/tflite/operators/add_1x32x32x8_qi8/test_add_1x32x32x8_qi8.json
+++ b/frameworks/tflite/operators/add_1x32x32x8_qi8/test_add_1x32x32x8_qi8.json
@@ -19,13 +19,13 @@
                 input_zp: 0,
                 output_zp: 0,
                 multiplier: [
-                  2147446673
+                  1073741824
                 ],
                 shift: [
-                  12
+                  10
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
@@ -39,6 +39,29 @@
               op: "RESCALE",
               attribute_type: "RescaleAttribute",
               attribute: {
+                input_zp: 0,
+                output_zp: 0,
+                multiplier: [
+                  2147446673
+                ],
+                shift: [
+                  32
+                ],
+                scale32: true,
+                double_round: true,
+                per_channel: false
+              },
+              inputs: [
+                "layer_0"
+              ],
+              outputs: [
+                "layer_1"
+              ]
+            },
+            {
+              op: "RESCALE",
+              attribute_type: "RescaleAttribute",
+              attribute: {
                 input_zp: -1,
                 output_zp: 0,
                 multiplier: [
@@ -48,25 +71,25 @@
                   11
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
                 "TosaInput_1"
               ],
               outputs: [
-                "layer_1"
+                "layer_2"
               ]
             },
             {
               op: "ADD",
               attribute_type: "NONE",
               inputs: [
-                "layer_0",
-                "layer_1"
+                "layer_1",
+                "layer_2"
               ],
               outputs: [
-                "layer_2"
+                "layer_3"
               ]
             },
             {
@@ -86,7 +109,7 @@
                 per_channel: false
               },
               inputs: [
-                "layer_2"
+                "layer_3"
               ],
               outputs: [
                 "TosaOutput_0"
@@ -152,7 +175,7 @@
                 1,
                 32,
                 32,
-                8
+                1
               ],
               type: "INT32",
               data: [
@@ -171,6 +194,19 @@
               data: [
 
               ]
+            },
+            {
+              name: "layer_3",
+              shape: [
+                1,
+                32,
+                32,
+                8
+              ],
+              type: "INT32",
+              data: [
+
+              ]
             }
           ],
           inputs: [
diff --git a/frameworks/tflite/operators/mul_13x21x3_qi16/test_mul_13x21x3_qi16.json b/frameworks/tflite/operators/mul_13x21x3_qi16/test_mul_13x21x3_qi16.json
index ab7bad9c6..c4a4c2735 100644
--- a/frameworks/tflite/operators/mul_13x21x3_qi16/test_mul_13x21x3_qi16.json
+++ b/frameworks/tflite/operators/mul_13x21x3_qi16/test_mul_13x21x3_qi16.json
@@ -25,7 +25,7 @@
                   30
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
@@ -48,7 +48,7 @@
                   30
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
diff --git a/frameworks/tflite/operators/mul_1x4x8x19_qu8/test_mul_1x4x8x19_qu8.json b/frameworks/tflite/operators/mul_1x4x8x19_qu8/test_mul_1x4x8x19_qu8.json
index 953e6c324..c858fe4f8 100644
--- a/frameworks/tflite/operators/mul_1x4x8x19_qu8/test_mul_1x4x8x19_qu8.json
+++ b/frameworks/tflite/operators/mul_1x4x8x19_qu8/test_mul_1x4x8x19_qu8.json
@@ -117,7 +117,7 @@
                   30
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [
@@ -140,7 +140,7 @@
                   30
                 ],
                 scale32: true,
-                double_round: false,
+                double_round: true,
                 per_channel: false
               },
               inputs: [