Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion python/tvm/relay/backend/contrib/ethosu/tir/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ def copy_constants():
def _planner(cached_func, const_dict, sch):
planned = set() # type: ignore

def _is_matmul(tensor):
if tensor.name not in ["ethosu_conv2d"]:
return False
a, b = tensor.op.input_tensors[0:2]
return a.shape[1:3] == [1, 1] and b.shape[1:3] == [1, 1]

def _visit(tensor, reader, lut):
if tensor not in planned:
planned.add(tensor)
Expand All @@ -140,7 +146,9 @@ def _visit(tensor, reader, lut):
# ambiguity when encountering a scalar.
is_same = [var.same_as(tensor) for var in cached_func.inputs]
index = is_same.index(True)
if index in const_dict:
# Along with constants, also skip for FullyConnected to correspond
# with Vela behavior
if index in const_dict and not _is_matmul(reader):
sch.cache_read(tensor, "global", [reader])

elif isinstance(tensor.op, tvm.te.ComputeOp):
Expand Down
16 changes: 16 additions & 0 deletions tests/python/contrib/test_ethosu/test_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,5 +217,21 @@ def test_schedule_diamond_graph():
tvm.ir.assert_structural_equal(test_mod["main"], reference_mod["main"], True)


def test_copy_constants_fully_connected_weights():
"""Check that MatMul-like conv2d ops do not copy weights to SRAM."""
ifm = relay.var("IFM", shape=(1, 1, 1, 32), dtype="int8")
conv = make_ethosu_conv2d(ifm, 32, 8, (1, 1), (0, 0), (1, 1), (1, 1))
func = relay.Function(relay.analysis.free_vars(conv), conv)
func = run_opt_pass(func, relay.transform.InferType())

func, const_dict = extract_constants(func)
cached_func = lower_to_te(func)

sch = te.create_schedule([cached_func.outputs[0].op])
planner = copy_constants()
planner(cached_func, const_dict, sch)
assert True not in [".global" in s.op.name for s in sch.stages]


if __name__ == "__main__":
pytest.main([__file__])