shrinkwrap-tool 2026.2.1__py3-none-any.whl

shrinkwrap/commands/process.py

@@ -0,0 +1,106 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+import os
+import shrinkwrap.utils.config as config
+import shrinkwrap.utils.vars as vars
+
+
+cmd_name = os.path.splitext(os.path.basename(__file__))[0]
+
+
+def add_parser(parser, formatter):
+	"""
+	Part of the command interface expected by shrinkwrap.py. Adds the
+	subcommand to the parser, along with all options and documentation.
+	Returns the subcommand name.
+	"""
+	cmdp = parser.add_parser(cmd_name,
+		formatter_class=formatter,
+		help="""Outputs to stdout the result of either merging down the
+		     config layers, or resolving macros within the merged
+		     config.""",
+		epilog="""Custom config store(s) can be defined at at
+		     <SHRINKWRAP_CONFIG> as a colon-separated list of
+		     directories. Shrinkwrap will always search its default
+		     config store even if <SHRINKWRAP_CONFIG> is not
+		     defined.""")
+
+	cmdp.add_argument('config',
+		metavar='config',
+		help="""Config to process. If the config exists relative to the
+		     current directory that config is used. Else if the config
+		     exists relative to the config store then it is used.""")
+
+	cmdp.add_argument('-a', '--action',
+		metavar='action', required=True,
+		choices=['merge', 'resolveb', 'resolver'],
+		help="""Action to take. Either "merge" (merge down the config
+		     layers), "resolveb" (resolve build-time macros within the
+		     merged config) or "resolver" (resolve run-time macros
+		     within the build-time resolved config).""")
+
+	cmdp.add_argument('-o', '--overlay',
+		metavar='cfgfile', required=False, default=[],
+		action='append',
+		help="""Optional config file overlay to override run-time and
+		     build-time settings. Only entries within the "build",
+		     "buildex" and "run" sections are used. Can be specified
+		     multiple times; left-most overlay is the first overlay
+		     applied.""")
+
+	cmdp.add_argument('-b', '--btvar',
+		metavar='key=value', required=False, default=[],
+		action='append',
+		help="""Override value for a single build-time variable defined
+		     by the config. Specify option multiple times for multiple
+		     variables. Overrides for variables that have a default
+		     specified by the config are optional. Only used if action
+		     is "resolveb" or "resolver".""")
+
+	cmdp.add_argument('-r', '--rtvar',
+		metavar='key=value', required=False, default=[],
+		action='append',
+		help="""Override value for a single runtime variable defined by
+		     the config. Specify option multiple times for multiple
+		     variables. Overrides for variables that have a default
+		     specified by the config are optional. Only used if action
+		     is "resolver".""")
+
+	return cmd_name
+
+
+def dispatch(args):
+	"""
+	Part of the command interface expected by shrinkwrap.py. Called to
+	execute the subcommand, with the arguments the user passed on the
+	command line. The arguments comply with those requested in add_parser().
+	"""
+	overlays = []
+	for overlayname in args.overlay:
+		overlay = config.filename(overlayname)
+		overlay = config.load(overlay)
+		overlay = {
+			'build': overlay['build'],
+			'buildex': overlay['buildex'],
+			'run': overlay['run'],
+		}
+		overlays.append(overlay)
+
+	filename = config.filename(args.config)
+	merged = config.load(filename, overlays)
+
+	if args.action == 'merge':
+		print(config.dumps(merged))
+	else:
+		btvars = vars.parse(args.btvar, type='bt')
+		resolveb = config.resolveb(merged, btvars)
+
+		if args.action == 'resolveb':
+			print(config.dumps(resolveb))
+		else:
+			rtvars_dict = vars.parse(args.rtvar, type='rt')
+			resolver = config.resolver(resolveb, rtvars_dict)
+
+			if args.action == 'resolver':
+				print(config.dumps(resolver))

shrinkwrap/commands/run.py

