NicolaLancellotti commented on a change in pull request #9515:
URL: https://github.com/apache/tvm/pull/9515#discussion_r750247811
##########
File path: tests/python/contrib/test_ethosu/test_legalize.py
##########
@@ -693,6 +693,53 @@ def verify(ext_func):
verify(mod["tvmgen_default_ethos_u_main_0"])
+def test_binary_add_from_constant_scalar():
+ dtype = "uint8"
+ ifm_shape = (1, 4, 4, 8)
+
+ def create_graph():
+ inp = relay.var("input", shape=ifm_shape, dtype=dtype)
+ scalar = relay.const(np.ones((1, 1, 1, 1), dtype=dtype), dtype=dtype)
+ add = relay.qnn.op.add(
+ inp,
+ scalar,
+ relay.const(1.0, dtype="float32"),
+ relay.const(0, dtype="int32"),
+ relay.const(1.0, dtype="float32"),
+ relay.const(0, dtype="int32"),
+ relay.const(1.0, dtype="float32"),
+ relay.const(0, dtype="int32"),
+ )
+ func = relay.Function(relay.analysis.free_vars(add), add)
+ return tvm.IRModule.from_expr(func)
+
+ def verify(ext_func):
+ op = ext_func.body
+ assert list(op.args[0].checked_type.shape) == [1, 4, 4, 8]
+ assert list(op.args[1].checked_type.shape) == [1, 1, 1, 1]
+ assert op.args[0].checked_type.dtype == "uint8"
+ assert list(op.checked_type.shape) == [1, 4, 4, 8]
+ assert op.checked_type.dtype == "uint8"
+ assert op.attrs.operator_type == "ADD"
+
+ rewriter = legalize.AddRewriter()
+ pattern_table = [
+ (
+ ethosu.AddParams.composite_name,
+ ethosu.qnn_add_pattern(),
+ lambda pat: ethosu.AddParams(pat).is_valid(),
+ ),
+ ]
+
+ mod = create_graph()
+ mod = partition_ethosu_by_table(mod, pattern_table)
+
+ mod["tvmgen_default_ethosu_main_0"] = dataflow_pattern.rewrite(
+ rewriter, mod["tvmgen_default_ethosu_main_0"]
+ )
+ verify(mod["tvmgen_default_ethosu_main_0"])
Review comment:
```suggestion
mod["tvmgen_default_ethos_u_main_0"] = dataflow_pattern.rewrite(
rewriter, mod["tvmgen_default_ethos_u_main_0"]
)
verify(mod["tvmgen_default_ethos_u_main_0"])
```
##########
File path: tests/python/contrib/test_ethosu/test_encode_constants.py
##########
@@ -270,5 +273,47 @@ def _get_func():
assert reference_const_sizes == test_const_sizes
+def test_constant_as_input():
+ """Test to check that constants specified as inputs aren't
+ interpreted as an encoded constant."""
+
+ def get_graph():
+ dtype = "uint8"
+ ifm = relay.var("ifm", shape=(1, 16, 16, 32), dtype=dtype)
+ conv1 = make_ethosu_conv2d(
+ ifm,
+ 32,
+ 16,
+ (1, 1),
+ (0, 0),
+ (1, 1),
+ (1, 1),
+ )
+ scalar = relay.const(np.ones((1, 1, 1, 1), dtype=dtype), dtype=dtype)
+ add1 = make_ethosu_binary_elementwise(
+ conv1, scalar, ifm_channels=32, ifm2_channels=1,
operator_type="ADD", ofm_dtype=dtype
+ )
+ func = relay.Function(relay.analysis.free_vars(add1), add1)
+ func = run_opt_pass(func, relay.transform.InferType())
+ return func
+
+ tir_mod, params = lower_to_tir(get_graph(), copy_constants())
+
+ # Check tile address for the scalar constant input hasn't been
+ # overwritten.
+ extern_calls = tir_mod["main"].body.body.body.body.body
+ binary_elmtwise = extern_calls[-1].value
+ args = binary_elmtwise.args
Review comment:
```suggestion
binary_elementwise = extern_calls[-1].value
args = binary_elementwise.args
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
