diff --git a/backends/arm/test/misc/test_conv_relu_residual_add.py b/backends/arm/test/misc/test_conv_relu_residual_add.py index fdd6ec972a6..d88a9c74b7c 100644 --- a/backends/arm/test/misc/test_conv_relu_residual_add.py +++ b/backends/arm/test/misc/test_conv_relu_residual_add.py @@ -85,7 +85,6 @@ def test_tosa_u55_INT(per_channel_quantization): model_inputs, [], [], - run_on_fvp=True, use_to_edge_transform_and_lower=True, per_channel_quantization=per_channel_quantization, qtol=0, @@ -102,7 +101,6 @@ def test_tosa_u85_INT(per_channel_quantization): model_inputs, [], [], - run_on_fvp=True, use_to_edge_transform_and_lower=True, per_channel_quantization=per_channel_quantization, qtol=0, diff --git a/backends/arm/test/misc/test_debug_feats.py b/backends/arm/test/misc/test_debug_feats.py index 3796d3dce4a..c2f28f4e9d8 100644 --- a/backends/arm/test/misc/test_debug_feats.py +++ b/backends/arm/test/misc/test_debug_feats.py @@ -262,9 +262,10 @@ def forward(self, x): @common.parametrize("test_data", Add.inputs) +@common.XfailIfNoCorstone300 def test_fail_dump_tosa_ops(caplog, test_data: input_t1): pipeline = EthosU55PipelineINT[input_t1]( - Add(), test_data, [], [], use_to_edge_transform_and_lower=True, run_on_fvp=False + Add(), test_data, [], [], use_to_edge_transform_and_lower=True ) pipeline.dump_operator_distribution("to_edge_transform_and_lower") pipeline.run() diff --git a/backends/arm/test/models/test_conformer.py b/backends/arm/test/models/test_conformer.py index d92bbfec78b..dacf14dc0e7 100644 --- a/backends/arm/test/models/test_conformer.py +++ b/backends/arm/test/models/test_conformer.py @@ -92,7 +92,6 @@ def test_conformer_u55_INT(): aten_ops=TestConformer.aten_ops, exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( "run_method_and_compare_outputs", @@ -114,7 +113,6 @@ def test_conformer_u85_INT(): aten_ops=TestConformer.aten_ops, exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( "run_method_and_compare_outputs", diff --git a/backends/arm/test/models/test_dl3_arm.py b/backends/arm/test/models/test_dl3_arm.py index 09400143d3f..c9eab58dda6 100644 --- a/backends/arm/test/models/test_dl3_arm.py +++ b/backends/arm/test/models/test_dl3_arm.py @@ -66,7 +66,6 @@ def test_dl3_u55_INT(): TestDl3.model_example_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.change_args( "run_method_and_compare_outputs", rtol=1.0, atol=1.0 @@ -82,7 +81,6 @@ def test_dl3_u85_INT(): TestDl3.model_example_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.change_args( "run_method_and_compare_outputs", rtol=1.0, atol=1.0 diff --git a/backends/arm/test/models/test_inception_v3_arm.py b/backends/arm/test/models/test_inception_v3_arm.py index f973521c1fa..2cb180a87ea 100644 --- a/backends/arm/test/models/test_inception_v3_arm.py +++ b/backends/arm/test/models/test_inception_v3_arm.py @@ -66,7 +66,6 @@ def test_ic3_u55_BI(): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, atol=0.6, qtol=1, @@ -83,7 +82,6 @@ def test_ic3_u85_BI(): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, atol=0.6, qtol=1, diff --git a/backends/arm/test/models/test_lstm_arm.py b/backends/arm/test/models/test_lstm_arm.py index 91427d18b9b..6ee16b6a31a 100644 --- a/backends/arm/test/models/test_lstm_arm.py +++ b/backends/arm/test/models/test_lstm_arm.py @@ -77,7 +77,6 @@ def test_lstm_u55_INT(): aten_ops=[], exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( "run_method_and_compare_outputs", get_test_inputs(), atol=3e-1, qtol=1.0 @@ -93,7 +92,6 @@ def test_lstm_u85_INT(): aten_ops=[], exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( "run_method_and_compare_outputs", get_test_inputs(), atol=3e-1, qtol=1.0 diff --git a/backends/arm/test/models/test_mobilenet_v2_arm.py b/backends/arm/test/models/test_mobilenet_v2_arm.py index 43c2148f129..f06e1b74bbd 100644 --- a/backends/arm/test/models/test_mobilenet_v2_arm.py +++ b/backends/arm/test/models/test_mobilenet_v2_arm.py @@ -87,7 +87,6 @@ def test_mv2_u55_INT(per_channel_quantization): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, per_channel_quantization=per_channel_quantization, atol=0.25, @@ -105,7 +104,6 @@ def test_mv2_u85_INT(per_channel_quantization): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, per_channel_quantization=per_channel_quantization, atol=0.25, diff --git a/backends/arm/test/models/test_mobilenet_v3_arm.py b/backends/arm/test/models/test_mobilenet_v3_arm.py index 0dcbd9757ac..f3a8f27428b 100644 --- a/backends/arm/test/models/test_mobilenet_v3_arm.py +++ b/backends/arm/test/models/test_mobilenet_v3_arm.py @@ -61,7 +61,6 @@ def test_mv3_u55_INT(): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, atol=0.5, qtol=1, @@ -77,7 +76,6 @@ def test_mv3_u85_INT(): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, atol=0.5, qtol=1, diff --git a/backends/arm/test/models/test_resnet18.py b/backends/arm/test/models/test_resnet18.py index 6e965daeb8b..7c9ed70ab17 100644 --- a/backends/arm/test/models/test_resnet18.py +++ b/backends/arm/test/models/test_resnet18.py @@ -69,7 +69,6 @@ def test_resnet_u55_INT(per_channel_quantization): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, per_channel_quantization=per_channel_quantization, atol=0.5, @@ -90,7 +89,6 @@ def test_resnet_u85_INT(per_channel_quantization): model_inputs, aten_ops=[], exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, per_channel_quantization=per_channel_quantization, atol=0.5, diff --git a/backends/arm/test/models/test_w2l_arm.py b/backends/arm/test/models/test_w2l_arm.py index c627cd7f887..d62d92f5fa2 100644 --- a/backends/arm/test/models/test_w2l_arm.py +++ b/backends/arm/test/models/test_w2l_arm.py @@ -91,7 +91,6 @@ def test_w2l_u55_INT(): aten_ops=[], exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.run() @@ -106,7 +105,6 @@ def test_w2l_u85_INT(): aten_ops=[], exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_abs.py b/backends/arm/test/ops/test_abs.py index 4ebcf7393c1..26495b9df3a 100644 --- a/backends/arm/test/ops/test_abs.py +++ b/backends/arm/test/ops/test_abs.py @@ -55,7 +55,10 @@ def test_abs_tosa_INT(test_data: torch.Tensor): @common.XfailIfNoCorstone300 def test_abs_u55_INT(test_data: torch.Tensor): pipeline = EthosU55PipelineINT[input_t1]( - Abs(), test_data(), aten_op, exir_op, run_on_fvp=True + Abs(), + test_data(), + aten_op, + exir_op, ) pipeline.run() @@ -64,7 +67,10 @@ def test_abs_u55_INT(test_data: torch.Tensor): @common.XfailIfNoCorstone320 def test_abs_u85_INT(test_data: torch.Tensor): pipeline = EthosU85PipelineINT[input_t1]( - Abs(), test_data(), aten_op, exir_op, run_on_fvp=True + Abs(), + test_data(), + aten_op, + exir_op, ) pipeline.run() diff --git a/backends/arm/test/ops/test_acosh.py b/backends/arm/test/ops/test_acosh.py index 25ba2b1a83b..db0bd1c3281 100644 --- a/backends/arm/test/ops/test_acosh.py +++ b/backends/arm/test/ops/test_acosh.py @@ -87,7 +87,6 @@ def test_acosh_u55_INT_xfail(test_data: Tuple): Acosh(), (test_data(),), aten_ops=[], - run_on_fvp=False, ) pipeline.run() @@ -110,7 +109,6 @@ def test_acosh_u85_INT_xfail(test_data: Tuple): Acosh(), (test_data(),), aten_ops=[], - run_on_fvp=False, ) pipeline.run() diff --git a/backends/arm/test/ops/test_add.py b/backends/arm/test/ops/test_add.py index bb690d89f59..0145dd99d31 100644 --- a/backends/arm/test/ops/test_add.py +++ b/backends/arm/test/ops/test_add.py @@ -144,7 +144,10 @@ def test_add_tensor_tosa_INT_i32(test_data: input_t1): @common.XfailIfNoCorstone300 def test_add_tensor_u55_INT(test_data: input_t1): pipeline = EthosU55PipelineINT[input_t1]( - Add(), test_data(), aten_op, exir_op, run_on_fvp=True + Add(), + test_data(), + aten_op, + exir_op, ) pipeline.run() @@ -153,7 +156,10 @@ def test_add_tensor_u55_INT(test_data: input_t1): @common.XfailIfNoCorstone320 def test_add_tensor_u85_INT(test_data: input_t1): pipeline = EthosU85PipelineINT[input_t1]( - Add(), test_data(), aten_op, exir_op, run_on_fvp=True + Add(), + test_data(), + aten_op, + exir_op, ) pipeline.run() @@ -186,7 +192,10 @@ def test_add_tensor_tosa_INT_2(test_data: input_t2): @common.XfailIfNoCorstone300 def test_add_tensor_u55_INT_2(test_data: input_t2): pipeline = EthosU55PipelineINT[input_t2]( - Add2(), test_data(), aten_op, exir_op, run_on_fvp=True + Add2(), + test_data(), + aten_op, + exir_op, ) pipeline.run() @@ -195,7 +204,10 @@ def test_add_tensor_u55_INT_2(test_data: input_t2): @common.XfailIfNoCorstone320 def test_add_tensor_u85_INT_2(test_data: input_t2): pipeline = EthosU85PipelineINT[input_t2]( - Add2(), test_data(), aten_op, exir_op, run_on_fvp=True + Add2(), + test_data(), + aten_op, + exir_op, ) pipeline.run() @@ -290,7 +302,6 @@ def test_add_tensor_16a8w_u55_INT16(test_data: input_t1): exir_op, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -318,7 +329,6 @@ def test_add_tensor_16a8w_u85_INT16(test_data: input_t1): exir_op, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_addmm.py b/backends/arm/test/ops/test_addmm.py index 90d780dc490..b9a891ec740 100644 --- a/backends/arm/test/ops/test_addmm.py +++ b/backends/arm/test/ops/test_addmm.py @@ -255,7 +255,6 @@ def test_addmm_16a8w_u55_INT16(test_data: input_t1): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -283,7 +282,6 @@ def test_addmm_16a8w_u85_INT16(test_data: input_t1): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_amax.py b/backends/arm/test/ops/test_amax.py index 5a0ca1f8778..99529e07ca2 100644 --- a/backends/arm/test/ops/test_amax.py +++ b/backends/arm/test/ops/test_amax.py @@ -103,7 +103,6 @@ def test_amax_u85_INT(test_data: Amax.input_t): Amax(dim, keep_dims), data, Amax.aten_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_amin.py b/backends/arm/test/ops/test_amin.py index 183d43da585..1526ed21b89 100644 --- a/backends/arm/test/ops/test_amin.py +++ b/backends/arm/test/ops/test_amin.py @@ -112,7 +112,6 @@ def test_amin_u85_INT(test_data: Amin.input_t): Amin(dim, keep_dims), data, Amin.aten_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_any.py b/backends/arm/test/ops/test_any.py index 8c0c9eed54c..1676018f0ce 100644 --- a/backends/arm/test/ops/test_any.py +++ b/backends/arm/test/ops/test_any.py @@ -178,7 +178,6 @@ def test_any_u85_INT(test_data: input_t1): test_input(), op.aten_op, op.exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, diff --git a/backends/arm/test/ops/test_avg_pool2d.py b/backends/arm/test/ops/test_avg_pool2d.py index be54c76e68b..8310d1e40a4 100644 --- a/backends/arm/test/ops/test_avg_pool2d.py +++ b/backends/arm/test/ops/test_avg_pool2d.py @@ -151,7 +151,6 @@ def test_avg_pool2d_u55_INT(test_module): input_tensor, aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -166,7 +165,6 @@ def test_avg_pool2d_u85_INT(test_module): input_tensor, aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_batch_norm.py b/backends/arm/test/ops/test_batch_norm.py index a28180b7b57..fc5e11645dd 100644 --- a/backends/arm/test/ops/test_batch_norm.py +++ b/backends/arm/test/ops/test_batch_norm.py @@ -220,7 +220,6 @@ def test_native_batch_norm_legit_no_training_u55_INT_conv(test_data: Tuple): BatchNorm2dConv(*model_params), (test_data,), aten_ops=BatchNorm2dConv.aten_ops[0], # Bn is removed before check - run_on_fvp=True, qtol=1, ) pipeline.run() @@ -234,7 +233,6 @@ def test_native_batch_norm_legit_no_training_u85_INT_conv(test_data: Tuple): BatchNorm2dConv(*model_params), (test_data,), aten_ops=BatchNorm2dConv.aten_ops[0], # Bn is removed before check - run_on_fvp=True, qtol=1, ) pipeline.run() @@ -336,7 +334,6 @@ def test_native_batch_norm_legit_no_stats_u55_INT(test_data: Tuple): BatchNorm2dNoStats(*model_params), (test_data,), aten_op=BatchNorm2dNoStats.aten_ops, - run_on_fvp=True, qtol=1, ) pipeline.run() @@ -353,7 +350,6 @@ def test_native_batch_norm_legit_no_stats_u85_INT(test_data: Tuple): BatchNorm2dNoStats(*model_params), (test_data,), aten_op=BatchNorm2dNoStats.aten_ops, - run_on_fvp=False, qtol=1, ) pipeline.run() diff --git a/backends/arm/test/ops/test_bitwise.py b/backends/arm/test/ops/test_bitwise.py index 218f2290cab..f9b20e5dbdd 100644 --- a/backends/arm/test/ops/test_bitwise.py +++ b/backends/arm/test/ops/test_bitwise.py @@ -235,7 +235,6 @@ def test_bitwise_and_scalar_u85_INT(test_data: input_t2): test_data(), AndScalar.aten_op, AndScalar.exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -253,7 +252,6 @@ def test_bitwise_and_tensor_u85_INT(test_data: input_t2): test_data(), And().aten_op, And().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -418,7 +416,6 @@ def test_bitwise_xor_tensor_u85_INT(test_data: input_t2): test_data(), Xor().aten_op, Xor().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -436,7 +433,6 @@ def test_bitwise_xor_scalar_u85_INT(test_data: input_t2): test_data(), XorScalar.aten_op, XorScalar.exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -601,7 +597,6 @@ def test_bitwise_or_tensor_u85_INT(test_data: input_t2): test_data(), Or().aten_op, Or().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -619,7 +614,6 @@ def test_bitwise_or_scalar_u85_INT(test_data: input_t2): test_data(), OrScalar.aten_op, OrScalar.exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, diff --git a/backends/arm/test/ops/test_bmm.py b/backends/arm/test/ops/test_bmm.py index 9e09414e29b..f18d4c997a5 100644 --- a/backends/arm/test/ops/test_bmm.py +++ b/backends/arm/test/ops/test_bmm.py @@ -97,7 +97,6 @@ def test_bmm_u55_INT(test_data: input_t1): test_data(), aten_op_bmm, exir_op_bmm, - run_on_fvp=True, ) pipeline.run() @@ -110,7 +109,6 @@ def test_bmm_u85_INT(test_data: input_t1): test_data(), aten_op_bmm, exir_op_bmm, - run_on_fvp=True, ) pipeline.run() @@ -123,7 +121,6 @@ def test_bmm_u55_INT_single_input(test_data: input_t1): test_data(), aten_op_bmm, exir_op_bmm, - run_on_fvp=True, ) pipeline.run() @@ -136,7 +133,6 @@ def test_bmm_u85_INT_single_input(test_data: input_t1): test_data(), aten_op_bmm, exir_op_bmm, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_cat.py b/backends/arm/test/ops/test_cat.py index 84ecd8641b5..a410240d310 100644 --- a/backends/arm/test/ops/test_cat.py +++ b/backends/arm/test/ops/test_cat.py @@ -120,7 +120,6 @@ def test_cat_u55_INT(test_data: Tuple): test_data(), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -133,7 +132,6 @@ def test_cat_u85_INT(test_data: Tuple): test_data(), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -222,7 +220,6 @@ def test_cat_16a8w_u55_INT16(test_data: Tuple): exir_op, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -250,7 +247,6 @@ def test_cat_16a8w_u85_INT16(test_data: Tuple): exir_op, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_ceil.py b/backends/arm/test/ops/test_ceil.py index 64e9040a974..ed304bbd9df 100644 --- a/backends/arm/test/ops/test_ceil.py +++ b/backends/arm/test/ops/test_ceil.py @@ -78,7 +78,6 @@ def test_ceil_u55_INT(test_data: input_t1): (data,), module.aten_op, module.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -92,7 +91,6 @@ def test_ceil_u85_INT(test_data: input_t1): (data,), module.aten_op, module.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_clamp.py b/backends/arm/test/ops/test_clamp.py index 68c32e8fcc6..a5561802e44 100644 --- a/backends/arm/test/ops/test_clamp.py +++ b/backends/arm/test/ops/test_clamp.py @@ -96,7 +96,6 @@ def test_clamp_u55_INT(test_data): (input_tensor,), aten_op, exir_op, - run_on_fvp=True, ) pipeline.change_args("run_method_and_compare_outputs", qtol=1) @@ -115,7 +114,6 @@ def test_clamp_u85_INT(test_data): (input_tensor,), aten_op, exir_op, - run_on_fvp=True, ) pipeline.change_args("run_method_and_compare_outputs", qtol=1) diff --git a/backends/arm/test/ops/test_clone.py b/backends/arm/test/ops/test_clone.py index b240fb1ea07..8a6d3714b8b 100644 --- a/backends/arm/test/ops/test_clone.py +++ b/backends/arm/test/ops/test_clone.py @@ -102,7 +102,6 @@ def test_clone_u55_INT(input_data): input_tensor, aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -118,7 +117,6 @@ def test_clone_u85_INT(input_data): input_tensor, aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_conv1d.py b/backends/arm/test/ops/test_conv1d.py index ac66bc1556b..d58cdb5ff61 100644 --- a/backends/arm/test/ops/test_conv1d.py +++ b/backends/arm/test/ops/test_conv1d.py @@ -307,7 +307,6 @@ def test_convolution_1d_u55_INT(test_data): model.get_inputs(), aten_op, exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, qtol=1, ) @@ -323,7 +322,6 @@ def test_convolution_1d_u85_INT(test_data): model.get_inputs(), aten_op, exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, qtol=1, ) diff --git a/backends/arm/test/ops/test_conv2d.py b/backends/arm/test/ops/test_conv2d.py index 0300f7c2049..bf47e3fa084 100644 --- a/backends/arm/test/ops/test_conv2d.py +++ b/backends/arm/test/ops/test_conv2d.py @@ -426,7 +426,6 @@ def test_convolution_2d_u55_INT(test_data): model.get_inputs(), aten_op, exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -441,7 +440,6 @@ def test_convolution_u85_INT(test_data): model.get_inputs(), aten_op, exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() diff --git a/backends/arm/test/ops/test_conv3d.py b/backends/arm/test/ops/test_conv3d.py index b26f75daa1a..46986103aa0 100644 --- a/backends/arm/test/ops/test_conv3d.py +++ b/backends/arm/test/ops/test_conv3d.py @@ -367,7 +367,6 @@ def test_convolution_3d_u55_INT(test_data): model.get_inputs(), aten_op, exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -382,7 +381,6 @@ def test_convolution_3d_u85_INT(test_data): model.get_inputs(), aten_op, exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() diff --git a/backends/arm/test/ops/test_conv_combos.py b/backends/arm/test/ops/test_conv_combos.py index f57de4eeb21..f0f8b404594 100644 --- a/backends/arm/test/ops/test_conv_combos.py +++ b/backends/arm/test/ops/test_conv_combos.py @@ -258,7 +258,6 @@ def test_convolution_2d_u55_INT_meandim(): model.get_inputs(), aten_ops=[], exir_ops=ComboConv2dMeandim.edge_op_list, - run_on_fvp=True, ) pipeline.run() @@ -271,7 +270,6 @@ def test_convolution_2d_u85_INT_meandim(): model.get_inputs(), aten_ops=[], exir_ops=ComboConv2dMeandim.edge_op_list, - run_on_fvp=True, ) pipeline.run() @@ -346,7 +344,6 @@ def test_convolution_2d_u55_INT_batchnorm_relu6(test_data): model.get_inputs(), aten_ops=[], exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -362,7 +359,6 @@ def test_convolution_2d_u85_INT_batchnorm_relu6(test_data): model.get_inputs(), aten_ops=[], exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -441,7 +437,6 @@ def test_convolution_2d_u55_INT_relu6(test_data): input, aten_ops=[], exir_ops=ComboConvRelu6.edge_op_list, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -457,7 +452,6 @@ def test_convolution_2d_u85_INT_relu6(test_data): input, aten_ops=[], exir_ops=ComboConvRelu6.edge_op_list, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -533,7 +527,6 @@ def test_convolution_2d_u55_INT_block_bottleneck(test_data): model.get_inputs(), aten_ops=[], exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -549,7 +542,6 @@ def test_convolution_2d_u85_INT_block_bottleneck(test_data): model.get_inputs(), aten_ops=[], exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -626,7 +618,6 @@ def test_convolution_2d_u55_INT_avgpool2d(test_data): input, aten_ops=[], exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -642,7 +633,6 @@ def test_convolution_2d_u85_INT_avgpool2d(test_data): input, aten_ops=[], exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() diff --git a/backends/arm/test/ops/test_cos.py b/backends/arm/test/ops/test_cos.py index acb950f2a2e..b0c35bf7878 100644 --- a/backends/arm/test/ops/test_cos.py +++ b/backends/arm/test/ops/test_cos.py @@ -66,25 +66,25 @@ def test_cos_tosa_INT(test_data: Tuple): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_cos_u55_INT(test_data: Tuple): pipeline = EthosU55PipelineINT[input_t1]( Cos(), (test_data,), aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone320 def test_cos_u85_INT(test_data: Tuple): pipeline = EthosU85PipelineINT[input_t1]( Cos(), (test_data,), aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() diff --git a/backends/arm/test/ops/test_depthwise_conv.py b/backends/arm/test/ops/test_depthwise_conv.py index 0f8b34d3d47..e49ab236d86 100644 --- a/backends/arm/test/ops/test_depthwise_conv.py +++ b/backends/arm/test/ops/test_depthwise_conv.py @@ -260,7 +260,6 @@ def test_convolution_2d_u55_INT_depthwise(test_data): model.get_inputs(), aten_ops=[], exir_ops=exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -275,7 +274,6 @@ def test_convolution_1d_u55_INT_depthwise(test_data): model.get_inputs(), aten_ops=[], exir_ops=exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -290,7 +288,6 @@ def test_convolution_2d_u85_INT_depthwise(test_data): model.get_inputs(), aten_ops=[], exir_ops=exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() @@ -305,7 +302,6 @@ def test_convolution_1d_u85_INT_depthwise(test_data): model.get_inputs(), aten_ops=[], exir_ops=exir_op, - run_on_fvp=True, per_channel_quantization=per_channel_quantization, ) pipeline.run() diff --git a/backends/arm/test/ops/test_div.py b/backends/arm/test/ops/test_div.py index 5bacac1c962..612622b46cb 100644 --- a/backends/arm/test/ops/test_div.py +++ b/backends/arm/test/ops/test_div.py @@ -109,7 +109,6 @@ def test_div_tensor_u55_INT(test_data: Tuple): test_data(), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -122,7 +121,6 @@ def test_div_tensor_u85_INT(test_data: Tuple): test_data(), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_div_tensor_mode.py b/backends/arm/test/ops/test_div_tensor_mode.py index 909b83bd97f..e1f6036a487 100644 --- a/backends/arm/test/ops/test_div_tensor_mode.py +++ b/backends/arm/test/ops/test_div_tensor_mode.py @@ -96,7 +96,6 @@ def test_div_tensor_mode_u55_INT(data): aten_ops=model.aten_ops_int, exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.run() @@ -113,7 +112,6 @@ def test_div_tensor_mode_u85_INT(data): aten_ops=model.aten_ops_int, exir_ops=[], use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_eq.py b/backends/arm/test/ops/test_eq.py index b840869ba48..8f783240a2c 100644 --- a/backends/arm/test/ops/test_eq.py +++ b/backends/arm/test/ops/test_eq.py @@ -165,7 +165,6 @@ def test_eq_scalar_u85_INT_tensor(test_module): test_module().get_inputs(), Equal.aten_op_Tensor, Equal.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -185,7 +184,6 @@ def test_eq_scalar_u85_INT(test_module): test_module().get_inputs(), Equal.aten_op_Tensor, Equal.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_erf.py b/backends/arm/test/ops/test_erf.py index 363b1e2d8c9..e6b28255d6b 100644 --- a/backends/arm/test/ops/test_erf.py +++ b/backends/arm/test/ops/test_erf.py @@ -50,7 +50,10 @@ def test_erf_tosa_INT(test_data: input_t1): @common.XfailIfNoCorstone300 def test_erf_u55_INT(test_data: input_t1): pipeline = EthosU55PipelineINT[input_t1]( - Erf(), test_data(), aten_op, exir_op, run_on_fvp=True + Erf(), + test_data(), + aten_op, + exir_op, ) pipeline.run() @@ -59,7 +62,10 @@ def test_erf_u55_INT(test_data: input_t1): @common.XfailIfNoCorstone320 def test_erf_u85_INT(test_data: input_t1): pipeline = EthosU85PipelineINT[input_t1]( - Erf(), test_data(), aten_op, exir_op, run_on_fvp=True + Erf(), + test_data(), + aten_op, + exir_op, ) pipeline.run() diff --git a/backends/arm/test/ops/test_exp.py b/backends/arm/test/ops/test_exp.py index 6eaacc71d86..56d258944c2 100644 --- a/backends/arm/test/ops/test_exp.py +++ b/backends/arm/test/ops/test_exp.py @@ -68,7 +68,6 @@ def test_exp_u55_INT(test_data: Tuple): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -81,7 +80,6 @@ def test_exp_u85_INT(test_data: Tuple): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_expand.py b/backends/arm/test/ops/test_expand.py index b5784c9ff93..34694469bbf 100644 --- a/backends/arm/test/ops/test_expand.py +++ b/backends/arm/test/ops/test_expand.py @@ -79,7 +79,6 @@ def test_expand_u55_INT(test_data: Tuple): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -92,7 +91,6 @@ def test_expand_u85_INT(test_data: Tuple): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_floor.py b/backends/arm/test/ops/test_floor.py index c66ef1c5d27..475fe18679a 100644 --- a/backends/arm/test/ops/test_floor.py +++ b/backends/arm/test/ops/test_floor.py @@ -78,7 +78,6 @@ def test_floor_u55_INT(test_data: input_t1): (data,), module.aten_op, module.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -92,7 +91,6 @@ def test_floor_u85_INT(test_data: input_t1): (data,), module.aten_op, module.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_full.py b/backends/arm/test/ops/test_full.py index 9e2c9b4d8be..8ab063e9957 100644 --- a/backends/arm/test/ops/test_full.py +++ b/backends/arm/test/ops/test_full.py @@ -202,7 +202,6 @@ def test_full_u85_INT(test_data: Tuple): test_data, aten_ops=[], exir_ops=exir_op, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -216,7 +215,6 @@ def test_full_u55_INT(test_data: Tuple): test_data, aten_ops=[], exir_ops=exir_op, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_ge.py b/backends/arm/test/ops/test_ge.py index 94f33d28630..ede5be76eda 100644 --- a/backends/arm/test/ops/test_ge.py +++ b/backends/arm/test/ops/test_ge.py @@ -161,7 +161,6 @@ def test_ge_tensor_u85_INT(test_module): test_module().get_inputs(), GreaterEqual.aten_op_tensor, GreaterEqual.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -177,7 +176,6 @@ def test_ge_scalar_u85_INT(test_module): test_module().get_inputs(), GreaterEqual.aten_op_tensor, GreaterEqual.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_group_norm.py b/backends/arm/test/ops/test_group_norm.py index 0f314064548..8f2c0f0d6a5 100644 --- a/backends/arm/test/ops/test_group_norm.py +++ b/backends/arm/test/ops/test_group_norm.py @@ -118,7 +118,6 @@ def test_native_group_norm_u55_INT(test_data): test_data[1], test_data[0], "torch.ops.aten.sub.Tensor", # 'sub' op arbitrarily chosen to confirm groupnorm was decomposed - run_on_fvp=True, atol=0.1, # TODO: "MLETORCH-925: Fix numerical issue for aten.native_group_norm" ) pipeline.change_args("run_method_and_compare_outputs", atol=1, qtol=1) @@ -142,7 +141,6 @@ def test_native_group_norm_u85_INT(test_data): test_data[1], test_data[0], "torch.ops.aten.sub.Tensor", # 'sub' op arbitrarily chosen to confirm groupnorm was decomposed - run_on_fvp=True, atol=0.1, # TODO: "MLETORCH-925: Fix numerical issue for aten.native_group_norm" ) pipeline.change_args("run_method_and_compare_outputs", atol=1, qtol=1) diff --git a/backends/arm/test/ops/test_gt.py b/backends/arm/test/ops/test_gt.py index 41229397eb5..0e50b6b78be 100644 --- a/backends/arm/test/ops/test_gt.py +++ b/backends/arm/test/ops/test_gt.py @@ -162,7 +162,6 @@ def test_gt_tensor_u85_INT(test_module): test_module().get_inputs(), Greater.aten_op_tensor, Greater.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -178,7 +177,6 @@ def test_gt_scalar_u85_INT(test_module): test_module().get_inputs(), Greater.aten_op_tensor, Greater.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_hardsigmoid.py b/backends/arm/test/ops/test_hardsigmoid.py index 5f591c15617..568eb069f8b 100644 --- a/backends/arm/test/ops/test_hardsigmoid.py +++ b/backends/arm/test/ops/test_hardsigmoid.py @@ -70,7 +70,6 @@ def test_hardsigmoid_u55_INT(test_data: torch.Tensor): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -84,7 +83,6 @@ def test_hardsigmoid_u85_INT(test_data: torch.Tensor): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_hardswish.py b/backends/arm/test/ops/test_hardswish.py index 00db0cb296b..760293ec492 100644 --- a/backends/arm/test/ops/test_hardswish.py +++ b/backends/arm/test/ops/test_hardswish.py @@ -62,7 +62,6 @@ def test_hardswish_u55_INT(test_data): (test_data(),), aten_op, exir_op, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ).run() @@ -75,7 +74,6 @@ def test_hardswish_u85_INT(test_data): (test_data(),), aten_op, exir_op, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ).run() diff --git a/backends/arm/test/ops/test_hardtanh.py b/backends/arm/test/ops/test_hardtanh.py index 28f7e717351..3bb8e212cc9 100644 --- a/backends/arm/test/ops/test_hardtanh.py +++ b/backends/arm/test/ops/test_hardtanh.py @@ -71,7 +71,6 @@ def test_hardtanh_u55_INT(test_data: torch.Tensor): (test_data(),), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -84,7 +83,6 @@ def test_hardtanh_u85_INT(test_data: torch.Tensor): (test_data(),), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_layer_norm.py b/backends/arm/test/ops/test_layer_norm.py index 2c9b83dc7e7..2659bc2eab4 100644 --- a/backends/arm/test/ops/test_layer_norm.py +++ b/backends/arm/test/ops/test_layer_norm.py @@ -95,7 +95,6 @@ def test_native_layer_norm_u55_INT(test_data): model, test_data, "torch.ops.aten.sub.Tensor", # Just check for sub op included in the layernorm decomposition - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.run() @@ -109,7 +108,6 @@ def test_native_layer_norm_u85_INT(test_data): model, test_data, "torch.ops.aten.sub.Tensor", # Just check for sub op included in the layernorm decomposition - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_le.py b/backends/arm/test/ops/test_le.py index 31422302a2d..fd0e63e9beb 100644 --- a/backends/arm/test/ops/test_le.py +++ b/backends/arm/test/ops/test_le.py @@ -163,7 +163,6 @@ def test_le_tensor_u85_INT(test_module): test_module().get_inputs(), LessEqual.aten_op_tensor, LessEqual.exir_op, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -180,7 +179,6 @@ def test_le_scalar_u85_INT(test_module): test_module().get_inputs(), LessEqual.aten_op_tensor, LessEqual.exir_op, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_leaky_relu.py b/backends/arm/test/ops/test_leaky_relu.py index 432c4da7ecc..a7ae4cb8564 100644 --- a/backends/arm/test/ops/test_leaky_relu.py +++ b/backends/arm/test/ops/test_leaky_relu.py @@ -73,7 +73,6 @@ def test_leaky_relu_u55_INT(test_data): LeakyReLU(slope), data, [], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.add_stage_after("quantize", pipeline.tester.check_not, [aten_op]) @@ -88,7 +87,6 @@ def test_leaky_relu_u85_INT(test_data): LeakyReLU(slope), data, [], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.add_stage_after("quantize", pipeline.tester.check_not, [aten_op]) diff --git a/backends/arm/test/ops/test_linalg_vector_norm.py b/backends/arm/test/ops/test_linalg_vector_norm.py index 1777cffb0a7..df3bef38cc1 100644 --- a/backends/arm/test/ops/test_linalg_vector_norm.py +++ b/backends/arm/test/ops/test_linalg_vector_norm.py @@ -103,7 +103,6 @@ def test_vector_norm_u55_INT_fvp(test_module): input_tensor, aten_op_q_decomposed_q, exir_op_q_decomposed, - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.pop_stage("check_not.exir") @@ -121,7 +120,6 @@ def test_vector_norm_u85_INT_fvp(test_module): input_tensor, aten_op_q_decomposed_q, exir_op_q_decomposed, - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.pop_stage("check_not.exir") diff --git a/backends/arm/test/ops/test_linear.py b/backends/arm/test/ops/test_linear.py index ebc2ead8a83..bd719954ff5 100644 --- a/backends/arm/test/ops/test_linear.py +++ b/backends/arm/test/ops/test_linear.py @@ -182,7 +182,6 @@ def test_linear_u55_INT(test_data: torch.Tensor): (test_data,), aten_op, exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, ).run() @@ -205,7 +204,6 @@ def test_linear_u85_INT(test_data: torch.Tensor): (test_data,), aten_op, exir_ops=[], - run_on_fvp=True, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, ).run() diff --git a/backends/arm/test/ops/test_log.py b/backends/arm/test/ops/test_log.py index 1ed5c57f1ab..44811715407 100644 --- a/backends/arm/test/ops/test_log.py +++ b/backends/arm/test/ops/test_log.py @@ -60,7 +60,6 @@ def test_log_u55_INT(test_data: input_t1): (test_data(),), aten_op, exir_op, - run_on_fvp=True, ).run() @@ -72,7 +71,6 @@ def test_log_u85_INT(test_data: input_t1): (test_data(),), aten_op, exir_op, - run_on_fvp=True, ).run() diff --git a/backends/arm/test/ops/test_logical.py b/backends/arm/test/ops/test_logical.py index 2b160ce7b50..e772840e6e6 100644 --- a/backends/arm/test/ops/test_logical.py +++ b/backends/arm/test/ops/test_logical.py @@ -137,7 +137,6 @@ def test_logical_and_u85_INT(test_data: input_t2): test_data(), And().aten_op, And().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -231,7 +230,6 @@ def test_logical_xor_u85_INT(test_data: input_t2): test_data(), Xor().aten_op, Xor().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -325,7 +323,6 @@ def test_logical_or_u85_INT(test_data: input_t2): test_data(), Or().aten_op, Or().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, @@ -419,7 +416,6 @@ def test_logical_not_u85_INT(test_data: input_t2): test_data(), Not().aten_op, Not().exir_op, - run_on_fvp=True, atol=0, rtol=0, qtol=0, diff --git a/backends/arm/test/ops/test_logsoftmax.py b/backends/arm/test/ops/test_logsoftmax.py index 502aa2f27c7..f0411847dd3 100644 --- a/backends/arm/test/ops/test_logsoftmax.py +++ b/backends/arm/test/ops/test_logsoftmax.py @@ -72,7 +72,6 @@ def test_log_softmax_u55_INT(test_data): LogSoftmax(dim), data, [], - run_on_fvp=True, ) pipeline.add_stage_after("quantize", pipeline.tester.check_not, [aten_op]) pipeline.change_args("run_method_and_compare_outputs", qtol=1) @@ -87,7 +86,6 @@ def test_log_softmax_u85_INT(test_data): LogSoftmax(dim), data, [], - run_on_fvp=True, ) pipeline.add_stage_after("quantize", pipeline.tester.check_not, [aten_op]) pipeline.change_args("run_method_and_compare_outputs", qtol=1) diff --git a/backends/arm/test/ops/test_lshift.py b/backends/arm/test/ops/test_lshift.py index bab364a4528..3af49cd4dc2 100644 --- a/backends/arm/test/ops/test_lshift.py +++ b/backends/arm/test/ops/test_lshift.py @@ -103,7 +103,6 @@ def test_bitwise_left_shift_tensor_u55_INT_scalar(test_data): test_data, LshiftScalar.torch_op_INT, LshiftScalar.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() @@ -117,7 +116,6 @@ def test_bitwise_left_shift_tensor_u85_INT_scalar(test_data): test_data, LshiftScalar.torch_op_INT, LshiftScalar.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() @@ -178,28 +176,26 @@ def test_bitwise_left_shift_tensor_tosa_INT(test_data): @common.parametrize("test_data", LshiftTensor.test_data) -@XfailIfNoCorstone300 +@common.XfailIfNoCorstone300 def test_bitwise_left_shift_tensor_u55_INT(test_data): pipeline = EthosU55PipelineINT[scalar_input_t]( LshiftTensor(), test_data, LshiftTensor.torch_op, LshiftTensor.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() @common.parametrize("test_data", LshiftTensor.test_data) -@XfailIfNoCorstone320 +@common.XfailIfNoCorstone320 def test_bitwise_left_shift_tensor_u85_INT(test_data): pipeline = EthosU85PipelineINT[scalar_input_t]( LshiftTensor(), test_data, LshiftTensor.torch_op, LshiftTensor.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() diff --git a/backends/arm/test/ops/test_lt.py b/backends/arm/test/ops/test_lt.py index 98d0298b195..d0ed1a34185 100644 --- a/backends/arm/test/ops/test_lt.py +++ b/backends/arm/test/ops/test_lt.py @@ -162,7 +162,6 @@ def test_lt_tensor_u85_INT(test_module): test_module().get_inputs(), LessThan.aten_op_tensor, LessThan.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -178,7 +177,6 @@ def test_lt_scalar_u85_INT(test_module): test_module().get_inputs(), LessThan.aten_op_tensor, LessThan.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_matmul.py b/backends/arm/test/ops/test_matmul.py index d1a21684325..a788fc00a5d 100644 --- a/backends/arm/test/ops/test_matmul.py +++ b/backends/arm/test/ops/test_matmul.py @@ -122,7 +122,6 @@ def test_matmul_u55_INT(test_data: input_t1): test_data(), aten_op_mm, exir_op_mm, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -136,7 +135,6 @@ def test_matmul_single_input_u55_INT(test_data: input_t1): test_data(), aten_op_mm, exir_op_mm, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -150,7 +148,6 @@ def test_matmul_combo_u55_INT(test_data: input_t1): test_data(), aten_op_mm, exir_op_mm, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -164,7 +161,6 @@ def test_matmul_u85_INT(test_data: input_t1): test_data(), aten_op_mm, exir_op_mm, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -178,7 +174,6 @@ def test_matmul_single_input_u85_INT(test_data: input_t1): test_data(), aten_op_mm, exir_op_mm, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -192,7 +187,6 @@ def test_matmul_combo_u85_INT(test_data: input_t1): test_data(), aten_op_mm, exir_op_mm, - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_max_pool.py b/backends/arm/test/ops/test_max_pool.py index 7db56311837..559932848e4 100644 --- a/backends/arm/test/ops/test_max_pool.py +++ b/backends/arm/test/ops/test_max_pool.py @@ -142,7 +142,6 @@ def test_max_pool2d_u55_INT(test_data: torch.Tensor): (test_data,), aten_op, exir_ops=[], - run_on_fvp=True, ).run() @@ -155,7 +154,6 @@ def test_max_pool2d_u85_INT(test_data: torch.Tensor): (test_data,), aten_op, exir_ops=[], - run_on_fvp=True, ).run() diff --git a/backends/arm/test/ops/test_maximum.py b/backends/arm/test/ops/test_maximum.py index eb0d4b86efc..ed3a5247d3d 100644 --- a/backends/arm/test/ops/test_maximum.py +++ b/backends/arm/test/ops/test_maximum.py @@ -61,7 +61,6 @@ def test_maximum_u55_INT(test_data: Tuple): Maximum(), test_data(), aten_op, - run_on_fvp=True, ).run() @@ -72,7 +71,6 @@ def test_maximum_u85_INT(test_data: Tuple): Maximum(), test_data(), aten_op, - run_on_fvp=True, ).run() diff --git a/backends/arm/test/ops/test_mean_dim.py b/backends/arm/test/ops/test_mean_dim.py index 0de2dd3af12..96ec7793551 100644 --- a/backends/arm/test/ops/test_mean_dim.py +++ b/backends/arm/test/ops/test_mean_dim.py @@ -66,7 +66,6 @@ def test_adaptive_avg_pool2d_u55_INT(test_data): test_data(), AdaptiveAveragePool2d.aten_op, AdaptiveAveragePool2d.exir_op, - run_on_fvp=True, symmetric_io_quantization=True, ).run() @@ -79,7 +78,6 @@ def test_adaptive_avg_pool2d_u85_INT(test_data): test_data(), AdaptiveAveragePool2d.aten_op, AdaptiveAveragePool2d.exir_op, - run_on_fvp=True, symmetric_io_quantization=True, ).run() @@ -303,7 +301,6 @@ def test_mean_dim_u55_INT(test_data): MeanDim(dim, keep_dim), (test_data,), [], # Might be sum, avgpool, or both - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.add_stage_after( @@ -323,7 +320,6 @@ def test_mean_dim_u85_INT(test_data): MeanDim(dim, keep_dim), (test_data,), [], # Might be sum, avgpool, or both - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_minimum.py b/backends/arm/test/ops/test_minimum.py index 88ae2c2b8da..3e87e64acbd 100644 --- a/backends/arm/test/ops/test_minimum.py +++ b/backends/arm/test/ops/test_minimum.py @@ -61,7 +61,6 @@ def test_minimum_u55_INT(test_data: Tuple): Minimum(), test_data(), aten_op, - run_on_fvp=True, ).run() @@ -72,7 +71,6 @@ def test_minimum_u85_INT(test_data: Tuple): Minimum(), test_data(), aten_op, - run_on_fvp=True, ).run() diff --git a/backends/arm/test/ops/test_mm.py b/backends/arm/test/ops/test_mm.py index 1b76baaeff0..afb7a6d7d30 100644 --- a/backends/arm/test/ops/test_mm.py +++ b/backends/arm/test/ops/test_mm.py @@ -53,7 +53,6 @@ def test_mm_u55_INT(test_data: Tuple): MM(), test_data(), MM.aten_op, - run_on_fvp=True, ).run() @@ -65,7 +64,6 @@ def test_mm_u85_INT(test_data: Tuple): test_data(), MM.aten_op, MM.exir_op, - run_on_fvp=True, ).run() diff --git a/backends/arm/test/ops/test_mul.py b/backends/arm/test/ops/test_mul.py index b2db55d90fd..e3f2096e7da 100644 --- a/backends/arm/test/ops/test_mul.py +++ b/backends/arm/test/ops/test_mul.py @@ -200,7 +200,6 @@ def test_mul_tensor_u55_INT(test_data: torch.Tensor): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -213,7 +212,6 @@ def test_mul_tensor_u85_INT(test_data: torch.Tensor): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -226,7 +224,6 @@ def test_mul_tensor_u55_INT_int32(test_data: torch.Tensor): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() @@ -240,7 +237,6 @@ def test_mul_tensor_u85_INT_int32(test_data: torch.Tensor): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() @@ -356,7 +352,6 @@ def test_mul_tensor_16a8w_u55_INT16(test_data: input_t1): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -384,7 +379,6 @@ def test_mul_tensor_16a8w_u85_INT16(test_data: input_t1): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_multihead_attention.py b/backends/arm/test/ops/test_multihead_attention.py index 71cf076a157..c7998e2235e 100644 --- a/backends/arm/test/ops/test_multihead_attention.py +++ b/backends/arm/test/ops/test_multihead_attention.py @@ -79,7 +79,6 @@ def test_multihead_attention_u55_INT(test_data: input_t1): [], [], use_to_edge_transform_and_lower=True, - run_on_fvp=True, # TODO: Per-channel quantization is broken (MLETORCH-1144) per_channel_quantization=False, ) @@ -101,7 +100,6 @@ def test_multihead_attention_u85_INT(test_data: input_t1): [], [], use_to_edge_transform_and_lower=True, - run_on_fvp=True, # TODO: Per-channel quantization is broken (MLETORCH-1144) per_channel_quantization=False, ) diff --git a/backends/arm/test/ops/test_ne.py b/backends/arm/test/ops/test_ne.py index 60f07ad9fdd..e20953b64dc 100644 --- a/backends/arm/test/ops/test_ne.py +++ b/backends/arm/test/ops/test_ne.py @@ -171,7 +171,6 @@ def test_ne_tensor_u85_INT(test_module): test_module.get_inputs(), NotEqual.decomposed_ops, NotEqual.decomposed_exir_ops, - run_on_fvp=True, ) pipeline.run() @@ -192,7 +191,6 @@ def test_ne_scalar_u85_INT(test_module): test_module.get_inputs(), NotEqual.decomposed_ops, NotEqual.decomposed_exir_ops, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_neg.py b/backends/arm/test/ops/test_neg.py index 395a4815b62..f0afe7bd23b 100644 --- a/backends/arm/test/ops/test_neg.py +++ b/backends/arm/test/ops/test_neg.py @@ -53,7 +53,10 @@ def test_neg_tosa_INT(test_data: input_t1): @common.XfailIfNoCorstone300 def test_neg_u55_INT(test_data: input_t1): pipeline = EthosU55PipelineINT[input_t1]( - Neg(), test_data, Neg.aten_op, Neg.exir_op, run_on_fvp=True + Neg(), + test_data, + Neg.aten_op, + Neg.exir_op, ) pipeline.run() @@ -62,7 +65,10 @@ def test_neg_u55_INT(test_data: input_t1): @common.XfailIfNoCorstone320 def test_neg_u85_INT(test_data: input_t1): pipeline = EthosU85PipelineINT[input_t1]( - Neg(), test_data, Neg.aten_op, Neg.exir_op, run_on_fvp=True + Neg(), + test_data, + Neg.aten_op, + Neg.exir_op, ) pipeline.run() diff --git a/backends/arm/test/ops/test_permute.py b/backends/arm/test/ops/test_permute.py index eb482bcee54..6fd8555b56b 100644 --- a/backends/arm/test/ops/test_permute.py +++ b/backends/arm/test/ops/test_permute.py @@ -85,7 +85,6 @@ def test_permute_u55_INT(test_data): (test_data,), aten_op, exir_ops="executorch_exir_dialects_edge__ops_aten_permute_copy_default", - run_on_fvp=True, ) pipeline.run() @@ -99,7 +98,6 @@ def test_permute_u85_INT(test_data: torch.Tensor): (test_data,), aten_op, exir_ops="executorch_exir_dialects_edge__ops_aten_permute_copy_default", - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_pow.py b/backends/arm/test/ops/test_pow.py index 016c3e97265..377d1355992 100644 --- a/backends/arm/test/ops/test_pow.py +++ b/backends/arm/test/ops/test_pow.py @@ -159,7 +159,6 @@ def test_pow_tensor_scalar_u55_INT(test_data: Pow_TensorScalar.input_t): (base,), Pow_TensorScalar.aten_op, Pow_TensorScalar.exir_op, - run_on_fvp=True, ) pipeline.run() @@ -173,7 +172,6 @@ def test_pow_tensor_scalar_u85_INT(test_data: Pow_TensorScalar.input_t): (base,), Pow_TensorScalar.aten_op, Pow_TensorScalar.exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_reciprocal.py b/backends/arm/test/ops/test_reciprocal.py index 78edbb980e8..3e4d7c18b40 100644 --- a/backends/arm/test/ops/test_reciprocal.py +++ b/backends/arm/test/ops/test_reciprocal.py @@ -71,7 +71,6 @@ def test_reciprocal_u55_INT(test_data: torch.Tensor): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() @@ -84,7 +83,6 @@ def test_reciprocal_u85_INT(test_data: torch.Tensor): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=False, symmetric_io_quantization=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_relu.py b/backends/arm/test/ops/test_relu.py index 0b29bc24e75..f1ffcab191a 100644 --- a/backends/arm/test/ops/test_relu.py +++ b/backends/arm/test/ops/test_relu.py @@ -66,25 +66,25 @@ def test_relu_tosa_INT(test_data: torch.Tensor): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_relu_u55_INT(test_data: torch.Tensor): pipeline = EthosU55PipelineINT[input_t1]( Relu(), (test_data(),), aten_op, exir_op, - run_on_fvp=False, ) pipeline.run() @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone320 def test_relu_u85_INT(test_data: torch.Tensor): pipeline = EthosU85PipelineINT[input_t1]( Relu(), (test_data(),), aten_op, exir_op, - run_on_fvp=False, ) pipeline.run() diff --git a/backends/arm/test/ops/test_repeat.py b/backends/arm/test/ops/test_repeat.py index 3236515b661..56986a54781 100644 --- a/backends/arm/test/ops/test_repeat.py +++ b/backends/arm/test/ops/test_repeat.py @@ -88,6 +88,7 @@ def test_repeat_tosa_INT(test_data: Tuple): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_repeat_u55_INT(test_data: Tuple): module, test_data = test_data() pipeline = EthosU55PipelineINT[input_t1]( @@ -95,12 +96,12 @@ def test_repeat_u55_INT(test_data: Tuple): test_data, module.aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone320 def test_repeat_u85_INT(test_data: Tuple): module, test_data = test_data() pipeline = EthosU85PipelineINT[input_t1]( @@ -108,7 +109,6 @@ def test_repeat_u85_INT(test_data: Tuple): test_data, module.aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() diff --git a/backends/arm/test/ops/test_rshift.py b/backends/arm/test/ops/test_rshift.py index e97bfb840ae..f7a821e3a63 100644 --- a/backends/arm/test/ops/test_rshift.py +++ b/backends/arm/test/ops/test_rshift.py @@ -96,14 +96,13 @@ def test_bitwise_right_shift_tensor_tosa_INT_scalar(test_data): @common.parametrize("test_data", RshiftScalar.test_data) -@XfailIfNoCorstone300 +@common.XfailIfNoCorstone300 def test_bitwise_right_shift_tensor_u55_INT_scalar(test_data): pipeline = EthosU55PipelineINT[scalar_input_t]( RshiftScalar(), test_data(), RshiftScalar.torch_op_INT, RshiftScalar.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") @@ -113,14 +112,13 @@ def test_bitwise_right_shift_tensor_u55_INT_scalar(test_data): @common.parametrize("test_data", RshiftScalar.test_data) -@XfailIfNoCorstone320 +@common.XfailIfNoCorstone320 def test_bitwise_right_shift_tensor_u85_INT_scalar(test_data): pipeline = EthosU85PipelineINT[scalar_input_t]( RshiftScalar(), test_data(), RshiftScalar.torch_op_INT, RshiftScalar.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() @@ -188,7 +186,6 @@ def test_bitwise_right_shift_tensor_u55_INT(test_data): test_data(), RshiftTensor.torch_op, RshiftTensor.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") @@ -205,7 +202,6 @@ def test_bitwise_right_shift_tensor_u85_INT(test_data): test_data(), RshiftTensor.torch_op, RshiftTensor.exir_op, - run_on_fvp=True, ) pipeline.pop_stage("check.quant_nodes") pipeline.run() diff --git a/backends/arm/test/ops/test_rsqrt.py b/backends/arm/test/ops/test_rsqrt.py index d146a83287e..23bb9dc1a4b 100644 --- a/backends/arm/test/ops/test_rsqrt.py +++ b/backends/arm/test/ops/test_rsqrt.py @@ -66,7 +66,6 @@ def test_rsqrt_u55_INT(test_tensor: torch.Tensor): test_tensor(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -79,7 +78,6 @@ def test_rsqrt_u85_INT(test_tensor: torch.Tensor): test_tensor(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_scalar_tensor.py b/backends/arm/test/ops/test_scalar_tensor.py index b6f59b184a8..ecc2fece223 100644 --- a/backends/arm/test/ops/test_scalar_tensor.py +++ b/backends/arm/test/ops/test_scalar_tensor.py @@ -86,7 +86,6 @@ def test_scalar_tensor_u55_INT(test_data): ScalarTensor(scalar, dtype), tuple(data), ScalarTensor.aten_op, - run_on_fvp=True, ).run() @@ -98,7 +97,6 @@ def test_scalar_tensor_u85_INT(test_data): ScalarTensor(scalar, dtype), tuple(data), ScalarTensor.aten_op, - run_on_fvp=True, ).run() diff --git a/backends/arm/test/ops/test_select.py b/backends/arm/test/ops/test_select.py index e6f87826f59..b47295f967b 100644 --- a/backends/arm/test/ops/test_select.py +++ b/backends/arm/test/ops/test_select.py @@ -111,7 +111,6 @@ def test_select_int_u55_INT_copy(test_data: Tuple): test_data(), aten_op_copy, exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -125,7 +124,6 @@ def test_select_int_u55_INT(test_data: Tuple): test_data(), aten_op_int, exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -152,7 +150,6 @@ def test_select_int_u85_INT_copy(test_data: Tuple): test_data(), aten_op_copy, exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() @@ -166,7 +163,6 @@ def test_select_int_u85_INT(test_data: Tuple): test_data(), aten_op_int, exir_ops=[], - run_on_fvp=True, use_to_edge_transform_and_lower=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_sigmoid.py b/backends/arm/test/ops/test_sigmoid.py index aac2ee1c9b1..a9b9ef11b48 100644 --- a/backends/arm/test/ops/test_sigmoid.py +++ b/backends/arm/test/ops/test_sigmoid.py @@ -141,25 +141,25 @@ def test_sigmoid_tosa_INT_3(): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_sigmoid_u55_INT(test_data: Tuple): pipeline = EthosU55PipelineINT[input_t1]( Sigmoid(), (test_data(),), aten_op, exir_op, - run_on_fvp=False, ) pipeline.run() @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone320 def test_sigmoid_u85_INT(test_data: Tuple): pipeline = EthosU85PipelineINT[input_t1]( Sigmoid(), (test_data(),), aten_op, exir_op, - run_on_fvp=False, ) pipeline.run() @@ -324,7 +324,6 @@ def test_sigmoid_16a8w_u55_INT16(test_data: torch.Tensor): exir_op, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -352,7 +351,6 @@ def test_sigmoid_16a8w_u85_INT16(test_data: torch.Tensor): exir_op, per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_sigmoid_16bit.py b/backends/arm/test/ops/test_sigmoid_16bit.py index ad8c49b234c..587ba99222a 100644 --- a/backends/arm/test/ops/test_sigmoid_16bit.py +++ b/backends/arm/test/ops/test_sigmoid_16bit.py @@ -125,6 +125,7 @@ def test_sigmoid_tosa_INT_add_sigmoid(test_data): "test_data", test_data_suite, ) +@common.XfailIfNoCorstone300 def test_sigmoid_u55_INT(test_data): pipeline = OpNotSupportedPipeline( Sigmoid(), @@ -141,6 +142,7 @@ def test_sigmoid_u55_INT(test_data): "test_data", test_data_suite, ) +@common.XfailIfNoCorstone300 def test_sigmoid_u55_INT_add_sigmoid(test_data): pipeline = OpNotSupportedPipeline( SigmoidAddSigmoid(), @@ -163,7 +165,6 @@ def test_sigmoid_u85_INT(test_data): (test_data(),), Sigmoid.aten_op, Sigmoid.exir_op, - run_on_fvp=True, ) pipeline.change_args("quantize", get_16bit_sigmoid_quantizer()) pipeline.run() @@ -184,7 +185,6 @@ def test_sigmoid_u85_INT_add_sigmoid(test_data): (test_data(),), Sigmoid.aten_op, Sigmoid.exir_op, - run_on_fvp=True, ) pipeline.change_args("quantize", get_16bit_sigmoid_quantizer()) pipeline.run() diff --git a/backends/arm/test/ops/test_sigmoid_32bit.py b/backends/arm/test/ops/test_sigmoid_32bit.py index 70863cd4757..389f1d8a278 100644 --- a/backends/arm/test/ops/test_sigmoid_32bit.py +++ b/backends/arm/test/ops/test_sigmoid_32bit.py @@ -131,6 +131,7 @@ def test_sigmoid_tosa_INT_add_sigmoid(test_data): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_sigmoid_u55_INT(test_data): pipeline = OpNotSupportedPipeline( Sigmoid(), @@ -145,6 +146,7 @@ def test_sigmoid_u55_INT(test_data): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_sigmoid_u55_INT_add_sigmoid(test_data): pipeline = OpNotSupportedPipeline( SigmoidAddSigmoid(), @@ -167,7 +169,6 @@ def test_sigmoid_u85_INT(test_data): (test_data(),), Sigmoid.aten_op, Sigmoid.exir_op, - run_on_fvp=True, ) pipeline.change_args("quantize", get_32bit_sigmoid_quantizer()) pipeline.run() @@ -184,7 +185,6 @@ def test_sigmoid_u85_INT_add_sigmoid(test_data): (test_data(),), Sigmoid.aten_op, Sigmoid.exir_op, - run_on_fvp=True, ) pipeline.change_args("quantize", get_32bit_sigmoid_quantizer()) pipeline.run() diff --git a/backends/arm/test/ops/test_silu.py b/backends/arm/test/ops/test_silu.py index e451c22adbb..25117ef89de 100644 --- a/backends/arm/test/ops/test_silu.py +++ b/backends/arm/test/ops/test_silu.py @@ -80,7 +80,9 @@ def test_silu_tosa_INT_inplace(test_data: input_t): def test_silu_u55_INT(test_data: input_t): silu_data = (test_data(), False) pipeline = EthosU55PipelineINT[input_t]( - Silu(), silu_data, Silu.aten_op_INT, run_on_fvp=True + Silu(), + silu_data, + Silu.aten_op_INT, ) pipeline.run() @@ -90,7 +92,9 @@ def test_silu_u55_INT(test_data: input_t): def test_silu_u55_INT_inplace(test_data: input_t): silu_data = (test_data(), True) pipeline = EthosU55PipelineINT[input_t]( - Silu(), silu_data, Silu.aten_op_INT, run_on_fvp=True + Silu(), + silu_data, + Silu.aten_op_INT, ) pipeline.run() @@ -100,7 +104,9 @@ def test_silu_u55_INT_inplace(test_data: input_t): def test_silu_u85_INT(test_data: input_t): silu_data = (test_data(), False) pipeline = EthosU85PipelineINT[input_t]( - Silu(), silu_data, Silu.aten_op_INT, run_on_fvp=True + Silu(), + silu_data, + Silu.aten_op_INT, ) pipeline.run() @@ -110,7 +116,9 @@ def test_silu_u85_INT(test_data: input_t): def test_silu_u85_INT_inplace(test_data: input_t): silu_data = (test_data(), True) pipeline = EthosU85PipelineINT[input_t]( - Silu(), silu_data, Silu.aten_op_INT, run_on_fvp=True + Silu(), + silu_data, + Silu.aten_op_INT, ) pipeline.run() diff --git a/backends/arm/test/ops/test_sin.py b/backends/arm/test/ops/test_sin.py index 3ca593ad608..06d06e3b11d 100644 --- a/backends/arm/test/ops/test_sin.py +++ b/backends/arm/test/ops/test_sin.py @@ -61,25 +61,25 @@ def test_sin_tosa_INT(test_data: Tuple): @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone300 def test_sin_u55_INT(test_data: Tuple): pipeline = EthosU55PipelineINT[input_t1]( Sin(), (test_data,), aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() @common.parametrize("test_data", test_data_suite) +@common.XfailIfNoCorstone320 def test_sin_u85_INT(test_data: Tuple): pipeline = EthosU85PipelineINT[input_t1]( Sin(), (test_data,), aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() diff --git a/backends/arm/test/ops/test_slice.py b/backends/arm/test/ops/test_slice.py index eafeb04320e..951f24fd153 100644 --- a/backends/arm/test/ops/test_slice.py +++ b/backends/arm/test/ops/test_slice.py @@ -78,26 +78,32 @@ def test_slice_tensor_tosa_INT_nhwc(test_data: torch.Tensor): pipeline.run() -@common.parametrize("test_data", test_data_suite) +x_fails = { + "ones_slice_3": "MLETORCH-1402: Slice operator has incorrect number of inputs", + "ones_slice_4": "MLETORCH-1402: Slice operator has incorrect number of inputs", +} + + +@common.parametrize("test_data", test_data_suite, x_fails) +@common.XfailIfNoCorstone300 def test_slice_tensor_u55_INT(test_data: torch.Tensor): pipeline = EthosU55PipelineINT[input_t1]( Slice(), test_data(), aten_ops=[], exir_ops=[], - run_on_fvp=False, ) pipeline.run() -@common.parametrize("test_data", test_data_suite) +@common.parametrize("test_data", test_data_suite, x_fails) +@common.XfailIfNoCorstone320 def test_slice_tensor_u85_INT(test_data: torch.Tensor): pipeline = EthosU85PipelineINT[input_t1]( Slice(), test_data(), aten_ops=[], exir_ops=[], - run_on_fvp=False, ) pipeline.run() @@ -190,7 +196,6 @@ def test_slice_tensor_16a8w_u55_INT16(test_data: torch.Tensor): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -218,7 +223,6 @@ def test_slice_tensor_16a8w_u85_INT16(test_data: torch.Tensor): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_softmax.py b/backends/arm/test/ops/test_softmax.py index 6b4455fc702..22bd919fccd 100644 --- a/backends/arm/test/ops/test_softmax.py +++ b/backends/arm/test/ops/test_softmax.py @@ -65,7 +65,11 @@ def test_softmax_tosa_INT(test_data): @common.XfailIfNoCorstone300 def test_softmax_u55_INT(test_data): data, dim = test_data() - pipeline = EthosU55PipelineINT[input_t1](Softmax(dim), data, [], run_on_fvp=True) + pipeline = EthosU55PipelineINT[input_t1]( + Softmax(dim), + data, + [], + ) pipeline.add_stage_after("quantize", pipeline.tester.check_not, [aten_op]) pipeline.change_args("run_method_and_compare_outputs", qtol=1) pipeline.run() @@ -75,7 +79,11 @@ def test_softmax_u55_INT(test_data): @common.XfailIfNoCorstone320 def test_softmax_u85_INT(test_data): data, dim = test_data() - pipeline = EthosU85PipelineINT[input_t1](Softmax(dim), data, [], run_on_fvp=True) + pipeline = EthosU85PipelineINT[input_t1]( + Softmax(dim), + data, + [], + ) pipeline.add_stage_after("quantize", pipeline.tester.check_not, [aten_op]) pipeline.change_args("run_method_and_compare_outputs", qtol=1) pipeline.run() diff --git a/backends/arm/test/ops/test_split.py b/backends/arm/test/ops/test_split.py index 388e85762af..284c142a34e 100644 --- a/backends/arm/test/ops/test_split.py +++ b/backends/arm/test/ops/test_split.py @@ -132,17 +132,24 @@ def test_split_with_sizes_tosa_INT(test_data: input_t1): pipeline.run() +x_fails = { + "split_3d_2_sizes_dim": "MLETORCH-1403: Split operator is running out of memory when reading input file", + "split_4d_2_sizes_dim_neg": "MLETORCH-1403: Split operator is running out of memory when reading input file", +} + + @common.parametrize( "test_data", (Split.test_data | Split.test_data_list), + x_fails, ) +@common.XfailIfNoCorstone300 def test_split_with_sizes_u55_INT(test_data: input_t1): pipeline = EthosU55PipelineINT[input_t1]( Split(), test_data(), aten_ops=[], exir_ops=exir_op, - run_on_fvp=False, ) pipeline.run() @@ -150,7 +157,9 @@ def test_split_with_sizes_u55_INT(test_data: input_t1): @common.parametrize( "test_data", (Split.test_data | Split.test_data_list), + x_fails, ) +@common.XfailIfNoCorstone320 def test_split_with_sizes_u85_INT(test_data: input_t1): pipeline = EthosU85PipelineINT[input_t1]( @@ -158,7 +167,6 @@ def test_split_with_sizes_u85_INT(test_data: input_t1): test_data(), aten_ops=[], exir_ops=exir_op, - run_on_fvp=False, ) pipeline.run() diff --git a/backends/arm/test/ops/test_sqrt.py b/backends/arm/test/ops/test_sqrt.py index 15e2dd45322..13a2366b17c 100644 --- a/backends/arm/test/ops/test_sqrt.py +++ b/backends/arm/test/ops/test_sqrt.py @@ -70,7 +70,6 @@ def test_sqrt_u55_INT(test_data: Sqrt.input_t): test_data(), Sqrt.aten_op_INT, Sqrt.exir_op_INT, - run_on_fvp=True, ) pipeline.run() @@ -83,7 +82,6 @@ def test_sqrt_u85_INT(test_data: Sqrt.input_t): test_data(), Sqrt.aten_op_INT, Sqrt.exir_op_INT, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_squeeze.py b/backends/arm/test/ops/test_squeeze.py index 0de51673496..3c2014cdcda 100644 --- a/backends/arm/test/ops/test_squeeze.py +++ b/backends/arm/test/ops/test_squeeze.py @@ -95,7 +95,6 @@ def test_squeeze_dim_u55_INT(test_data: Tuple): test_data(), aten_ops="torch.ops.aten.squeeze.default", exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -108,7 +107,6 @@ def test_squeeze_dim_u85_INT(test_data: Tuple): test_data(), aten_ops="torch.ops.aten.squeeze.default", exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -174,7 +172,6 @@ def test_squeeze_dim_u55_INT_2(test_data: Tuple): test_data(), aten_ops="torch.ops.aten.squeeze.dim", exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -187,7 +184,6 @@ def test_squeeze_dim_u85_INT_2(test_data: Tuple): test_data(), aten_ops="torch.ops.aten.squeeze.dim", exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -253,7 +249,6 @@ def test_squeeze_dims_u55_INT(test_data: Tuple): test_data(), aten_ops="torch.ops.aten.squeeze.dims", exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -266,7 +261,6 @@ def test_squeeze_dims_u85_INT(test_data: Tuple): test_data(), aten_ops="torch.ops.aten.squeeze.dims", exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_sub.py b/backends/arm/test/ops/test_sub.py index c691506beb2..d87b5147085 100644 --- a/backends/arm/test/ops/test_sub.py +++ b/backends/arm/test/ops/test_sub.py @@ -141,7 +141,6 @@ def test_sub_tensor_u55_INT(test_data): test_data(), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -155,7 +154,6 @@ def test_sub_tensor_u55_INT_2(test_data: Tuple[torch.Tensor, torch.Tensor]): test_data(), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -169,7 +167,6 @@ def test_sub_tensor_u85_INT_2(test_data): test_data(), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() @@ -183,7 +180,6 @@ def test_sub_tensor_u85_INT(test_data: Tuple[torch.Tensor, torch.Tensor]): test_data(), aten_op, exir_op, - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_sum.py b/backends/arm/test/ops/test_sum.py index 45f3a1f2267..13c1e029032 100644 --- a/backends/arm/test/ops/test_sum.py +++ b/backends/arm/test/ops/test_sum.py @@ -72,7 +72,6 @@ def test_view_u55_INT_1_0(test_data: Tuple): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -85,7 +84,6 @@ def test_view_u85_INT_1_0(test_data: Tuple): test_data(), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -124,7 +122,7 @@ def test_sum_dim_intlist_vgf_INT(test_data: input_t1): @common.parametrize("test_data", reject_inputs) -def test_view_u55_INT_not_delegated(test_data: Tuple): +def test_view_u55_INT_failure_set(test_data: Tuple): pipeline = EthosU55PipelineINT[input_t1]( Sum(), test_data(), diff --git a/backends/arm/test/ops/test_tanh.py b/backends/arm/test/ops/test_tanh.py index f3f4df31d0e..8dc967c01d7 100644 --- a/backends/arm/test/ops/test_tanh.py +++ b/backends/arm/test/ops/test_tanh.py @@ -77,7 +77,6 @@ def test_tanh_u55_INT(test_data: Tuple): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -90,7 +89,6 @@ def test_tanh_u85_INT(test_data: Tuple): (test_data(),), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -178,7 +176,6 @@ def test_tanh_16a8w_u55_INT16(test_data: torch.Tensor): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -206,7 +203,6 @@ def test_tanh_16a8w_u85_INT16(test_data: torch.Tensor): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_unary_combos.py b/backends/arm/test/ops/test_unary_combos.py index db442d2d8d0..bfeb9b59e80 100644 --- a/backends/arm/test/ops/test_unary_combos.py +++ b/backends/arm/test/ops/test_unary_combos.py @@ -109,7 +109,10 @@ def test_unary_combos_tosa_INT(model_cls): def test_unary_combos_u55_INT(model_cls): m, inputs, exir = _build(model_cls) p = EthosU55PipelineINT[Tensor1]( - m, inputs, aten_ops=[], exir_ops=exir, run_on_fvp=True + m, + inputs, + aten_ops=[], + exir_ops=exir, ) p.run() @@ -119,7 +122,10 @@ def test_unary_combos_u55_INT(model_cls): def test_unary_combos_u85_INT(model_cls): m, inputs, exir = _build(model_cls) p = EthosU85PipelineINT[Tensor1]( - m, inputs, aten_ops=[], exir_ops=exir, run_on_fvp=True + m, + inputs, + aten_ops=[], + exir_ops=exir, ) p.run() diff --git a/backends/arm/test/ops/test_unsqueeze.py b/backends/arm/test/ops/test_unsqueeze.py index 9da1a352ebb..c76c1236ab3 100644 --- a/backends/arm/test/ops/test_unsqueeze.py +++ b/backends/arm/test/ops/test_unsqueeze.py @@ -65,7 +65,6 @@ def test_unsqueeze_u55_INT(test_tensor: torch.Tensor): (*test_tensor, 0), aten_op, exir_ops=[], - run_on_fvp=False, ) pipeline.run() @@ -78,7 +77,6 @@ def test_unsqueeze_u85_INT(test_tensor: torch.Tensor): (*test_tensor, 0), aten_op, exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_upsample_bilinear2d.py b/backends/arm/test/ops/test_upsample_bilinear2d.py index 95e69bc5204..1edba708f1f 100644 --- a/backends/arm/test/ops/test_upsample_bilinear2d.py +++ b/backends/arm/test/ops/test_upsample_bilinear2d.py @@ -259,7 +259,6 @@ def test_upsample_bilinear2d_vec_U85_INT_Upsample(test_data: input_t1): Upsample(size, scale_factor), (test_data,), aten_op, - run_on_fvp=True, qtol=1, use_to_edge_transform_and_lower=True, ) @@ -279,7 +278,6 @@ def test_upsample_bilinear2d_vec_U85_INT_Interpolate( Interpolate(size, scale_factor), (test_data,), aten_op, - run_on_fvp=True, qtol=1, use_to_edge_transform_and_lower=True, ) @@ -299,7 +297,6 @@ def test_upsample_bilinear2d_vec_U85_INT_UpsamplingBilinear2d( UpsamplingBilinear2d(size, scale_factor), (test_data,), aten_op, - run_on_fvp=True, qtol=1, use_to_edge_transform_and_lower=True, ) diff --git a/backends/arm/test/ops/test_var.py b/backends/arm/test/ops/test_var.py index 244938dc6b0..f08e4498cc5 100644 --- a/backends/arm/test/ops/test_var.py +++ b/backends/arm/test/ops/test_var.py @@ -195,7 +195,6 @@ def test_var_dim_u55_INT_no_dim(test_data: Tuple): (test_data,), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -209,7 +208,6 @@ def test_var_dim_u85_INT_no_dim(test_data: Tuple): (test_data,), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -279,7 +277,6 @@ def test_var_dim_u55_INT(test_data: Tuple): (test_data,), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -293,7 +290,6 @@ def test_var_dim_u85_INT(test_data: Tuple): (test_data,), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -362,7 +358,6 @@ def test_var_dim_u55_INT_correction(test_data: Tuple): (test_data,), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -376,7 +371,6 @@ def test_var_dim_u85_INT_correction(test_data: Tuple): (test_data,), aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() diff --git a/backends/arm/test/ops/test_view.py b/backends/arm/test/ops/test_view.py index ed942c07aa1..915eef45755 100644 --- a/backends/arm/test/ops/test_view.py +++ b/backends/arm/test/ops/test_view.py @@ -224,7 +224,6 @@ def test_view_16a8w_u55_INT16(test_data: Tuple): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( @@ -253,7 +252,6 @@ def test_view_16a8w_u85_INT16(test_data: Tuple): exir_ops=[], per_channel_quantization=per_channel_quantization, use_to_edge_transform_and_lower=True, - run_on_fvp=True, ) pipeline.change_args( diff --git a/backends/arm/test/ops/test_where.py b/backends/arm/test/ops/test_where.py index f27c8358cdc..a35a9fc3b7d 100644 --- a/backends/arm/test/ops/test_where.py +++ b/backends/arm/test/ops/test_where.py @@ -226,7 +226,6 @@ def test_where_self_u85_INT(test_module): test_module().get_inputs(), aten_op, exir_op, - run_on_fvp=True, symmetric_io_quantization=True, ) pipeline.run() diff --git a/backends/arm/test/passes/test_rescale_pass.py b/backends/arm/test/passes/test_rescale_pass.py index 3baa03fde65..9774ebd2fcd 100644 --- a/backends/arm/test/passes/test_rescale_pass.py +++ b/backends/arm/test/passes/test_rescale_pass.py @@ -183,7 +183,6 @@ def test_quantized_rescale_u55(test_data: tuple[torch.Tensor, torch.Tensor]): test_data=test_data, aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run() @@ -199,6 +198,5 @@ def test_quantized_rescale_u85(test_data: tuple[torch.Tensor, torch.Tensor]): test_data=test_data, aten_ops=[], exir_ops=[], - run_on_fvp=True, ) pipeline.run()