@@ -0,0 +1,311 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+import os
+import re
+import tempfile
+import shrinkwrap.utils.config as config
+import shrinkwrap.utils.logger as logger
+import shrinkwrap.utils.process as process
+import shrinkwrap.utils.vars as vars
+import shrinkwrap.utils.runtime as runtime
+import shrinkwrap.utils.workspace as workspace
+
+
+cmd_name = os.path.splitext(os.path.basename(__file__))[0]
+
+
+def add_parser(parser, formatter):
+	"""
+	Part of the command interface expected by shrinkwrap.py. Adds the
+	subcommand to the parser, along with all options and documentation.
+	Returns the subcommand name.
+	"""
+	cmdp = parser.add_parser(cmd_name,
+		formatter_class=formatter,
+		help="""Boot and run the FVP for the specified config.""",
+		epilog="""FW is accessed from <SHRINKWRAP_PACKAGE>.
+		     <SHRINKWRAP_PACKAGE> defaults to '~/.shrinkwrap/package',
+		     but the user can override it by setting the environment
+		     variable.""")
+
+	cmdp.add_argument('config',
+		metavar='config',
+		help="""Config to run. Must have been previously built into
+		     <SHRINKWRAP_PACKAGE>.""")
+
+	cmdp.add_argument('-o', '--overlay',
+		metavar='cfgfile', required=False, default=[],
+		action='append',
+		help="""Optional config file overlay to override run-time
+		     settings. Only entries within the "run" section are used.
+		     This is in addition to any overlay passed at build-time.
+		     Can be specified multiple times; left-most overlay is the
+		     first overlay applied.""")
+
+	cmdp.add_argument('-r', '--rtvar',
+		metavar='key=value', required=False, default=[],
+		action='append',
+		help="""Override value for a single runtime variable defined by
+		     the config. Specify option multiple times for multiple
+		     variables. Overrides for variables that have a default
+		     specified by the config are optional.""")
+
+	cmdp.add_argument('-n', '--dry-run',
+		required=False, default=False, action='store_true',
+		help="""If specified, none of the run commands will be
+		     executed. Instead the set of commands that would have been
+		     executed are output to stdout.""")
+
+	cmdp.add_argument('-c', '--no-color',
+		required=False, default=False, action='store_true',
+		help="""If specified, logs will not be colorized.""")
+
+	cmdp.add_argument('-t', '--timeout',
+		required=False, default=None, type=int,
+		help="""Number of days after which to automatically shutdown the
+		     container, if using a container runtime. Defaults to 1 day.
+		     """)
+
+	return cmd_name
+
+
+def dispatch(args):
+	"""
+	Part of the command interface expected by shrinkwrap.py. Called to
+	execute the subcommand, with the arguments the user passed on the
+	command line. The arguments comply with those requested in add_parser().
+	"""
+	overlays = []
+	for overlayname in args.overlay:
+		overlay = config.filename(overlayname)
+		overlay = config.load(overlay)
+		overlay = {'run': overlay['run']}
+		overlays.append(overlay)
+
+	filename = os.path.join(workspace.package, args.config)
+	resolveb = config.load(filename, overlays)
+	rtvars_dict = vars.parse(args.rtvar, type='rt')
+	resolver = config.resolver(resolveb, rtvars_dict)
+	cmds = _pretty_print_sh(resolver['run'])
+
+	# If dry run, just output the FVP command that we would have run. We
+	# don't include the netcat magic to access the fvp terminals.
+	if args.dry_run:
+		print(cmds)
+		return
+
+	# The FVP and any associated uart terminals are output to our terminal
+	# with a tag to indicate where each line originated. Figure out how big
+	# that tag field needs to be so that everything remains aligned.
+	max_name_field = 10
+	name_field = 0
+	terminals = resolver['run']['terminals']
+	terminals = dict(sorted(terminals.items()))
+	for t in terminals.values():
+		t['port'] = None
+		t['strip'] = False
+		if len(t['friendly']) > name_field:
+			name_field = min(len(t['friendly']), max_name_field)
+
+	log = logger.Logger(name_field)
+
+	def _strip_telnet_header(pm, proc, data, streamid):
+		"""
+		For any stdinout terminals (which use telnet), strip the first
+		few lines of output, which is output by telnet. This is
+		confusing for users since telnet is an implementation detail.
+		"""
+
+		match = "Escape character is '^]'."
+		pdata = proc.data
+
+		for line in logger.splitlines(data):
+			if len(pdata) >= 2 and terminals[pdata[1]]['strip']:
+				if line.find(match) >= 0:
+					terminals[pdata[1]]['strip'] = False
+					if all([not t['strip'] \
+						for t in terminals.values()]):
+						pm.set_handler(log.log)
+			else:
+				log.log(pm, proc, line, streamid)
+
+	def _colorize(global_no_color, terminal):
+		if global_no_color:
+			return False
+		elif 'no_color' in terminal:
+			return not terminal['no_color']
+		else:
+			return True
+
+	def _escape(terminal):
+		if 'no_escapes' in terminal:
+			return terminal['no_escapes']
+		else:
+			return False
+
+	def _logfile(terminal):
+		if terminal['type'] in ['stdinout', 'stdout']:
+			logfile = terminal.get('logfile')
+			return logfile if logfile else None
+		else:
+			return None
+
+	def _find_term_ports(pm, proc, data, streamid):
+		"""
+		Initial handler function called by ProcessManager. When the fvp
+		starts, we must parse the output to determine the port numbers
+		to connect to with netcat to access the fvp uart terminals. We
+		look for all the ports, start the netcat instances, add them to
+		the process manager and finally switch the handler to the
+		standard logger.
+		"""
+		# First, forward to the standard log handler.
+		log.log(pm, proc, data, streamid)
+
+		found_all_ports = True
+
+		# Iterate over the terminals dict from the config applying the
+		# supplied regexes to try to find the ports for all the
+		# terminals.
+		for t in terminals.values():
+			if t['port'] is None:
+				res = re.search(t['port_regex'], data)
+				if res:
+					t['port'] = res.group(1)
+				else:
+					found_all_ports = False
+
+		# Once all ports have been found, launch the netcat processes
+		# and change the handler so we never get called again.
+		if found_all_ports:
+			wait = False
+			strip = False
+			for k, t in terminals.items():
+				name = t['friendly']
+				type = t['type']
+				port = t["port"]
+				colorize = _colorize(args.no_color, t)
+				escape = _escape(t)
+
+				if type in ['stdout']:
+					cmd = f'nc localhost {port}'
+					pm.add(process.Process(cmd,
+						False,
+						(log.alloc_data(name, colorize, escape, _logfile(t)), k),
+						False))
+				if type in ['stdinout']:
+					cmd = f'telnet localhost {port}'
+					pm.add(process.Process(cmd,
+						True,
+						(log.alloc_data(name, colorize, escape, _logfile(t)), k),
+						False))
+					t['strip'] = True
+					strip = True
+				if type in ['xterm']:
+					# Nothing to do. The FVP will start this
+					# automatically.
+					pass
+				if type in ['telnet']:
+					wait = True
+					ip = runtime.get().ip_address()
+					print(f'To start {name} terminal, run:')
+					print(f'    telnet {ip} {port}')
+			if wait:
+				# Temporarily restore sys.stdin for input().
+				pm._stdin_deactivate()
+				print()
+				input("Press Enter to continue...")
+				pm._stdin_activate()
+
+			if strip:
+				pm.set_handler(_strip_telnet_header)
+			else:
+				pm.set_handler(log.log)
+
+	def _complete(pm, proc, retcode):
+		log.free_data(proc.data[0])
+
+		# If the FVP exits with non-zero exit code, we propagate that
+		# error so that shrinkwrap also exits with non-zero exit code.
+		if retcode not in [0, None] and proc.run_to_end:
+			raise Exception(f'FVP failed with {retcode}')
+
+	# Run under a runtime environment, which may just run commands natively
+	# on the host or may execute commands in a container, depending on what
+	# the user specified.
+	with runtime.Runtime(name=args.runtime, image=config.get_image([resolveb], args),
+		       		ssh_agent_keys=args.ssh_agent_keys,
+				timeout=args.timeout) as rt:
+		for rtvar in resolver['run']['rtvars'].values():
+			if rtvar['type'] == 'path':
+				rt.add_volume(rtvar['value'])
+		for t in terminals.values():
+			logfile = _logfile(t)
+			if logfile:
+				logdir = os.path.abspath(os.path.dirname(logfile))
+				os.makedirs(logdir, exist_ok=True)
+				rt.add_volume(logdir)
+		rt.add_volume(workspace.package)
+		rt.start()
+
+		# Write the script out to a file in a temp directory, and wrap
+		# the directory name and command to run in a Process. Add the
+		# Process to the ProcessManager. On completion, the caller must
+		# destroy the directory.
+		with tempfile.TemporaryDirectory(dir=workspace.package) as tmpdir:
+			tmpfilename = os.path.join(tmpdir, 'script.sh')
+			with open(tmpfilename, 'w') as tmpfile:
+				tmpfile.write(cmds)
+
+			# Create a process manager with 1 process; the fvp. As
+			# it boots _find_term_ports() will add the netcat
+			# processes in parallel. It will exit once all processes
+			# have terminated. The fvp will terminate when its told
+			# to `poweroff` and netcat will terminate when it sees
+			# the fvp has gone.
+			pm = process.ProcessManager(_find_term_ports, _complete)
+			pm.add(process.Process(f'bash {tmpfilename}',
+				False,
+				(log.alloc_data('fvp', not args.no_color),),
+				True))
+
+			rt_ip = runtime.get().ip_address()
+
+			print()
+			print("Press '^]' to quit shrinkwrap.")
+			print("All other keys are passed through.")
+			print(f"Environment ip address: {rt_ip}.")
+			print()
+
+			pm.run(forward_stdin=True)
+
+
+def _pretty_print_sh(run):
+	prerun = run['prerun']
+	run = run['run']
+
+	# This is a hack to improve the way the FVP arguments look. It tends to
+	# be huge so attempt to make it more readable by putting each option on
+	# a separate line and sorting alphabetically. Only likely to work for
+	# FVP so try to infer its definitely the FVP.
+	if len(run) == 1:
+		prog = run[0].split(' ')[0].lower()
+		if prog.find('isim') >= 0 or prog.find('fvp') >= 0:
+			parts = run[0].split(' -')
+			prog = parts[0]
+			args = sorted(parts[1:])
+			run = [' \\\n    -'.join([prog] + args)]
+
+	pre = config.script_preamble(False)
+	script = config.Script('run model', preamble=pre)
+
+	if len(prerun) > 0:
+		script.append('# Execute prerun commands.')
+		script.append('\n'.join(prerun))
+		script.append()
+
+	script.append('# Run the model.')
+	script.append('\n'.join(run))
+
+	return script.commands()

