This is an automated email from the ASF dual-hosted git repository.
lukhut pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 5e77b7eff7 [microNPU][ETHOSU] Add option to disable copying constants
for case without cascader (#15147)
5e77b7eff7 is described below
commit 5e77b7eff7c6470c52ea320e7925a33fab1f78d3
Author: Aleksei-grovety <[email protected]>
AuthorDate: Tue Jun 27 20:34:46 2023 +0400
[microNPU][ETHOSU] Add option to disable copying constants for case without
cascader (#15147)
* [microNPU][ETHOSU] Add option to disable copying constants for case
without cascader
Added the option to disable copying constants for the case when the user
determines in the linker script for section ".rodata.tvm" that the constants
are located in SRAM.
* Fix compiler attribute type to pass this parameter to tvmc via command
line
* Update return type for is_copying_constants_disabled
* Update description
---
python/tvm/relay/backend/contrib/ethosu/codegen.py | 3 ++-
python/tvm/relay/backend/contrib/ethosu/util.py | 6 ++++++
src/relay/backend/contrib/ethosu/compiler_attrs.cc | 9 +++++++++
tests/python/contrib/test_ethosu/test_scheduler.py | 16 ++++++++++++++++
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/python/tvm/relay/backend/contrib/ethosu/codegen.py
b/python/tvm/relay/backend/contrib/ethosu/codegen.py
index 5a5f1478e1..e40053d49a 100644
--- a/python/tvm/relay/backend/contrib/ethosu/codegen.py
+++ b/python/tvm/relay/backend/contrib/ethosu/codegen.py
@@ -526,7 +526,8 @@ def relay_to_tir(mod: tvm.ir.IRModule) -> tvm.ir.IRModule:
sram = extract_memory_info(workspace_memory_pools.pools[0],
memory_pressure)
tir_mod = LowerToTIR(_ethos_u55_cascader(sram,
util.is_striping_enabled()))(mod)
else:
- tir_mod = LowerToTIR(copy_constants())(mod)
+ scheduler = None if util.is_copying_constants_disabled() else
copy_constants()
+ tir_mod = LowerToTIR(scheduler)(mod)
return tir_mod
diff --git a/python/tvm/relay/backend/contrib/ethosu/util.py
b/python/tvm/relay/backend/contrib/ethosu/util.py
index f0c753814f..6533bab7d2 100644
--- a/python/tvm/relay/backend/contrib/ethosu/util.py
+++ b/python/tvm/relay/backend/contrib/ethosu/util.py
@@ -258,6 +258,12 @@ def is_cascader_enabled():
return compiler_attrs.enable_cascader
+def is_copying_constants_disabled() -> bool:
+ """Determine whether copying constants is disabled for case without
cascader"""
+ compiler_attrs =
tvm.get_global_func("relay.ext.ethos-u.get_compiler_attrs")()
+ return bool(compiler_attrs.disable_copying_constants)
+
+
def is_striping_enabled():
"""Determine whether the cascader is enabled"""
compiler_attrs =
tvm.get_global_func("relay.ext.ethos-u.get_compiler_attrs")()
diff --git a/src/relay/backend/contrib/ethosu/compiler_attrs.cc
b/src/relay/backend/contrib/ethosu/compiler_attrs.cc
index 6c825a1890..237ccecf54 100644
--- a/src/relay/backend/contrib/ethosu/compiler_attrs.cc
+++ b/src/relay/backend/contrib/ethosu/compiler_attrs.cc
@@ -41,6 +41,7 @@ struct EthosUCompilerConfigNode : public
tvm::AttrsNode<EthosUCompilerConfigNode
String accelerator_config;
bool enable_cascader;
bool enable_striping;
+ Bool disable_copying_constants = Bool(false);
String dev_force_block_config;
String dev_max_open_plans;
String dev_max_closed_plans;
@@ -59,6 +60,14 @@ struct EthosUCompilerConfigNode : public
tvm::AttrsNode<EthosUCompilerConfigNode
TVM_ATTR_FIELD(enable_cascader)
.describe("Whether the cascader should be enabled")
.set_default(false);
+ TVM_ATTR_FIELD(disable_copying_constants)
+ .describe(
+ "Whether copying constants is disabled for case without the
cascader. When this option "
+ "is "
+ "enabled, it is assumed that the constants should be located in
SRAM (user determines "
+ "in "
+ "the linker script for section \".rodata.tvm\" that the constants
are located in SRAM)")
+ .set_default(Bool(false));
TVM_ATTR_FIELD(enable_striping)
.describe("Whether the cascader should be striping")
.set_default(false);
diff --git a/tests/python/contrib/test_ethosu/test_scheduler.py
b/tests/python/contrib/test_ethosu/test_scheduler.py
index 21f0b7c157..1edd840b0b 100644
--- a/tests/python/contrib/test_ethosu/test_scheduler.py
+++ b/tests/python/contrib/test_ethosu/test_scheduler.py
@@ -138,6 +138,22 @@ def test_copy_constants():
assert ".global" in sch.stages[19].op.name
+def test_no_copy_constants():
+ ifm_a = relay.var("IFM_A", shape=(1, 26, 26, 32), dtype="int8")
+ conv_a = make_ethosu_conv2d(ifm_a, 32, 8, (3, 3), (0, 0), (1, 1), (1, 1))
+ conv_b = make_ethosu_conv2d(conv_a, 8, 4, (1, 1), (0, 0), (1, 1), (1, 1))
+ func = relay.Function(relay.analysis.free_vars(conv_b), conv_b)
+ func = run_opt_pass(func, relay.transform.InferType())
+
+ func, _ = extract_constants(func)
+ cached_func = lower_to_te(func)
+
+ sch = te.create_schedule([cached_func.outputs[0].op])
+ assert len(sch.stages) == 19
+ ops_names = [x.op.name for x in sch.stages]
+ assert all(".global" not in x for x in ops_names)
+
+
# This test makes sure that constants and LUTs have a correct storage scope
def test_copy_luts():
ifm_shape = (1, 33, 33, 11)
