PR https://github.com/llvm/llvm-project/pull/196969 was approved and merged but with `spr` the wrong base branch was set. This merges the approved changes into `main` --------- Co-authored-by: Paul Walker <paul.walker@arm.com> Co-authored-by: Arseniy Obolenskiy <arseniy.obolenskiy@amd.com>