shrinkwrap/config/FVP_Base_RevC-2xAEMvA-base.yaml

@@ -0,0 +1,98 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+description: >-
+  Arm Architecture Envelope Model FVP configured with 8 CPUs across 2 clusters
+  (2x4) and 4GB DRAM. By default doesn't explicitly enable any architecture
+  features. Apply the architecture overlays at arch/v*.*.yaml to configure the
+  FVP for a sepcific architecture revision.
+
+run:
+  name: FVP_Base_RevC-2xAEMvA
+
+  rtvars:
+    LOCAL_NET_PORT:
+      type: string
+      value: 8022
+
+  params:
+    # Basic dimensions for RAM and CPU.
+    -C bp.dram_size: 4
+    -C cluster0.NUM_CORES: 4
+    -C cluster1.NUM_CORES: 4
+    -C cluster0.PA_SIZE: 48
+    -C cluster1.PA_SIZE: 48
+
+    # Misc FVP controls.
+    --stat: null
+    -C bp.vis.disable_visualisation: 1
+    -C bp.refcounter.non_arch_start_at_default: 1                     # Firmware is expected to enable the timer at boot time. However, turning this parameter on is a model-specific way of enabling the counter module out of reset.
+    -C bp.secure_memory: 1                                            # enable security checking by TZC-400
+    -C bp.ve_sysregs.exit_on_shutdown: 1                              # SYS_CFG_SHUTDOWN exits simulation
+    -C pctl.startup: 0.0.0.0                                          # Comma-separated list of cores (wildcards allowed) to be powered up at startup or system reset
+    -C cluster0.clear_reg_top_eret: 2                                 # Behaviour of the upper 32-bits of the Xn registers when changing between AArch32 state and AArch64 state.  2: upper 32-bits set to 0 for a random selection of accessible registers.
+    -C cluster1.clear_reg_top_eret: 2
+
+    # Networking. By default use user-space networking, mapping port 22 in the
+    # FVP to a user-specified port on the host (see rtvar:LOCAL_NET_PORT). This
+    # enables ssh.
+    -C bp.smsc_91c111.enabled: 1
+    -C bp.hostbridge.userNetworking: 1
+    -C bp.hostbridge.userNetPorts: ${rtvar:LOCAL_NET_PORT}=22
+
+    # FVP Performance tweaks.
+    -C cache_state_modelled: 0                                        # Disable d-cache and i-cache state for all components
+    -C cluster0.stage12_tlb_size: 1024                                # Increase TLB size from default of 128
+    -C cluster1.stage12_tlb_size: 1024
+    -C cluster0.check_memory_attributes: 0                            # Disable checking that SW-set memory attributes conform to architecturally required constraints
+    -C cluster1.check_memory_attributes: 0
+
+    # GIC config options.
+    -C cluster0.gicv3.cpuintf-mmap-access-level: 2                    # Allowed values are: 0-mmap access is supported for GICC,GICH,GICV registers. 1-mmap access is supported only for GICV registers. 2-mmap access is not supported.
+    -C cluster1.gicv3.cpuintf-mmap-access-level: 2
+    -C cluster0.gicv3.without-DS-support: 1                           # GICv3 CPU interfaces do not support disabling security in the distributor
+    -C cluster1.gicv3.without-DS-support: 1
+    -C cluster0.gicv4.mask-virtual-interrupt: 1                       # If true, virtual interrupts can be masked from being reported to virtual CPU interface by setting ICH_HCR_EL2.DVIM 1. No control otherwise.
+    -C cluster1.gicv4.mask-virtual-interrupt: 1
+
+    # These SMMU registers are configuring the arch model with a personality. Features to implement/expose. The model defaults plus a few useful features.
+    # SMMUv3.2
+    -C pci.pci_smmuv3.mmu.SMMU_AIDR: 2
+    # Enable ASID16, for sharing process address spaces with devices
+    -C pci.pci_smmuv3.mmu.SMMU_IDR0: 0x080FF6BF
+    -C pci.pci_smmuv3.mmu.SMMU_IDR1: 0x0CE73D20
+    # Enable FWB, Small TT, Range invalidation, and BBM level 2.
+    -C pci.pci_smmuv3.mmu.SMMU_IDR3: 0x1714
+    # Enable 16kB pages, VAX. Bit[3] is res0.
+    -C pci.pci_smmuv3.mmu.SMMU_IDR5: 0xFFFF0475
+    # Enable secure side, SEL2, 2-bit SID
+    -C pci.pci_smmuv3.mmu.SMMU_S_IDR1: 0xA0000002
+    -C pci.pci_smmuv3.mmu.SMMU_S_IDR2: 0
+    -C pci.pci_smmuv3.mmu.SMMU_S_IDR3: 0
+
+    # Enable virtio-rng. If Linux/DT is correctly configured, it can use this to
+    # speed up RNG init.
+    -C bp.virtio_rng.enabled: 1
+
+  terminals:
+    bp.terminal_0:
+      friendly: term0
+      port_regex: 'terminal_0: Listening for serial connection on port (\d+)'
+      type: stdout
+
+    bp.terminal_1:
+      friendly: term1
+      port_regex: 'terminal_1: Listening for serial connection on port (\d+)'
+      type: stdout
+
+    bp.terminal_2:
+      friendly: term2
+      port_regex: 'terminal_2: Listening for serial connection on port (\d+)'
+      type: stdout
+
+    bp.terminal_3:
+      friendly: term3
+      port_regex: 'terminal_3: Listening for serial connection on port (\d+)'
+      type: stdout

