MLECO-2976: Configurable Ethos-U cache size for Dedicated_Sram
MLECO-2949: Platform drivers should own NPU and TA init
Change-Id: I13606a0197f137816bae803eb9d7d46c358b5fb8
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
diff --git a/build_default.py b/build_default.py
index c0cf8d1..2e95528 100755
--- a/build_default.py
+++ b/build_default.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,23 +13,23 @@
# 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 os
-import subprocess
-import shutil
-import multiprocessing
import logging
-import threading
+import multiprocessing
+import os
+import shutil
+import subprocess
import sys
-from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
+import threading
+from argparse import ArgumentDefaultsHelpFormatter
+from argparse import ArgumentParser
-from set_up_default_resources import set_up_resources, \
- get_default_npu_config_from_name, \
- valid_npu_config_names, \
- default_npu_config_names
+from set_up_default_resources import default_npu_config_names
+from set_up_default_resources import get_default_npu_config_from_name
+from set_up_default_resources import set_up_resources
+from set_up_default_resources import valid_npu_config_names
+
class PipeLogging(threading.Thread):
-
def __init__(self, log_level):
threading.Thread.__init__(self)
self.logLevel = log_level
@@ -43,20 +42,23 @@
return self.fileWrite
def run(self):
- for line in iter(self.pipeIn.readline, ''):
- logging.log(self.logLevel, line.strip('\n'))
+ for line in iter(self.pipeIn.readline, ""):
+ logging.log(self.logLevel, line.strip("\n"))
self.pipeIn.close()
def close(self):
os.close(self.fileWrite)
-def run(toolchain: str,
- download_resources: bool,
- run_vela_on_models: bool,
- npu_config_name: str,
- make_jobs: int,
- make_verbose: bool):
+
+def run(
+ toolchain: str,
+ download_resources: bool,
+ run_vela_on_models: bool,
+ npu_config_name: str,
+ make_jobs: int,
+ make_verbose: bool,
+):
"""
Run the helpers scripts.
@@ -72,7 +74,9 @@
# 1. Make sure the toolchain is supported, and set the right one here
supported_toolchain_ids = ["gnu", "arm"]
- assert toolchain in supported_toolchain_ids, f"Toolchain must be from {supported_toolchain_ids}"
+ assert (
+ toolchain in supported_toolchain_ids
+ ), f"Toolchain must be from {supported_toolchain_ids}"
if toolchain == "arm":
toolchain_file_name = "bare-metal-armclang.cmake"
elif toolchain == "gnu":
@@ -81,16 +85,20 @@
# 2. Download models if specified
if download_resources is True:
logging.info("Downloading resources.")
- set_up_resources(run_vela_on_models=run_vela_on_models,
- additional_npu_config_names=[npu_config_name])
+ set_up_resources(
+ run_vela_on_models=run_vela_on_models,
+ additional_npu_config_names=[npu_config_name],
+ )
# 3. Build default configuration
logging.info("Building default configuration.")
target_platform = "mps3"
target_subsystem = "sse-300"
ethos_u_cfg = get_default_npu_config_from_name(npu_config_name)
- build_dir = os.path.join(current_file_dir,
- f"cmake-build-{target_platform}-{target_subsystem}-{npu_config_name}-{toolchain}")
+ build_dir = os.path.join(
+ current_file_dir,
+ f"cmake-build-{target_platform}-{target_subsystem}-{npu_config_name}-{toolchain}",
+ )
try:
os.mkdir(build_dir)
except FileExistsError:
@@ -103,65 +111,84 @@
elif os.path.isdir(filepath):
shutil.rmtree(filepath)
except Exception as e:
- logging.error('Failed to delete %s. Reason: %s' % (filepath, e))
+ logging.error(f"Failed to delete {filepath}. Reason: {e}")
logpipe = PipeLogging(logging.INFO)
os.chdir(build_dir)
- cmake_toolchain_file = os.path.join(current_file_dir, "scripts", "cmake",
- "toolchains", toolchain_file_name)
- cmake_command = (f"cmake .. -DTARGET_PLATFORM={target_platform}" +
- f" -DTARGET_SUBSYSTEM={target_subsystem}" +
- f" -DCMAKE_TOOLCHAIN_FILE={cmake_toolchain_file}" +
- f" -DETHOS_U_NPU_ID={ethos_u_cfg.ethos_u_npu_id}" +
- f" -DETHOS_U_NPU_CONFIG_ID={ethos_u_cfg.ethos_u_config_id}")
+ cmake_toolchain_file = os.path.join(
+ current_file_dir, "scripts", "cmake", "toolchains", toolchain_file_name
+ )
+ cmake_command = (
+ f"cmake .. -DTARGET_PLATFORM={target_platform}"
+ + f" -DTARGET_SUBSYSTEM={target_subsystem}"
+ + f" -DCMAKE_TOOLCHAIN_FILE={cmake_toolchain_file}"
+ + f" -DETHOS_U_NPU_ID={ethos_u_cfg.ethos_u_npu_id}"
+ + f" -DETHOS_U_NPU_CONFIG_ID={ethos_u_cfg.ethos_u_config_id}"
+ )
logging.info(cmake_command)
- state = subprocess.run(cmake_command, shell=True, stdout=logpipe,
- stderr=subprocess.STDOUT)
+ state = subprocess.run(
+ cmake_command, shell=True, stdout=logpipe, stderr=subprocess.STDOUT
+ )
- make_command = f"make -j{make_jobs}"
- if make_verbose :
+ make_command = f"make -j{make_jobs}"
+ if make_verbose:
make_command += " VERBOSE=1"
logging.info(make_command)
- state = subprocess.run(make_command, shell=True, stdout=logpipe,
- stderr=subprocess.STDOUT)
+ state = subprocess.run(
+ make_command, shell=True, stdout=logpipe, stderr=subprocess.STDOUT
+ )
logpipe.close()
-if __name__ == '__main__':
+if __name__ == "__main__":
parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
- parser.add_argument("--toolchain", default="gnu",
- help="""
+ parser.add_argument(
+ "--toolchain",
+ default="gnu",
+ help="""
Specify the toolchain to use (Arm or GNU).
Options are [gnu, arm]; default is gnu.
- """)
- parser.add_argument("--skip-download",
- help="Do not download resources: models and test vectors",
- action="store_true")
- parser.add_argument("--skip-vela",
- help="Do not run Vela optimizer on downloaded models.",
- action="store_true")
- parser.add_argument("--npu-config-name",
- help=f"""Arm Ethos-U configuration to build for. Choose from:
+ """,
+ )
+ parser.add_argument(
+ "--skip-download",
+ help="Do not download resources: models and test vectors",
+ action="store_true",
+ )
+ parser.add_argument(
+ "--skip-vela",
+ help="Do not run Vela optimizer on downloaded models.",
+ action="store_true",
+ )
+ parser.add_argument(
+ "--npu-config-name",
+ help=f"""Arm Ethos-U configuration to build for. Choose from:
{valid_npu_config_names}""",
- default=default_npu_config_names[0])
- parser.add_argument("--make-jobs",
- help="Number of jobs to run with make",
- default=multiprocessing.cpu_count())
- parser.add_argument("--make-verbose",
- help="Make runs with VERBOSE=1",
- action='store_true')
+ default=default_npu_config_names[0],
+ )
+ parser.add_argument(
+ "--make-jobs",
+ help="Number of jobs to run with make",
+ default=multiprocessing.cpu_count(),
+ )
+ parser.add_argument(
+ "--make-verbose", help="Make runs with VERBOSE=1", action="store_true"
+ )
args = parser.parse_args()
- logging.basicConfig(filename='log_build_default.log', level=logging.DEBUG,
- filemode='w')
+ logging.basicConfig(
+ filename="log_build_default.log", level=logging.DEBUG, filemode="w"
+ )
logging.getLogger().addHandler(logging.StreamHandler(sys.stdout))
- run(args.toolchain.lower(),
+ run(
+ args.toolchain.lower(),
not args.skip_download,
not args.skip_vela,
args.npu_config_name,
args.make_jobs,
- args.make_verbose)
+ args.make_verbose,
+ )