Arm backend: Add VGF unit tests to operators (Part 3)

backends/arm/scripts/parse_test_names.py

@@ -18,6 +18,8 @@
     "bitwise_right_shift.Tensor",
     "bitwise_left_shift.Tensor",
     "native_group_norm.default",
+    "silu.default",
+    "sdpa.default",
     "unbind.int",
     "unflatten.int",
     "_native_batch_norm_legit_no_training.default",

backends/arm/test/ops/test_scalar_tensor.py

@@ -11,6 +11,7 @@
     EthosU85PipelineINT,
     TosaPipelineFP,
     TosaPipelineINT,
+    VgfPipeline,
 )
 
 float_test_data_suite = {
@@ -99,3 +100,30 @@ def test_scalar_tensor_u85_INT(test_data):
         ScalarTensor.aten_op,
         run_on_fvp=True,
     ).run()
+
+
+@common.parametrize("test_data", float_test_data_suite)
+@common.SkipIfNoModelConverter
+def test_scalar_tensor_vgf_FP(test_data):
+    scalar, dtype, data = test_data()
+    pipeline = VgfPipeline(
+        ScalarTensor(scalar, dtype),
+        tuple(data),
+        ScalarTensor.aten_op,
+        tosa_version="TOSA-1.0+FP",
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", int_test_data_suite)
+@common.SkipIfNoModelConverter
+def test_scalar_tensor_vgf_INT(test_data):
+    scalar, dtype, data = test_data()
+    pipeline = VgfPipeline(
+        ScalarTensor(scalar, dtype),
+        tuple(data),
+        ScalarTensor.aten_op,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.pop_stage("check.quant_nodes")
+    pipeline.run()

backends/arm/test/ops/test_sdpa.py

@@ -8,9 +8,11 @@
 
 import torch
 
+from executorch.backends.arm.test import common
 from executorch.backends.arm.test.tester.test_pipeline import (
     TosaPipelineFP,
     TosaPipelineINT,
+    VgfPipeline,
 )
 
 
@@ -27,14 +29,14 @@ def forward(self, query, key, value):
 input_t = Tuple[torch.Tensor, torch.Tensor, torch.Tensor]
 
 
-def test_sdpa_FP():
+def test_sdpa_tosa_FP():
     test_input = tuple(torch.randn(1, 3, 197, 64) for x in range(3))
     pipeline = TosaPipelineFP[input_t](SDPA(), test_input, [], [])
     pipeline.pop_stage("check_count.exir")
     pipeline.run()
 
 
-def test_sdpa_INT():
+def test_sdpa_tosa_INT():
     test_input = tuple(torch.randn(1, 3, 197, 64) for x in range(3))
     pipeline = TosaPipelineINT[input_t](SDPA(), test_input, [], [])
     pipeline.pop_stage("check.quant_nodes")
@@ -43,3 +45,25 @@ def test_sdpa_INT():
         "run_method_and_compare_outputs"
     )  # TODO: reference is not quantized
     pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sdpa_vgf_FP():
+    test_input = tuple(torch.randn(1, 3, 197, 64) for _ in range(3))
+    pipeline = VgfPipeline[input_t](
+        SDPA(), test_input, [], [], tosa_version="TOSA-1.0+FP"
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sdpa_vgf_INT():
+    test_input = tuple(torch.randn(1, 3, 197, 64) for _ in range(3))
+    pipeline = VgfPipeline[input_t](
+        SDPA(),
+        test_input,
+        [],
+        [],
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()

backends/arm/test/ops/test_select.py

@@ -16,6 +16,7 @@
     OpNotSupportedPipeline,
     TosaPipelineFP,
     TosaPipelineINT,
+    VgfPipeline,
 )
 
 input_t1 = Tuple[torch.Tensor, int, int]
@@ -173,3 +174,47 @@ def test_select_int_u85_INT(test_data: Tuple):
         use_to_edge_transform_and_lower=True,
     )
     pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_select_int_vgf_FP_copy(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        SelectCopy(), test_data(), aten_op_copy, [], tosa_version="TOSA-1.0+FP"
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_select_int_vgf_FP(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        SelectInt(), test_data(), aten_op_int, [], tosa_version="TOSA-1.0+FP"
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_select_int_vgf_INT_copy(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        SelectCopy(),
+        test_data(),
+        aten_op_copy,
+        [],
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_select_int_vgf_INT(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        SelectInt(),
+        test_data(),
+        aten_op_int,
+        [],
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()

backends/arm/test/ops/test_sigmoid.py

@@ -15,6 +15,7 @@
     EthosU85PipelineINT,
     TosaPipelineFP,
     TosaPipelineINT,
+    VgfPipeline,
 )
 
 aten_op = "torch.ops.aten.sigmoid.default"  # Used for checking that we do not have softmax in the graph after decompose
@@ -154,3 +155,101 @@ def test_sigmoid_u85_INT(test_data: Tuple):
         run_on_fvp=False,
     )
     pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_FP(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        Sigmoid(),
+        (test_data(),),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+FP",
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_INT(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        Sigmoid(),
+        (test_data(),),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_FP_add():
+    pipeline = VgfPipeline[input_t1](
+        AddSigmoid(),
+        (test_data_suite["zeros"](),),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+FP",
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_INT_add():
+    pipeline = VgfPipeline[input_t1](
+        AddSigmoid(),
+        (test_data_suite["ramp"](),),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_FP_add_2():
+    pipeline = VgfPipeline[input_t1](
+        SigmoidAdd(),
+        (test_data_suite["zeros"](),),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+FP",
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_INT_add_2():
+    pipeline = VgfPipeline[input_t1](
+        SigmoidAdd(),
+        (test_data_suite["zeros"](),),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_FP_add_3():
+    pipeline = VgfPipeline[input_t1](
+        SigmoidAddSigmoid(),
+        (test_data_suite["randn_neg"](), test_data_suite["randn_pos"]()),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+FP",
+    )
+    pipeline.run()
+
+
+@common.SkipIfNoModelConverter
+def test_sigmoid_vgf_INT_add_3():
+    pipeline = VgfPipeline[input_t1](
+        SigmoidAddSigmoid(),
+        (test_data_suite["randn_neg"](), test_data_suite["randn_pos"]()),
+        aten_op,
+        exir_op,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()

backends/arm/test/ops/test_sign.py

@@ -13,6 +13,7 @@
     EthosU85PipelineINT,
     TosaPipelineFP,
     TosaPipelineINT,
+    VgfPipeline,
 )
 
 aten_op = "torch.ops.aten.sign.default"
@@ -84,3 +85,29 @@ def test_sign_u85_INT(test_data: Tuple):
         exir_ops=exir_op,
     )
     pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_sign_vgf_FP(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        Sign(),
+        (test_data,),
+        aten_op=aten_op,
+        exir_op=exir_op,
+        tosa_version="TOSA-1.0+FP",
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", test_data_suite)
+@common.SkipIfNoModelConverter
+def test_sign_vgf_INT(test_data: Tuple):
+    pipeline = VgfPipeline[input_t1](
+        Sign(),
+        (test_data,),
+        aten_op=[],
+        exir_op=exir_op,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()

backends/arm/test/ops/test_silu.py

@@ -15,6 +15,7 @@
     EthosU85PipelineINT,
     TosaPipelineFP,
     TosaPipelineINT,
+    VgfPipeline,
 )
 
 
@@ -111,3 +112,49 @@ def test_silu_u85_INT_inplace(test_data: input_t):
         Silu(), silu_data, Silu.aten_op_INT, run_on_fvp=True
     )
     pipeline.run()
+
+
+@common.parametrize("test_data", Silu.test_data)
+@common.SkipIfNoModelConverter
+def test_silu_vgf_FP(test_data: input_t):
+    silu_data = (test_data(), False)
+    pipeline = VgfPipeline[input_t](
+        Silu(), silu_data, Silu.aten_op_FP, tosa_version="TOSA-1.0+FP"
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", Silu.test_data)
+@common.SkipIfNoModelConverter
+def test_silu_vgf_FP_inplace(test_data: input_t):
+    silu_data = (test_data(), True)
+    pipeline = VgfPipeline[input_t](
+        Silu(), silu_data, Silu.aten_op_inplace_FP, tosa_version="TOSA-1.0+FP"
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", Silu.test_data)
+@common.SkipIfNoModelConverter
+def test_silu_vgf_INT(test_data: input_t):
+    silu_data = (test_data(), False)
+    pipeline = VgfPipeline[input_t](
+        Silu(),
+        silu_data,
+        Silu.aten_op_INT,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()
+
+
+@common.parametrize("test_data", Silu.test_data)
+@common.SkipIfNoModelConverter
+def test_silu_vgf_INT_inplace(test_data: input_t):
+    silu_data = (test_data(), True)
+    pipeline = VgfPipeline[input_t](
+        Silu(),
+        silu_data,
+        Silu.aten_op_INT,
+        tosa_version="TOSA-1.0+INT",
+    )
+    pipeline.run()