shrinkwrap/config/FVP_Base_RevC-2xAEMvA-rme.yaml

@@ -0,0 +1,42 @@
+# Copyright (c) 2024, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+
+layers:
+  - FVP_Base_RevC-2xAEMvA-base.yaml
+  - arch/v9.2.yaml
+
+run:
+  params:
+    -C cluster0.rme_support_level: 2
+    -C cluster1.rme_support_level: 2
+    -C bp.secure_memory: 0                                         # Disable security checking by TZC-400
+    -C bp.has_rme: 1                                               # Enable Realm Management Extension(RME) support
+                                                                   # Only Root access to Trusted ROM and SRAM.
+                                                                   # SECURE/ROOT access only for below peripherals:
+                                                                   # -Trusted DRAM
+                                                                   # -REFCLK CNTControl (Generic Timer)
+                                                                   # -Trusted Watchdog SP805, Trustzone address space controller
+                                                                   # -AP_REFCLK CNTBase0 (Generic Timer)
+                                                                   # -Trusted RNG, Non-Volatile Counter and Root-Key Storage
+                                                                   # -Flash0, Flash1
+                                                                   # -uart0, uart1, uart2, uart3
+
+    # Suppress "WARNING: MPAM_NS is deprecated when RME is in use. Should use MPAM_SP"
+    -C cluster0.output_attributes: ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP
+    -C cluster1.output_attributes: ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP
+
+    # CCA-specific SMMU settings.
+    -C pci.pci_smmuv3.mmu.SMMU_ROOT_IDR0: 3
+    -C pci.pci_smmuv3.mmu.SMMU_ROOT_IIDR: 0x43B
+    -C pci.pci_smmuv3.mmu.root_register_page_offset: 0x20000
+
+    # Enable FEAT_CSV2_2, which is optional. But TFA 2.10 force-enables it when
+    # ENABLE_RME=1 so if it's not there we see an exception.
+    -C cluster0.restriction_on_speculative_execution: 2
+    -C cluster1.restriction_on_speculative_execution: 2
+    -C cluster0.restriction_on_speculative_execution_aarch32: 2
+    -C cluster1.restriction_on_speculative_execution_aarch32: 2
+

