You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2021/12/06 20:55:24 UTC
[GitHub] [tvm] mehrdadh commented on a change in pull request #9631: [Hexagon] Add RPC Mechanism for Hexagon
mehrdadh commented on a change in pull request #9631:
URL: https://github.com/apache/tvm/pull/9631#discussion_r763336374
##########
File path: python/tvm/contrib/hexagon/build.py
##########
@@ -0,0 +1,259 @@
+# 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.
+
+"""Defines top-level glue functions for building Hexagon."""
+
+import pathlib
+import os
+import subprocess
+from typing import Union
+import stat
+import datetime
+
+import tvm
+from ..._ffi import libinfo
+from .session import Session
+
+
+RPC_SERVER_FILES = ["tvm_rpc_android", "libtvm_runtime_android.so", "android_bash.sh"]
+
+HEXAGON_FILES = ["libhexagon_rpc_skel.so"]
+
+HEXAGON_RPC_DIR = None
+
+ANDROID_HEXAGON_TEST_BASE_DIR = pathlib.Path("/data/local/tmp/hexagon_test")
+
+
+def get_hexagon_rpc_dir() -> pathlib.Path:
+ """Find the Hexagon library.
+
+ Returns
+ -------
+ str :
+ The path to the Hexagon library
+ """
+ global HEXAGON_RPC_DIR
+ if HEXAGON_RPC_DIR is None:
+ for path in libinfo.find_lib_path():
+ rpc_dir = os.path.join(os.path.dirname(path), "hexagon_rpc")
+ if os.path.isdir(rpc_dir):
+ HEXAGON_RPC_DIR = pathlib.Path(rpc_dir)
+ break
+ else:
+ raise "hexagon_rpc was not found."
+ return HEXAGON_RPC_DIR
+
+
+class HexagonLauncher:
+ """Hexagon Launcher"""
+
+ def __init__(self, serial_number: str):
+ """Configure a new HexagonLauncher
+
+ Parameters
+ ----------
+ serial_number : str
+ Android device serial number from android 'adb' command.
+ """
+ # Hexagon RPCSession
+ self.session = None
+
+ self._serial_number = serial_number
+ self._adb_device_sub_cmd = ["adb", "-s", self._serial_number]
+ self._mod = None
+ self._workspace = None
+
+ HEXAGON_REMOTE_DEVICE_KEY = "hexagon-dev"
+
+ def android_run_rpc(
+ self,
+ workspace_dir: Union[str, pathlib.Path] = None,
+ rpc_server_port: int = 7070,
+ rpc_tracker_host: str = "0.0.0.0",
+ rpc_tracker_port: int = 9190,
+ ):
+ """Upload Android artifacts and run RPC server on Android.
+
+ Parameters
+ ----------
+ workspace_dir : Union[str, pathlib.Path]
+ Workspace directory used on Android to upload artifacts.
+
+ rpc_server_port : int
+ Android RPC server port number
+
+ rpc_tracker_host : str
+ RPC tracker IP on host
+
+ rpc_tracker_port : int
+ RPC tracker port on host
+ """
+ if not workspace_dir:
+ self._workspace = str(
+ ANDROID_HEXAGON_TEST_BASE_DIR
+ / datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+ )
+ else:
+ self._workspace = workspace_dir
+
+ # Upload RPC server and libraries
+ subprocess.check_call(self._adb_device_sub_cmd + ["shell", "mkdir", "-p", self._workspace])
+
+ # create bash script
+ android_bash_script_path = get_hexagon_rpc_dir() / "android_bash.sh"
+ with open(get_hexagon_rpc_dir() / "android_bash.sh.template", "r") as src_f:
+ if os.path.exists(android_bash_script_path):
+ os.remove(android_bash_script_path)
+ with open(android_bash_script_path, "w") as dest_f:
+ for line in src_f.readlines():
+ if "<RPC_TRACKER_HOST>" in line:
+ line = line.replace("<RPC_TRACKER_HOST>", str(rpc_tracker_host))
+ if "<RPC_TRACKER_PORT>" in line:
+ line = line.replace("<RPC_TRACKER_PORT>", str(rpc_tracker_port))
+ if "<HEXAGON_REMOTE_DEVICE_KEY>" in line:
+ line = line.replace(
+ "<HEXAGON_REMOTE_DEVICE_KEY>", self.HEXAGON_REMOTE_DEVICE_KEY
+ )
+ if "<RPC_SERVER_PORT>" in line:
+ line = line.replace("<RPC_SERVER_PORT>", str(rpc_server_port))
+ dest_f.write(line)
+
+ # make shell script executable
+ android_bash_stat = os.stat(android_bash_script_path)
+ os.chmod(android_bash_script_path, android_bash_stat.st_mode | stat.S_IEXEC)
+
+ # push files
+ for item in RPC_SERVER_FILES:
+ src_path = get_hexagon_rpc_dir() / item
+ destination = f"{self._workspace}/{item}"
+ if item == "libtvm_runtime_android.so":
+ destination = f"{self._workspace}/libtvm_runtime.so"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, destination])
+
+ # enable root for adb
+ subprocess.check_call(self._adb_device_sub_cmd + ["root"])
+ # Removed pre-defined forward/reverse rules
+ subprocess.check_call(self._adb_device_sub_cmd + ["forward", "--remove-all"])
+ subprocess.check_call(self._adb_device_sub_cmd + ["reverse", "--remove-all"])
+
+ # Enable port reverse for RPC tracker
+ subprocess.check_call(
+ self._adb_device_sub_cmd
+ + ["reverse", f"tcp:{rpc_tracker_port}", f"tcp:{rpc_tracker_port}"]
+ )
+ # Enable port forward for RPC server. We forward 9 ports after the rpc_server_port.
+ for i in range(0, 10):
+ subprocess.check_call(
+ self._adb_device_sub_cmd
+ + ["forward", f"tcp:{rpc_server_port+i}", f"tcp:{rpc_server_port+i}"]
+ )
+
+ # Run server and connect to tracker
+ subprocess.Popen(
+ self._adb_device_sub_cmd + ["shell", f"cd {self._workspace} && ./android_bash.sh"],
+ stdout=subprocess.PIPE,
+ stdin=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ )
+
+ def hexagon_setup(self):
+ """Upload Hexagon artifacts on Android."""
+ for item in HEXAGON_FILES:
+ src_path = get_hexagon_rpc_dir() / item
+ dst_path = f"{self._workspace}/{item}"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, dst_path])
+
+ def hexagon_session_setup(self, remote_kw: dict):
+ """Setup Hexagon RPC Session from host to Hexagon device.
+
+ Parameters
+ ----------
+ remote_kw : dict
+ RPC tracker configs.
+ """
+ hexagon_remote_kw = dict(remote_kw)
+ hexagon_remote_kw["key"] = self.HEXAGON_REMOTE_DEVICE_KEY
+ self.session = Session(hexagon_remote_kw)
+
+ def get_module(self, module_name: str):
+ """Load a Hexagon TVM module, already uploaded on Android, on Hexagon and return the module.
+
+ Parameters
+ ----------
+ module_name : str
+ Module filename.
+
+ Returns
+ -------
+ TVMModule :
+ A TVM Module loaded on hexagon.
+ """
+ module_path = f"{self._workspace}/{module_name}"
+ self._mod = self.session.load_module(module_path)
+ return self._mod
+
+ def upload(self, host_path: Union[str, pathlib.Path], remote_filename: str):
+ """Upload a file to remote(Android).
+
+ Parameters
+ ----------
+ host_path : Union[str, pathlib.Path]
+ File path on host.
+
+ remote_filename : str
+ File name on remote(Android).
+ Returns
+ -------
+ TVMModule :
+ A TVM Module loaded on hexagon.
+ """
+ src_path = str(host_path)
+ dst_remote_path = f"{self._workspace}/{remote_filename}"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, dst_remote_path])
+
+ def get_local_graph_executor(self, libmod, remote_libmod_filename: str):
Review comment:
fixed here: https://github.com/apache/tvm/pull/9631/commits/299a378d277bca48c1fc2ac2a5c9f79dd9052595
##########
File path: python/tvm/contrib/hexagon/build.py
##########
@@ -0,0 +1,259 @@
+# 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.
+
+"""Defines top-level glue functions for building Hexagon."""
+
+import pathlib
+import os
+import subprocess
+from typing import Union
+import stat
+import datetime
+
+import tvm
+from ..._ffi import libinfo
+from .session import Session
+
+
+RPC_SERVER_FILES = ["tvm_rpc_android", "libtvm_runtime_android.so", "android_bash.sh"]
+
+HEXAGON_FILES = ["libhexagon_rpc_skel.so"]
+
+HEXAGON_RPC_DIR = None
+
+ANDROID_HEXAGON_TEST_BASE_DIR = pathlib.Path("/data/local/tmp/hexagon_test")
+
+
+def get_hexagon_rpc_dir() -> pathlib.Path:
+ """Find the Hexagon library.
+
+ Returns
+ -------
+ str :
+ The path to the Hexagon library
+ """
+ global HEXAGON_RPC_DIR
+ if HEXAGON_RPC_DIR is None:
+ for path in libinfo.find_lib_path():
+ rpc_dir = os.path.join(os.path.dirname(path), "hexagon_rpc")
+ if os.path.isdir(rpc_dir):
+ HEXAGON_RPC_DIR = pathlib.Path(rpc_dir)
+ break
+ else:
+ raise "hexagon_rpc was not found."
+ return HEXAGON_RPC_DIR
+
+
+class HexagonLauncher:
+ """Hexagon Launcher"""
+
+ def __init__(self, serial_number: str):
+ """Configure a new HexagonLauncher
+
+ Parameters
+ ----------
+ serial_number : str
+ Android device serial number from android 'adb' command.
+ """
+ # Hexagon RPCSession
+ self.session = None
+
+ self._serial_number = serial_number
+ self._adb_device_sub_cmd = ["adb", "-s", self._serial_number]
+ self._mod = None
+ self._workspace = None
+
+ HEXAGON_REMOTE_DEVICE_KEY = "hexagon-dev"
+
+ def android_run_rpc(
+ self,
+ workspace_dir: Union[str, pathlib.Path] = None,
+ rpc_server_port: int = 7070,
+ rpc_tracker_host: str = "0.0.0.0",
+ rpc_tracker_port: int = 9190,
+ ):
+ """Upload Android artifacts and run RPC server on Android.
+
+ Parameters
+ ----------
+ workspace_dir : Union[str, pathlib.Path]
+ Workspace directory used on Android to upload artifacts.
+
+ rpc_server_port : int
+ Android RPC server port number
+
+ rpc_tracker_host : str
+ RPC tracker IP on host
+
+ rpc_tracker_port : int
+ RPC tracker port on host
+ """
+ if not workspace_dir:
+ self._workspace = str(
+ ANDROID_HEXAGON_TEST_BASE_DIR
+ / datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+ )
+ else:
+ self._workspace = workspace_dir
+
+ # Upload RPC server and libraries
+ subprocess.check_call(self._adb_device_sub_cmd + ["shell", "mkdir", "-p", self._workspace])
+
+ # create bash script
+ android_bash_script_path = get_hexagon_rpc_dir() / "android_bash.sh"
+ with open(get_hexagon_rpc_dir() / "android_bash.sh.template", "r") as src_f:
+ if os.path.exists(android_bash_script_path):
+ os.remove(android_bash_script_path)
+ with open(android_bash_script_path, "w") as dest_f:
+ for line in src_f.readlines():
+ if "<RPC_TRACKER_HOST>" in line:
+ line = line.replace("<RPC_TRACKER_HOST>", str(rpc_tracker_host))
+ if "<RPC_TRACKER_PORT>" in line:
+ line = line.replace("<RPC_TRACKER_PORT>", str(rpc_tracker_port))
+ if "<HEXAGON_REMOTE_DEVICE_KEY>" in line:
+ line = line.replace(
+ "<HEXAGON_REMOTE_DEVICE_KEY>", self.HEXAGON_REMOTE_DEVICE_KEY
+ )
+ if "<RPC_SERVER_PORT>" in line:
+ line = line.replace("<RPC_SERVER_PORT>", str(rpc_server_port))
+ dest_f.write(line)
+
+ # make shell script executable
+ android_bash_stat = os.stat(android_bash_script_path)
+ os.chmod(android_bash_script_path, android_bash_stat.st_mode | stat.S_IEXEC)
+
+ # push files
+ for item in RPC_SERVER_FILES:
+ src_path = get_hexagon_rpc_dir() / item
+ destination = f"{self._workspace}/{item}"
+ if item == "libtvm_runtime_android.so":
+ destination = f"{self._workspace}/libtvm_runtime.so"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, destination])
+
+ # enable root for adb
+ subprocess.check_call(self._adb_device_sub_cmd + ["root"])
+ # Removed pre-defined forward/reverse rules
+ subprocess.check_call(self._adb_device_sub_cmd + ["forward", "--remove-all"])
+ subprocess.check_call(self._adb_device_sub_cmd + ["reverse", "--remove-all"])
+
+ # Enable port reverse for RPC tracker
+ subprocess.check_call(
+ self._adb_device_sub_cmd
+ + ["reverse", f"tcp:{rpc_tracker_port}", f"tcp:{rpc_tracker_port}"]
+ )
+ # Enable port forward for RPC server. We forward 9 ports after the rpc_server_port.
+ for i in range(0, 10):
+ subprocess.check_call(
+ self._adb_device_sub_cmd
+ + ["forward", f"tcp:{rpc_server_port+i}", f"tcp:{rpc_server_port+i}"]
+ )
+
+ # Run server and connect to tracker
+ subprocess.Popen(
+ self._adb_device_sub_cmd + ["shell", f"cd {self._workspace} && ./android_bash.sh"],
+ stdout=subprocess.PIPE,
+ stdin=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ )
+
+ def hexagon_setup(self):
+ """Upload Hexagon artifacts on Android."""
+ for item in HEXAGON_FILES:
+ src_path = get_hexagon_rpc_dir() / item
+ dst_path = f"{self._workspace}/{item}"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, dst_path])
+
+ def hexagon_session_setup(self, remote_kw: dict):
+ """Setup Hexagon RPC Session from host to Hexagon device.
+
+ Parameters
+ ----------
+ remote_kw : dict
+ RPC tracker configs.
+ """
+ hexagon_remote_kw = dict(remote_kw)
+ hexagon_remote_kw["key"] = self.HEXAGON_REMOTE_DEVICE_KEY
+ self.session = Session(hexagon_remote_kw)
+
+ def get_module(self, module_name: str):
+ """Load a Hexagon TVM module, already uploaded on Android, on Hexagon and return the module.
+
+ Parameters
+ ----------
+ module_name : str
+ Module filename.
+
+ Returns
+ -------
+ TVMModule :
+ A TVM Module loaded on hexagon.
+ """
+ module_path = f"{self._workspace}/{module_name}"
+ self._mod = self.session.load_module(module_path)
+ return self._mod
+
+ def upload(self, host_path: Union[str, pathlib.Path], remote_filename: str):
+ """Upload a file to remote(Android).
+
+ Parameters
+ ----------
+ host_path : Union[str, pathlib.Path]
+ File path on host.
+
+ remote_filename : str
+ File name on remote(Android).
+ Returns
+ -------
+ TVMModule :
+ A TVM Module loaded on hexagon.
+ """
+ src_path = str(host_path)
+ dst_remote_path = f"{self._workspace}/{remote_filename}"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, dst_remote_path])
+
+ def get_local_graph_executor(self, libmod, remote_libmod_filename: str):
+ """Create a GraphModule.
+
+ Parameters
+ ----------
+ libmod : tvm.runtime.Module
Review comment:
added here: https://github.com/apache/tvm/pull/9631/commits/299a378d277bca48c1fc2ac2a5c9f79dd9052595
##########
File path: python/tvm/contrib/hexagon/build.py
##########
@@ -0,0 +1,259 @@
+# 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.
+
+"""Defines top-level glue functions for building Hexagon."""
+
+import pathlib
+import os
+import subprocess
+from typing import Union
+import stat
+import datetime
+
+import tvm
+from ..._ffi import libinfo
+from .session import Session
+
+
+RPC_SERVER_FILES = ["tvm_rpc_android", "libtvm_runtime_android.so", "android_bash.sh"]
+
+HEXAGON_FILES = ["libhexagon_rpc_skel.so"]
+
+HEXAGON_RPC_DIR = None
+
+ANDROID_HEXAGON_TEST_BASE_DIR = pathlib.Path("/data/local/tmp/hexagon_test")
+
+
+def get_hexagon_rpc_dir() -> pathlib.Path:
+ """Find the Hexagon library.
+
+ Returns
+ -------
+ str :
+ The path to the Hexagon library
+ """
+ global HEXAGON_RPC_DIR
+ if HEXAGON_RPC_DIR is None:
+ for path in libinfo.find_lib_path():
+ rpc_dir = os.path.join(os.path.dirname(path), "hexagon_rpc")
+ if os.path.isdir(rpc_dir):
+ HEXAGON_RPC_DIR = pathlib.Path(rpc_dir)
+ break
+ else:
+ raise "hexagon_rpc was not found."
+ return HEXAGON_RPC_DIR
+
+
+class HexagonLauncher:
+ """Hexagon Launcher"""
+
+ def __init__(self, serial_number: str):
+ """Configure a new HexagonLauncher
+
+ Parameters
+ ----------
+ serial_number : str
+ Android device serial number from android 'adb' command.
+ """
+ # Hexagon RPCSession
+ self.session = None
+
+ self._serial_number = serial_number
+ self._adb_device_sub_cmd = ["adb", "-s", self._serial_number]
+ self._mod = None
+ self._workspace = None
+
+ HEXAGON_REMOTE_DEVICE_KEY = "hexagon-dev"
+
+ def android_run_rpc(
+ self,
+ workspace_dir: Union[str, pathlib.Path] = None,
+ rpc_server_port: int = 7070,
+ rpc_tracker_host: str = "0.0.0.0",
+ rpc_tracker_port: int = 9190,
+ ):
+ """Upload Android artifacts and run RPC server on Android.
+
+ Parameters
+ ----------
+ workspace_dir : Union[str, pathlib.Path]
+ Workspace directory used on Android to upload artifacts.
+
+ rpc_server_port : int
+ Android RPC server port number
+
+ rpc_tracker_host : str
+ RPC tracker IP on host
+
+ rpc_tracker_port : int
+ RPC tracker port on host
+ """
+ if not workspace_dir:
+ self._workspace = str(
+ ANDROID_HEXAGON_TEST_BASE_DIR
+ / datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+ )
+ else:
+ self._workspace = workspace_dir
+
+ # Upload RPC server and libraries
+ subprocess.check_call(self._adb_device_sub_cmd + ["shell", "mkdir", "-p", self._workspace])
+
+ # create bash script
+ android_bash_script_path = get_hexagon_rpc_dir() / "android_bash.sh"
+ with open(get_hexagon_rpc_dir() / "android_bash.sh.template", "r") as src_f:
+ if os.path.exists(android_bash_script_path):
+ os.remove(android_bash_script_path)
+ with open(android_bash_script_path, "w") as dest_f:
+ for line in src_f.readlines():
+ if "<RPC_TRACKER_HOST>" in line:
+ line = line.replace("<RPC_TRACKER_HOST>", str(rpc_tracker_host))
+ if "<RPC_TRACKER_PORT>" in line:
+ line = line.replace("<RPC_TRACKER_PORT>", str(rpc_tracker_port))
+ if "<HEXAGON_REMOTE_DEVICE_KEY>" in line:
+ line = line.replace(
+ "<HEXAGON_REMOTE_DEVICE_KEY>", self.HEXAGON_REMOTE_DEVICE_KEY
+ )
+ if "<RPC_SERVER_PORT>" in line:
+ line = line.replace("<RPC_SERVER_PORT>", str(rpc_server_port))
+ dest_f.write(line)
+
+ # make shell script executable
+ android_bash_stat = os.stat(android_bash_script_path)
+ os.chmod(android_bash_script_path, android_bash_stat.st_mode | stat.S_IEXEC)
+
+ # push files
+ for item in RPC_SERVER_FILES:
+ src_path = get_hexagon_rpc_dir() / item
+ destination = f"{self._workspace}/{item}"
+ if item == "libtvm_runtime_android.so":
Review comment:
Thanks for the suggestions. I picked the second one here: https://github.com/apache/tvm/pull/9631/commits/b16c8b06dca8a83264dab0c7f7b4710f58f8ead9
##########
File path: src/runtime/hexagon/rpc/hexagon/rpc_server.cc
##########
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+
+extern "C" {
+#include <AEEStdDef.h>
+#include <AEEStdErr.h>
+#include <HAP_farf.h>
+#include <HAP_perf.h>
+#include <qurt_error.h>
+#include <qurt_hvx.h>
+}
+
+#include <dlfcn.h>
+#include <tvm/runtime/object.h>
+#include <tvm/runtime/packed_func.h>
+#include <tvm/runtime/registry.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+
+#include "../../../library_module.h"
+#include "../../../minrpc/minrpc_server.h"
+#include "../../hexagon/hexagon_common.h"
+#include "hexagon_rpc.h"
+
+#define TVM_HEXAGON_RPC_BUFF_SIZE_BYTES 1024 * 1024
+
+#define TVM_LOG_CUSTOMIZE 1
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonIOHandler {
+ public:
+ explicit HexagonIOHandler(uint8_t* read_buffer) : read_buffer_{read_buffer} {}
+
+ void MessageStart(size_t message_size_bytes) {}
+
+ ssize_t PosixWrite(const uint8_t* buf, size_t write_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler PosixWrite called, write_len_bytes: %d", write_len_bytes);
+ size_t written_size = static_cast<size_t>(
+ write_buffer_.sputn(reinterpret_cast<const char*>(buf), write_len_bytes));
+ if (written_size != write_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler written_size failed");
+ }
+ return (ssize_t)written_size;
+ }
+
+ void MessageDone() {}
+
+ ssize_t PosixRead(uint8_t* buf, size_t read_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler PosixRead called, %d, %d", read_len_bytes,
+ read_buffer_size_bytes_);
+
+ uint32_t bytes_to_read = 0;
+ if ((read_buffer_size_bytes_ - read_len_bytes) < 0) {
Review comment:
I initialized it at the constructor as you suggested in previous comment.
##########
File path: python/tvm/contrib/hexagon/build.py
##########
@@ -0,0 +1,259 @@
+# 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.
+
+"""Defines top-level glue functions for building Hexagon."""
+
+import pathlib
+import os
+import subprocess
+from typing import Union
+import stat
+import datetime
+
+import tvm
+from ..._ffi import libinfo
+from .session import Session
+
+
+RPC_SERVER_FILES = ["tvm_rpc_android", "libtvm_runtime_android.so", "android_bash.sh"]
+
+HEXAGON_FILES = ["libhexagon_rpc_skel.so"]
+
+HEXAGON_RPC_DIR = None
+
+ANDROID_HEXAGON_TEST_BASE_DIR = pathlib.Path("/data/local/tmp/hexagon_test")
+
+
+def get_hexagon_rpc_dir() -> pathlib.Path:
+ """Find the Hexagon library.
+
+ Returns
+ -------
+ str :
+ The path to the Hexagon library
+ """
+ global HEXAGON_RPC_DIR
+ if HEXAGON_RPC_DIR is None:
+ for path in libinfo.find_lib_path():
+ rpc_dir = os.path.join(os.path.dirname(path), "hexagon_rpc")
+ if os.path.isdir(rpc_dir):
+ HEXAGON_RPC_DIR = pathlib.Path(rpc_dir)
+ break
+ else:
+ raise "hexagon_rpc was not found."
+ return HEXAGON_RPC_DIR
+
+
+class HexagonLauncher:
+ """Hexagon Launcher"""
+
+ def __init__(self, serial_number: str):
+ """Configure a new HexagonLauncher
+
+ Parameters
+ ----------
+ serial_number : str
+ Android device serial number from android 'adb' command.
+ """
+ # Hexagon RPCSession
+ self.session = None
+
+ self._serial_number = serial_number
+ self._adb_device_sub_cmd = ["adb", "-s", self._serial_number]
+ self._mod = None
+ self._workspace = None
+
+ HEXAGON_REMOTE_DEVICE_KEY = "hexagon-dev"
+
+ def android_run_rpc(
+ self,
+ workspace_dir: Union[str, pathlib.Path] = None,
+ rpc_server_port: int = 7070,
+ rpc_tracker_host: str = "0.0.0.0",
+ rpc_tracker_port: int = 9190,
+ ):
+ """Upload Android artifacts and run RPC server on Android.
+
+ Parameters
+ ----------
+ workspace_dir : Union[str, pathlib.Path]
+ Workspace directory used on Android to upload artifacts.
+
+ rpc_server_port : int
+ Android RPC server port number
+
+ rpc_tracker_host : str
+ RPC tracker IP on host
+
+ rpc_tracker_port : int
+ RPC tracker port on host
+ """
+ if not workspace_dir:
+ self._workspace = str(
+ ANDROID_HEXAGON_TEST_BASE_DIR
+ / datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+ )
+ else:
+ self._workspace = workspace_dir
+
+ # Upload RPC server and libraries
+ subprocess.check_call(self._adb_device_sub_cmd + ["shell", "mkdir", "-p", self._workspace])
+
+ # create bash script
+ android_bash_script_path = get_hexagon_rpc_dir() / "android_bash.sh"
+ with open(get_hexagon_rpc_dir() / "android_bash.sh.template", "r") as src_f:
+ if os.path.exists(android_bash_script_path):
+ os.remove(android_bash_script_path)
+ with open(android_bash_script_path, "w") as dest_f:
+ for line in src_f.readlines():
+ if "<RPC_TRACKER_HOST>" in line:
+ line = line.replace("<RPC_TRACKER_HOST>", str(rpc_tracker_host))
+ if "<RPC_TRACKER_PORT>" in line:
+ line = line.replace("<RPC_TRACKER_PORT>", str(rpc_tracker_port))
+ if "<HEXAGON_REMOTE_DEVICE_KEY>" in line:
+ line = line.replace(
+ "<HEXAGON_REMOTE_DEVICE_KEY>", self.HEXAGON_REMOTE_DEVICE_KEY
+ )
+ if "<RPC_SERVER_PORT>" in line:
+ line = line.replace("<RPC_SERVER_PORT>", str(rpc_server_port))
+ dest_f.write(line)
+
+ # make shell script executable
+ android_bash_stat = os.stat(android_bash_script_path)
+ os.chmod(android_bash_script_path, android_bash_stat.st_mode | stat.S_IEXEC)
+
+ # push files
+ for item in RPC_SERVER_FILES:
+ src_path = get_hexagon_rpc_dir() / item
+ destination = f"{self._workspace}/{item}"
+ if item == "libtvm_runtime_android.so":
+ destination = f"{self._workspace}/libtvm_runtime.so"
+ subprocess.check_call(self._adb_device_sub_cmd + ["push", src_path, destination])
+
+ # enable root for adb
+ subprocess.check_call(self._adb_device_sub_cmd + ["root"])
Review comment:
That's right, we don't need it: https://github.com/apache/tvm/pull/9631/commits/076619f0d5a6cc91e3bc16882c2cd79743f40be9
##########
File path: python/tvm/contrib/hexagon/build.py
##########
@@ -0,0 +1,259 @@
+# 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.
+
+"""Defines top-level glue functions for building Hexagon."""
+
+import pathlib
+import os
+import subprocess
+from typing import Union
+import stat
+import datetime
+
+import tvm
+from ..._ffi import libinfo
+from .session import Session
+
+
+RPC_SERVER_FILES = ["tvm_rpc_android", "libtvm_runtime_android.so", "android_bash.sh"]
+
+HEXAGON_FILES = ["libhexagon_rpc_skel.so"]
+
+HEXAGON_RPC_DIR = None
+
+ANDROID_HEXAGON_TEST_BASE_DIR = pathlib.Path("/data/local/tmp/hexagon_test")
+
+
+def get_hexagon_rpc_dir() -> pathlib.Path:
+ """Find the Hexagon library.
+
+ Returns
+ -------
+ str :
+ The path to the Hexagon library
+ """
+ global HEXAGON_RPC_DIR
+ if HEXAGON_RPC_DIR is None:
+ for path in libinfo.find_lib_path():
+ rpc_dir = os.path.join(os.path.dirname(path), "hexagon_rpc")
+ if os.path.isdir(rpc_dir):
+ HEXAGON_RPC_DIR = pathlib.Path(rpc_dir)
+ break
+ else:
+ raise "hexagon_rpc was not found."
+ return HEXAGON_RPC_DIR
+
+
+class HexagonLauncher:
+ """Hexagon Launcher"""
+
+ def __init__(self, serial_number: str):
+ """Configure a new HexagonLauncher
+
+ Parameters
+ ----------
+ serial_number : str
+ Android device serial number from android 'adb' command.
+ """
+ # Hexagon RPCSession
+ self.session = None
+
+ self._serial_number = serial_number
+ self._adb_device_sub_cmd = ["adb", "-s", self._serial_number]
+ self._mod = None
+ self._workspace = None
+
+ HEXAGON_REMOTE_DEVICE_KEY = "hexagon-dev"
+
+ def android_run_rpc(
+ self,
+ workspace_dir: Union[str, pathlib.Path] = None,
+ rpc_server_port: int = 7070,
+ rpc_tracker_host: str = "0.0.0.0",
+ rpc_tracker_port: int = 9190,
+ ):
+ """Upload Android artifacts and run RPC server on Android.
+
+ Parameters
+ ----------
+ workspace_dir : Union[str, pathlib.Path]
+ Workspace directory used on Android to upload artifacts.
+
+ rpc_server_port : int
+ Android RPC server port number
+
+ rpc_tracker_host : str
+ RPC tracker IP on host
+
+ rpc_tracker_port : int
+ RPC tracker port on host
+ """
+ if not workspace_dir:
+ self._workspace = str(
+ ANDROID_HEXAGON_TEST_BASE_DIR
+ / datetime.datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+ )
+ else:
+ self._workspace = workspace_dir
+
Review comment:
Added in commit https://github.com/apache/tvm/pull/9631/commits/cea8757ddc39a4c9589e1d5394a4ae431beb1660
##########
File path: src/runtime/hexagon/rpc/android/session.cc
##########
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ */
+
+/*!
+ * \file hexagon_session.cc
+ */
+
+#include <tvm/runtime/registry.h>
+
+extern "C" {
+#include <AEEStdDef.h>
+#include <AEEStdErr.h>
+#include <HAP_farf.h>
+#include <HAP_perf.h>
+}
+
+#include <tvm/runtime/logging.h>
+
+#include <string>
+
+#include "../../../rpc/rpc_channel.h"
+#include "../../../rpc/rpc_endpoint.h"
+#include "../../../rpc/rpc_session.h"
+#include "../hexagon_rpc.h"
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonTransportChannel : public RPCChannel {
+ public:
+ explicit HexagonTransportChannel(const std::string& uri) {
+ if (_handle != AEE_EUNKNOWN) return;
+
+ enable_unsigned_pd(true);
+ set_remote_stack_size(128 * 1024);
Review comment:
done in: https://github.com/apache/tvm/pull/9631/commits/46562320069bb139e96bb86974b2a3cdbbc47c62
##########
File path: src/runtime/hexagon/rpc/hexagon/rpc_server.cc
##########
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+
+extern "C" {
+#include <AEEStdDef.h>
+#include <AEEStdErr.h>
+#include <HAP_farf.h>
+#include <HAP_perf.h>
+#include <qurt_error.h>
+#include <qurt_hvx.h>
+}
+
+#include <dlfcn.h>
+#include <tvm/runtime/object.h>
+#include <tvm/runtime/packed_func.h>
+#include <tvm/runtime/registry.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+
+#include "../../../library_module.h"
+#include "../../../minrpc/minrpc_server.h"
+#include "../../hexagon/hexagon_common.h"
+#include "hexagon_rpc.h"
+
+#define TVM_HEXAGON_RPC_BUFF_SIZE_BYTES 1024 * 1024
+
+#define TVM_LOG_CUSTOMIZE 1
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonIOHandler {
+ public:
+ explicit HexagonIOHandler(uint8_t* read_buffer) : read_buffer_{read_buffer} {}
+
+ void MessageStart(size_t message_size_bytes) {}
+
+ ssize_t PosixWrite(const uint8_t* buf, size_t write_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler PosixWrite called, write_len_bytes: %d", write_len_bytes);
+ size_t written_size = static_cast<size_t>(
+ write_buffer_.sputn(reinterpret_cast<const char*>(buf), write_len_bytes));
+ if (written_size != write_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler written_size failed");
+ }
+ return (ssize_t)written_size;
+ }
+
+ void MessageDone() {}
+
+ ssize_t PosixRead(uint8_t* buf, size_t read_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler PosixRead called, %d, %d", read_len_bytes,
+ read_buffer_size_bytes_);
+
+ uint32_t bytes_to_read = 0;
+ if ((read_buffer_size_bytes_ - read_len_bytes) < 0) {
+ bytes_to_read = read_buffer_size_bytes_;
+ } else {
+ bytes_to_read = read_len_bytes;
+ }
+
+ std::memcpy(buf, read_buffer_, bytes_to_read);
+ read_buffer_ += bytes_to_read;
+ read_buffer_size_bytes_ -= bytes_to_read;
+ if (bytes_to_read != read_len_bytes) {
+ FARF(ERROR, "Error bytes_to_read (%d) < read_len_bytes (%d).", bytes_to_read, read_len_bytes);
+ }
+ return (ssize_t)bytes_to_read;
+ }
+
+ void SetReadBuffer(const uint8_t* buf, size_t buf_size_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler SetReadBuffer called: %d, prev read_buffer_size_bytes_: ",
+ buf_size_bytes, read_buffer_size_bytes_);
+ read_buffer_ = buf;
+ read_buffer_size_bytes_ = buf_size_bytes;
+ }
+
+ int64_t GetWriteBuffer(uint8_t* buf, size_t read_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler GetWriteBuffer called, read_len_bytes: %d", read_len_bytes);
+ return write_buffer_.sgetn(reinterpret_cast<char*>(buf), read_len_bytes);
+ }
+
+ void Close() { FARF(ALWAYS, "HexagonIOHandler Close called"); }
+
+ void Exit(int code) { exit(code); }
+
+ private:
+ const uint8_t* read_buffer_;
+ uint32_t read_buffer_size_bytes_;
+
+ std::stringbuf write_buffer_;
+};
+
+class HexagonRPCServer {
+ public:
+ explicit HexagonRPCServer(uint8_t* receive_buffer) : io_{receive_buffer}, rpc_server_{&io_} {};
+
+ int64_t Write(const uint8_t* data, size_t data_len_bytes) {
+ io_.SetReadBuffer(data, data_len_bytes);
Review comment:
agreed, it is really confusing. I added some documentation here: https://github.com/apache/tvm/pull/9631/commits/e57c7aafcc650a644e5d93d4ba7145725c6cd538
Please let me know if you have more suggestions.
##########
File path: src/runtime/hexagon/rpc/hexagon/rpc_server.cc
##########
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+
+extern "C" {
+#include <AEEStdDef.h>
+#include <AEEStdErr.h>
+#include <HAP_farf.h>
+#include <HAP_perf.h>
+#include <qurt_error.h>
+#include <qurt_hvx.h>
+}
+
+#include <dlfcn.h>
+#include <tvm/runtime/object.h>
+#include <tvm/runtime/packed_func.h>
+#include <tvm/runtime/registry.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+
+#include "../../../library_module.h"
+#include "../../../minrpc/minrpc_server.h"
+#include "../../hexagon/hexagon_common.h"
+#include "hexagon_rpc.h"
+
+#define TVM_HEXAGON_RPC_BUFF_SIZE_BYTES 1024 * 1024
+
+#define TVM_LOG_CUSTOMIZE 1
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonIOHandler {
Review comment:
https://github.com/apache/tvm/pull/9631/commits/e57c7aafcc650a644e5d93d4ba7145725c6cd538
##########
File path: src/runtime/hexagon/rpc/hexagon/rpc_server.cc
##########
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+
+extern "C" {
+#include <AEEStdDef.h>
+#include <AEEStdErr.h>
+#include <HAP_farf.h>
+#include <HAP_perf.h>
+#include <qurt_error.h>
+#include <qurt_hvx.h>
+}
+
+#include <dlfcn.h>
+#include <tvm/runtime/object.h>
+#include <tvm/runtime/packed_func.h>
+#include <tvm/runtime/registry.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+
+#include "../../../library_module.h"
+#include "../../../minrpc/minrpc_server.h"
+#include "../../hexagon/hexagon_common.h"
+#include "hexagon_rpc.h"
+
+#define TVM_HEXAGON_RPC_BUFF_SIZE_BYTES 1024 * 1024
+
+#define TVM_LOG_CUSTOMIZE 1
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonIOHandler {
+ public:
+ explicit HexagonIOHandler(uint8_t* read_buffer) : read_buffer_{read_buffer} {}
Review comment:
initialized the `read_buffer_size_bytes_` in https://github.com/apache/tvm/pull/9631/commits/e57c7aafcc650a644e5d93d4ba7145725c6cd538
##########
File path: python/tvm/contrib/hexagon/session.py
##########
@@ -0,0 +1,71 @@
+# 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.
+
+"""Defines a Session class for Hexagon devices."""
+
+from tvm import rpc as _rpc
+
+
+class Session:
+ """Hexagon Device Session
+
+ Parameters
+ ----------
+ remote_kw : dict
+ Remote configs for RPC tracker.
+
+ session_name : str
+ Hexagon RPC session name.
+ """
+
+ def __init__(
+ self,
+ remote_kw: dict,
+ session_name: str = "hexagon-rpc",
+ ):
+ self._session_name = session_name
+ self._remote_kw = remote_kw
+ self._rpc = None
+ self.device = None
+
+ def __enter__(self):
+ if self.device:
+ return self
Review comment:
else would create RPCSession and returns itself or raises exception. I think all cases are covered. Can you elaborate what's the confusion?
##########
File path: src/runtime/hexagon/rpc/hexagon/rpc_server.cc
##########
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ */
+
+extern "C" {
+#include <AEEStdDef.h>
+#include <AEEStdErr.h>
+#include <HAP_farf.h>
+#include <HAP_perf.h>
+#include <qurt_error.h>
+#include <qurt_hvx.h>
+}
+
+#include <dlfcn.h>
+#include <tvm/runtime/object.h>
+#include <tvm/runtime/packed_func.h>
+#include <tvm/runtime/registry.h>
+
+#include <algorithm>
+#include <memory>
+#include <string>
+
+#include "../../../library_module.h"
+#include "../../../minrpc/minrpc_server.h"
+#include "../../hexagon/hexagon_common.h"
+#include "hexagon_rpc.h"
+
+#define TVM_HEXAGON_RPC_BUFF_SIZE_BYTES 1024 * 1024
+
+#define TVM_LOG_CUSTOMIZE 1
+
+namespace tvm {
+namespace runtime {
+namespace hexagon {
+
+class HexagonIOHandler {
+ public:
+ explicit HexagonIOHandler(uint8_t* read_buffer) : read_buffer_{read_buffer} {}
+
+ void MessageStart(size_t message_size_bytes) {}
+
+ ssize_t PosixWrite(const uint8_t* buf, size_t write_len_bytes) {
+ FARF(ALWAYS, "HexagonIOHandler PosixWrite called, write_len_bytes: %d", write_len_bytes);
Review comment:
refactored in https://github.com/apache/tvm/pull/9631/commits/e57c7aafcc650a644e5d93d4ba7145725c6cd538
##########
File path: tests/python/contrib/test_hexagon/rpc/conftest.py
##########
@@ -0,0 +1,82 @@
+# 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.
+import pytest
+import os
+
+import tvm.testing
+
+
+def pytest_addoption(parser):
+ parser.addoption(
+ "--serial-number",
+ required=True,
+ help=("Android device serial number list from 'adb' command."),
+ )
+
+
+@pytest.fixture
+def android_serial_number(request):
+ return request.config.getoption("--serial-number")
+
+
+@tvm.testing.fixture
+def tvm_tracker_host():
+ return os.environ["TVM_TRACKER_HOST"]
+
+
+@tvm.testing.fixture
+def tvm_tracker_port():
+ return int(os.environ["TVM_TRACKER_PORT"])
+
+
+def _compose(args, decs):
+ """Helper to apply multiple markers"""
+ if len(args) > 0:
+ f = args[0]
+ for d in reversed(decs):
+ f = d(f)
+ return f
+ return decs
+
+
+def requires_rpc_tracker(*args):
+ """Mark a test as requiring an RPC tracker to exist in
+ the host environment to run."""
+ _requires_rpc_tracker = [
+ *tvm.testing.requires_rpc(),
+ pytest.mark.skipif(
+ os.environ.get("TVM_TRACKER_HOST") == None,
+ reason="Missing environment variable, TVM_TRACKER_HOST",
+ ),
+ pytest.mark.skipif(
+ os.environ.get("TVM_TRACKER_PORT") == None,
+ reason="Missing environment variable, TVM_TRACKER_PORT",
+ ),
+ ]
+
+ return _compose(args, _requires_rpc_tracker)
+
+
+def requires_hexagon_toolchain(*args):
+ _requires_hexagon_toolchain = [
+ pytest.mark.skipif(
+ os.environ.get("HEXAGON_TOOLCHAIN") == None,
+ reason="HEXAGON_TOOLCHAIN environment variable is required to run this test.",
+ ),
+ ]
Review comment:
Refactored conftest files here: https://github.com/apache/tvm/pull/9631/commits/aa61967796f975156bcf61030a441a53c909ecf4
--
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: commits-unsubscribe@tvm.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org