On 06/13/2018 02:56 AM, Alex Bennée wrote:
> @@ -147,12 +179,12 @@ void reginfo_init(struct reginfo *ri, ucontext_t *uc)
> }
>
> /* Finally the FFR */
> - memcpy(&ri->sve.ffr,(void *)sve + SVE_SIG_FFR_OFFSET(vq),
> + memcpy(&ri->sve.ffr, (void *)sve + SVE_SIG_FFR_OFFSET(vq),
> SVE_SIG_FFR_SIZE(vq));
>
> return;
> }
> -#endif
> +#endif /* SVE_MAGIC */
It appears that most of the rest of this patch should be folded back earlier in
the patch set.
r~
>
> for (i = 0; i < 32; i++) {
> ri->simd.vregs[i] = fp->vregs[i];
> @@ -166,32 +198,49 @@ int reginfo_is_eq(struct reginfo *r1, struct reginfo
> *r2)
> }
>
> #ifdef SVE_MAGIC
> -static int sve_zreg_is_eq(struct reginfo *r1, struct reginfo *r2, int z)
> +static int sve_zreg_is_eq(int vq, const void *z1, const void *z2)
> {
> - return memcmp(r1->sve.zregs[z], r2->sve.zregs[z],
> sizeof(*r1->sve.zregs[z])) == 0;
> + return memcmp(z1, z2, vq * 16) == 0;
> }
>
> -static int sve_preg_is_eq(uint16_t const (*p1)[SVE_VQ_MAX],
> - uint16_t const (*p2)[SVE_VQ_MAX])
> +static int sve_preg_is_eq(int vq, const void *p1, const void *p2)
> {
> - return memcmp(p1, p2, sizeof *p1) == 0;
> + return memcmp(p1, p2, vq * 2) == 0;
> }
>
> -static void sve_dump_preg_diff(FILE *f, int vq,
> - uint16_t const (*p1)[SVE_VQ_MAX],
> - uint16_t const (*p2)[SVE_VQ_MAX])
> +static void sve_dump_preg(FILE *f, int vq, const uint16_t *p)
> {
> int q;
> -
> - for (q = 0; q < vq; q++) {
> - fprintf(f, "%#04x", *p1[q]);
> + for (q = vq - 1; q >= 0; q--) {
> + fprintf(f, "%04x", p[q]);
> }
> +}
> +
> +static void sve_dump_preg_diff(FILE *f, int vq, const uint16_t *p1,
> + const uint16_t *p2)
> +{
> + sve_dump_preg(f, vq, p1);
> fprintf(f, " vs ");
> - for (q = 0; q < vq; q++) {
> - fprintf(f, "%#04x", *p2[q]);
> - }
> + sve_dump_preg(f, vq, p2);
> fprintf(f, "\n");
> }
> +
> +static void sve_dump_zreg_diff(FILE *f, int vq, const __uint128_t *z1,
> + const __uint128_t *z2)
> +{
> + const char *pad = "";
> + int q;
> +
> + for (q = 0; q < vq; ++q) {
> + if (z1[q] != z2[q]) {
> + fprintf(f, "%sq%02d: %016" PRIx64 "%016" PRIx64
> + " vs %016" PRIx64 "%016" PRIx64"\n", pad, q,
> + (uint64_t)(z1[q] >> 64), (uint64_t)z1[q],
> + (uint64_t)(z2[q] >> 64), (uint64_t)z2[q]);
> + pad = " ";
> + }
> + }
> +}
> #endif
>
> /* reginfo_dump: print state to a stream, returns nonzero on success */
> @@ -210,6 +259,36 @@ int reginfo_dump(struct reginfo *ri, FILE * f)
> fprintf(f, " fpsr : %08x\n", ri->fpsr);
> fprintf(f, " fpcr : %08x\n", ri->fpcr);
>
> +#ifdef SVE_MAGIC
> + if (test_sve) {
> + int q, vq = test_sve;
> +
> + fprintf(f, " vl : %d\n", ri->sve.vl);
> +
> + for (i = 0; i < 32; i++) {
> + fprintf(f, " Z%-2d q%-2d: %016" PRIx64 "%016" PRIx64 "\n", i, 0,
> + (uint64_t)(ri->sve.zregs[i][0] >> 64),
> + (uint64_t)ri->sve.zregs[i][0]);
> + for (q = 1; q < vq; ++q) {
> + fprintf(f, " q%-2d: %016" PRIx64 "%016" PRIx64 "\n", q,
> + (uint64_t)(ri->sve.zregs[i][q] >> 64),
> + (uint64_t)ri->sve.zregs[i][q]);
> + }
> + }
> +
> + for (i = 0; i < 16; i++) {
> + fprintf(f, " P%-2d : ", i);
> + sve_dump_preg(f, vq, &ri->sve.pregs[i][0]);
> + fprintf(f, "\n");
> + }
> + fprintf(f, " FFR : ");
> + sve_dump_preg(f, vq, &ri->sve.ffr[0]);
> + fprintf(f, "\n");
> +
> + return !ferror(f);
> + }
> +#endif
> +
> for (i = 0; i < 32; i++) {
> fprintf(f, " V%-2d : %016" PRIx64 "%016" PRIx64 "\n", i,
> (uint64_t) (ri->simd.vregs[i] >> 64),
> @@ -259,42 +338,29 @@ int reginfo_dump_mismatch(struct reginfo *m, struct
> reginfo *a, FILE * f)
>
> #ifdef SVE_MAGIC
> if (test_sve) {
> - struct sve_reginfo *ms = &m->sve;
> - struct sve_reginfo *as = &a->sve;
> + int vq = sve_vq_from_vl(m->sve.vl);
>
> - if (ms->vl != as->vl) {
> - fprintf(f, " SVE VL : %d vs %d\n", ms->vl, as->vl);
> + if (m->sve.vl != a->sve.vl) {
> + fprintf(f, " vl : %d vs %d\n", m->sve.vl, a->sve.vl);
> }
>
> - if (!sve_preg_is_eq(&ms->ffr, &as->ffr)) {
> - fprintf(f, " FFR : ");
> - sve_dump_preg_diff(f, sve_vq_from_vl(ms->vl),
> - &ms->pregs[i], &as->pregs[i]);
> + for (i = 0; i < SVE_NUM_ZREGS; i++) {
> + if (!sve_zreg_is_eq(vq, &m->sve.zregs[i], &a->sve.zregs[i])) {
> + fprintf(f, " Z%-2d : ", i);
> + sve_dump_zreg_diff(f, vq, &m->sve.zregs[i][0],
> + &a->sve.zregs[i][0]);
> + }
> }
> for (i = 0; i < SVE_NUM_PREGS; i++) {
> - if (!sve_preg_is_eq(&ms->pregs[i], &as->pregs[i])) {
> - fprintf(f, " P%2d : ", i);
> - sve_dump_preg_diff(f, sve_vq_from_vl(ms->vl),
> - &ms->pregs[i], &as->pregs[i]);
> - }
> + if (!sve_preg_is_eq(vq, &m->sve.pregs[i], &a->sve.pregs[i])) {
> + fprintf(f, " P%-2d : ", i);
> + sve_dump_preg_diff(f, vq, &m->sve.pregs[i][0],
> + &a->sve.pregs[i][0]);
> + }
> }
> - for (i = 0; i < SVE_NUM_ZREGS; i++) {
> - if (!sve_zreg_is_eq(m, a, i)) {
> - int q;
> - char *pad="";
> - fprintf(f, " Z%2d : ", i);
> - for (q = 0; q < sve_vq_from_vl(ms->vl); q++) {
> - if (ms->zregs[i][q] != as->zregs[i][q]) {
> - fprintf(f, "%sq%02d: %016" PRIx64 "%016" PRIx64
> - " vs %016" PRIx64 "%016" PRIx64"\n", pad, q,
> - (uint64_t) (ms->zregs[i][q] >> 64),
> - (uint64_t) ms->zregs[i][q],
> - (uint64_t) (as->zregs[i][q] >> 64),
> - (uint64_t) as->zregs[i][q]);
> - pad = " ";
> - }
> - }
> - }
> + if (!sve_preg_is_eq(vq, &m->sve.ffr, &a->sve.ffr)) {
> + fprintf(f, " FFR : ");
> + sve_dump_preg_diff(f, vq, &m->sve.pregs[i][0],
> &a->sve.pregs[i][0]);
> }
>
> return !ferror(f);
>