shrinkwrap/config/arch/v8.0.yaml

@@ -0,0 +1,22 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+description: >-
+  Implements all mandatory requirements and features as well as a sensible
+  selection of optional ones for the Armv8.0 architecture extension within the
+  Base_RevC-2xAEMvA FVP. Intended for use as an overlay to
+  FVP_Base_RevC-2xAEMvA-base.yaml.
+
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 8
+      ARM_ARCH_MINOR: 0
+      BRANCH_PROTECTION: 0
+
+run:
+  params:
+    -C cluster0.has_16k_granule: 1                                    # Implement the 16k LPAE translation granule.
+    -C cluster1.has_16k_granule: 1

shrinkwrap/config/arch/v8.1.yaml

@@ -0,0 +1,26 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+description: >-
+  Implements all mandatory requirements and features as well as a sensible
+  selection of optional ones for the Armv8.1 architecture extension within the
+  Base_RevC-2xAEMvA FVP. Intended for use as an overlay to
+  FVP_Base_RevC-2xAEMvA-base.yaml.
+
+layers:
+  - arch/v8.0.yaml
+
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 8
+      ARM_ARCH_MINOR: 1
+
+run:
+  params:
+    -C cluster0.has_arm_v8-1: 1
+    -C cluster1.has_arm_v8-1: 1
+    -C cluster0.has_large_system_ext: 1                               # Implement the ARMv8 Large System Extensions (FEAT_LSE).
+    -C cluster1.has_large_system_ext: 1

