From c80d8fa31c5626aac112b2e89e3db90d63e99a41 Mon Sep 17 00:00:00 2001
From: Ashutosh Parkhi <ashutosh.parkhi@arm.com>
Date: Fri, 10 Mar 2023 13:12:31 +0000
Subject: [PATCH 1/2] [ETHOSN] Connect existing arm_cpu schedule to relay
 strategy for concatenate

NPU used generic implementation for concatenate
before cpu schedules were made the default fallback
schedules. This leads to performance degradation
as this blocks fusion with nearby ops. This commit
adds Relay op strategy for arm_cpu implementation
which makes it use arm_cpu schedule before cpu one.
Reference: https://github.com/apache/tvm/pull/13775

Co-authored-by: Luke Hutton <luke.hutton@arm.com>
---
 python/tvm/relay/op/strategy/arm_cpu.py       | 16 ++++--
 .../relay/test_select_implementation.py       | 56 +++++++++++++++++++
 2 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 tests/python/relay/test_select_implementation.py

diff --git a/python/tvm/relay/op/strategy/arm_cpu.py b/python/tvm/relay/op/strategy/arm_cpu.py
index c8d51bc23c82..6e6c1bf03b5d 100644
--- a/python/tvm/relay/op/strategy/arm_cpu.py
+++ b/python/tvm/relay/op/strategy/arm_cpu.py
@@ -46,11 +46,17 @@ def schedule_injective_arm_cpu(_, outs, target):
         return topi.arm_cpu.schedule_injective(outs)
 
 
-@schedule_concatenate.register("arm_cpu")
-def schedule_concatenate_arm_cpu(_, outs, target):
-    """schedule concatenate for arm cpu"""
-    with target:
-        return topi.arm_cpu.schedule_concatenate(outs)
+@concatenate_strategy.register(["arm_cpu"])
+def concatenate_strategy_arm_cpu(attrs, inputs, out_type, target):
+    """concatenate arm_cpu strategy"""
+    strategy = _op.OpStrategy()
+
+    strategy.add_implementation(
+        wrap_compute_concat(topi.concatenate),
+        wrap_topi_schedule(topi.arm_cpu.schedule_concatenate),
+        name="concatenate.arm_cpu",
+    )
+    return strategy
 
 
 @schedule_pool.register(["arm_cpu"])
diff --git a/tests/python/relay/test_select_implementation.py b/tests/python/relay/test_select_implementation.py
new file mode 100644
index 000000000000..3e63bc4751f7
--- /dev/null
+++ b/tests/python/relay/test_select_implementation.py
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+""" Tests strategy selection for Relay ops """
+import pytest
+import tvm
+from tvm import relay
+from tvm import te
+from tvm.relay.testing import run_infer_type
+import tvm.testing
+
+
+@pytest.mark.parametrize(
+    "target, expected_implementation",
+    [("llvm", "concatenate.cpu"), ("llvm -device=arm_cpu", "concatenate.arm_cpu")],
+)
+def test_concatenate(target, expected_implementation):
+    target = tvm.target.Target(target)
+
+    shape = (1, 1, 1, 3)
+    dtype = "float32"
+    axis = 1
+    inputs = []
+    inputs.append(relay.var("var0", shape=shape, dtype=dtype))
+    inputs.append(relay.var("var1", shape=shape, dtype=dtype))
+    input_tuple = relay.Tuple(inputs)
+    out = relay.op.concatenate(input_tuple, axis)
+    out = run_infer_type(out)
+
+    impl, xx = relay.backend.te_compiler.select_implementation(
+        relay.op.get("concatenate"),
+        out.attrs,
+        [te.placeholder(shape)],
+        out.checked_type,
+        target,
+        use_autotvm=False,
+    )
+    assert impl.name == expected_implementation
+
+
+if __name__ == "__main__":
+    tvm.testing.main()

From ebf972466754a31528baa649983b9140f409a7b2 Mon Sep 17 00:00:00 2001
From: Ashutosh Parkhi <ashutosh.parkhi@arm.com>
Date: Tue, 14 Mar 2023 10:17:24 +0000
Subject: [PATCH 2/2] Moving test to under relay strategy folder

Change-Id: Ic29488d2ba25acfdccbb6cdab1697eec9ae3a736
---
 tests/python/relay/{ => strategy}/test_select_implementation.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/python/relay/{ => strategy}/test_select_implementation.py (100%)

diff --git a/tests/python/relay/test_select_implementation.py b/tests/python/relay/strategy/test_select_implementation.py
similarity index 100%
rename from tests/python/relay/test_select_implementation.py
rename to tests/python/relay/strategy/test_select_implementation.py