Re: [Qemu-devel] [PATCH v4 1/5] linux-user: Implement aarch64 PR_SVE_SET/GET_VL
Richard Hendersonwrites: > As an implementation choice, widening VL has zeroed the > previously inaccessible portion of the sve registers. > > Reviewed-by: Peter Maydell > Signed-off-by: Richard Henderson > --- > linux-user/aarch64/target_syscall.h | 3 +++ > target/arm/cpu.h| 1 + > linux-user/syscall.c| 27 > target/arm/cpu64.c | 41 > + > 4 files changed, 72 insertions(+) > > diff --git a/linux-user/aarch64/target_syscall.h > b/linux-user/aarch64/target_syscall.h > index 604ab99b14..205265e619 100644 > --- a/linux-user/aarch64/target_syscall.h > +++ b/linux-user/aarch64/target_syscall.h > @@ -19,4 +19,7 @@ struct target_pt_regs { > #define TARGET_MLOCKALL_MCL_CURRENT 1 > #define TARGET_MLOCKALL_MCL_FUTURE 2 > > +#define TARGET_PR_SVE_SET_VL 50 > +#define TARGET_PR_SVE_GET_VL 51 For some reason I thought we might get this from our copy of linux-headers but it seems we only do that for KVM bits. > + > #endif /* AARCH64_TARGET_SYSCALL_H */ > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 8dd6b788df..5f4566f017 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -861,6 +861,7 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, > CPUState *cs, > #ifdef TARGET_AARCH64 > int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); > int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); > +void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq); > #endif > > target_ulong do_arm_semihosting(CPUARMState *env); > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index e24f43c4a2..38f40e2692 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -10670,6 +10670,33 @@ abi_long do_syscall(void *cpu_env, int num, abi_long > arg1, > break; > } > #endif > +#ifdef TARGET_AARCH64 > +case TARGET_PR_SVE_SET_VL: > +/* We cannot support either PR_SVE_SET_VL_ONEXEC > + or PR_SVE_VL_INHERIT. Therefore, anything above > + ARM_MAX_VQ results in EINVAL. */ > +ret = -TARGET_EINVAL; > +if (arm_feature(cpu_env, ARM_FEATURE_SVE) > +&& arg2 >= 0 && arg2 <= ARM_MAX_VQ * 16 && !(arg2 & 15)) { > +CPUARMState *env = cpu_env; The kernel code splits the arg2 up into VL and flags. We don't seem to be doing that here. vl = arg & PR_SVE_VL_LEN_MASK; flags = arg & ~vl; I'm not sure what && !(arg2 & 15) is doing but PR_SVE_VL_LEN_MASK is 0x, Perhaps some defines would be useful to make it clearer. > +int old_vq = (env->vfp.zcr_el[1] & 0xf) + 1; > +int vq = MAX(arg2 / 16, 1); > + > +if (vq < old_vq) { > +aarch64_sve_narrow_vq(env, vq); > +} > +env->vfp.zcr_el[1] = vq - 1; It seems odd not to have setting this inside cpu64.c. Won't a similar manipulation need to be made for system mode? I'd keep all the logic together in aarch64_sve_narrow_vq (or maybe call it aarch64_sve_set_vq and pass it the current exception level). > +ret = vq * 16; > +} > +break; > +case TARGET_PR_SVE_GET_VL: > +ret = -TARGET_EINVAL; > +if (arm_feature(cpu_env, ARM_FEATURE_SVE)) { > +CPUARMState *env = cpu_env; > +ret = ((env->vfp.zcr_el[1] & 0xf) + 1) * 16; > +} > +break; > +#endif /* AARCH64 */ > case PR_GET_SECCOMP: > case PR_SET_SECCOMP: > /* Disable seccomp to prevent the target disabling syscalls we > diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c > index 4228713b19..74b485b382 100644 > --- a/target/arm/cpu64.c > +++ b/target/arm/cpu64.c > @@ -366,3 +366,44 @@ static void aarch64_cpu_register_types(void) > } > > type_init(aarch64_cpu_register_types) > + > +/* The manual says that when SVE is enabled and VQ is widened the > + * implementation is allowed to zero the previously inaccessible > + * portion of the registers. The corollary to that is that when > + * SVE is enabled and VQ is narrowed we are also allowed to zero > + * the now inaccessible portion of the registers. > + * > + * The intent of this is that no predicate bit beyond VQ is ever set. > + * Which means that some operations on predicate registers themselves > + * may operate on full uint64_t or even unrolled across the maximum > + * uint64_t[4]. Performing 4 bits of host arithmetic unconditionally > + * may well be cheaper than conditionals to restrict the operation > + * to the relevant portion of a uint16_t[16]. > + * > + * TODO: Need to call this for changes to the real system registers > + * and EL state changes. > + */ > +void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq) >
[Qemu-devel] [PATCH v4 1/5] linux-user: Implement aarch64 PR_SVE_SET/GET_VL
As an implementation choice, widening VL has zeroed the previously inaccessible portion of the sve registers. Reviewed-by: Peter MaydellSigned-off-by: Richard Henderson --- linux-user/aarch64/target_syscall.h | 3 +++ target/arm/cpu.h| 1 + linux-user/syscall.c| 27 target/arm/cpu64.c | 41 + 4 files changed, 72 insertions(+) diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h index 604ab99b14..205265e619 100644 --- a/linux-user/aarch64/target_syscall.h +++ b/linux-user/aarch64/target_syscall.h @@ -19,4 +19,7 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 +#define TARGET_PR_SVE_SET_VL 50 +#define TARGET_PR_SVE_GET_VL 51 + #endif /* AARCH64_TARGET_SYSCALL_H */ diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 8dd6b788df..5f4566f017 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -861,6 +861,7 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, #ifdef TARGET_AARCH64 int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); +void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq); #endif target_ulong do_arm_semihosting(CPUARMState *env); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e24f43c4a2..38f40e2692 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -10670,6 +10670,33 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; } #endif +#ifdef TARGET_AARCH64 +case TARGET_PR_SVE_SET_VL: +/* We cannot support either PR_SVE_SET_VL_ONEXEC + or PR_SVE_VL_INHERIT. Therefore, anything above + ARM_MAX_VQ results in EINVAL. */ +ret = -TARGET_EINVAL; +if (arm_feature(cpu_env, ARM_FEATURE_SVE) +&& arg2 >= 0 && arg2 <= ARM_MAX_VQ * 16 && !(arg2 & 15)) { +CPUARMState *env = cpu_env; +int old_vq = (env->vfp.zcr_el[1] & 0xf) + 1; +int vq = MAX(arg2 / 16, 1); + +if (vq < old_vq) { +aarch64_sve_narrow_vq(env, vq); +} +env->vfp.zcr_el[1] = vq - 1; +ret = vq * 16; +} +break; +case TARGET_PR_SVE_GET_VL: +ret = -TARGET_EINVAL; +if (arm_feature(cpu_env, ARM_FEATURE_SVE)) { +CPUARMState *env = cpu_env; +ret = ((env->vfp.zcr_el[1] & 0xf) + 1) * 16; +} +break; +#endif /* AARCH64 */ case PR_GET_SECCOMP: case PR_SET_SECCOMP: /* Disable seccomp to prevent the target disabling syscalls we diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 4228713b19..74b485b382 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -366,3 +366,44 @@ static void aarch64_cpu_register_types(void) } type_init(aarch64_cpu_register_types) + +/* The manual says that when SVE is enabled and VQ is widened the + * implementation is allowed to zero the previously inaccessible + * portion of the registers. The corollary to that is that when + * SVE is enabled and VQ is narrowed we are also allowed to zero + * the now inaccessible portion of the registers. + * + * The intent of this is that no predicate bit beyond VQ is ever set. + * Which means that some operations on predicate registers themselves + * may operate on full uint64_t or even unrolled across the maximum + * uint64_t[4]. Performing 4 bits of host arithmetic unconditionally + * may well be cheaper than conditionals to restrict the operation + * to the relevant portion of a uint16_t[16]. + * + * TODO: Need to call this for changes to the real system registers + * and EL state changes. + */ +void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq) +{ +int i, j; +uint64_t pmask; + +assert(vq >= 1 && vq <= ARM_MAX_VQ); + +/* Zap the high bits of the zregs. */ +for (i = 0; i < 32; i++) { +memset(>vfp.zregs[i].d[2 * vq], 0, 16 * (ARM_MAX_VQ - vq)); +} + +/* Zap the high bits of the pregs and ffr. */ +pmask = 0; +if (vq & 3) { +pmask = ~(-1ULL << (16 * (vq & 3))); +} +for (j = vq / 4; j < ARM_MAX_VQ / 4; j++) { +for (i = 0; i < 17; ++i) { +env->vfp.pregs[i].p[j] &= pmask; +} +pmask = 0; +} +} -- 2.14.3