shrinkwrap/config/arch/v8.2.yaml

@@ -0,0 +1,28 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+description: >-
+  Implements all mandatory requirements and features as well as a sensible
+  selection of optional ones for the Armv8.2 architecture extension within the
+  Base_RevC-2xAEMvA FVP. Intended for use as an overlay to
+  FVP_Base_RevC-2xAEMvA-base.yaml.
+
+layers:
+  - arch/v8.1.yaml
+
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 8
+      ARM_ARCH_MINOR: 2
+
+run:
+  params:
+    -C cluster0.has_arm_v8-2: 1
+    -C cluster1.has_arm_v8-2: 1
+    -C cluster0.has_large_va: 1                                       # Implement support for the extended 52-bit virtual addresses from ARMv8.2 (FEAT_LVA). 2:feature is implemented.
+    -C cluster1.has_large_va: 1
+    -C cluster0.has_sve: 1                                            # Whether SVE is implemented (FEAT_SVE).
+    -C cluster1.has_sve: 1

shrinkwrap/config/arch/v8.3.yaml

@@ -0,0 +1,25 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+description: >-
+  Implements all mandatory requirements and features as well as a sensible
+  selection of optional ones for the Armv8.3 architecture extension within the
+  Base_RevC-2xAEMvA FVP. Intended for use as an overlay to
+  FVP_Base_RevC-2xAEMvA-base.yaml.
+
+layers:
+  - arch/v8.2.yaml
+
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 8
+      ARM_ARCH_MINOR: 3
+      BRANCH_PROTECTION: 2
+
+run:
+  params:
+    -C cluster0.has_arm_v8-3: 1
+    -C cluster1.has_arm_v8-3: 1

shrinkwrap/config/arch/v8.4.yaml

@@ -0,0 +1,26 @@
+# Copyright (c) 2022, Arm Limited.
+# SPDX-License-Identifier: MIT
+
+%YAML 1.2
+---
+description: >-
+  Implements all mandatory requirements and features as well as a sensible
+  selection of optional ones for the Armv8.4 architecture extension within the
+  Base_RevC-2xAEMvA FVP. Intended for use as an overlay to
+  FVP_Base_RevC-2xAEMvA-base.yaml.
+
+layers:
+  - arch/v8.3.yaml
+
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 8
+      ARM_ARCH_MINOR: 4
+
+run:
+  params:
+    -C cluster0.has_arm_v8-4: 1
+    -C cluster1.has_arm_v8-4: 1
+    -C cluster0.has_amu: 1                                            # Implement activity monitor functionality from ARMv8.4 (FEAT_AMUv1). 1:feature is implemented if ARMv8.4 is enabled.
+    -C cluster1.has_amu: 1