Commit c984c4e8 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

Merge tag 's390x-tcg-2019-06-07' into s390-next-staging 



Finalize implementation of the "Vector Facility" for s390x TCG. Add it
to the QEMU CPU model, so it is enabled as default.
Also:
- One fix (and one workaround) for the STFLE instruction
- Fix the alignment of vector registers (and change the data type)
- Properly generate ELF_HWCAP for s390x for linux-user
- Use a gvec helper for VECTOR SELECT

# gpg: Signature made Fri 07 Jun 2019 02:58:01 PM CEST
# gpg:                using RSA key 1BD9CAAD735C4C3A460DFCCA4DDE10F700FF835A
# gpg:                issuer "david@redhat.com"
# gpg: Good signature from "David Hildenbrand <david@redhat.com>" [full]
# gpg:                 aka "David Hildenbrand <davidhildenbrand@gmail.com>" [full]

* tag 's390x-tcg-2019-06-07': (33 commits)
  linux-user: elf: ELF_HWCAP for s390x
  s390x/tcg: Use tcg_gen_gvec_bitsel for VECTOR SELECT
  s390x: Bump the "qemu" CPU model up to a stripped-down z13
  s390x/tcg: We support the Vector Facility
  s390x/tcg: Allow linux-user to use vector instructions
  s390x/tcg: Implement VECTOR FP TEST DATA CLASS IMMEDIATE
  s390x/tcg: Implement VECTOR FP SUBTRACT
  s390x/tcg: Implement VECTOR FP SQUARE ROOT
  s390x/tcg: Implement VECTOR FP PERFORM SIGN OPERATION
  s390x/tcg: Implement VECTOR FP MULTIPLY AND (ADD|SUBTRACT)
  s390x/tcg: Implement VECTOR FP MULTIPLY
  s390x/tcg: Implement VECTOR LOAD ROUNDED
  s390x/tcg: Implement VECTOR LOAD LENGTHENED
  s390x/tcg: Implement VECTOR LOAD FP INTEGER
  s390x/tcg: Implement VECTOR FP DIVIDE
  s390x/tcg: Implement VECTOR FP CONVERT TO LOGICAL 64-BIT
  s390x/tcg: Implement VECTOR FP CONVERT TO FIXED 64-BIT
  s390x/tcg: Implement VECTOR FP CONVERT FROM LOGICAL 64-BIT
  s390x/tcg: Implement VECTOR FP CONVERT FROM FIXED 64-BIT
  s390x/tcg: Implement VECTOR FP COMPARE (EQUAL|HIGH|HIGH OR EQUAL)
  ...

Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parents a1c993c3 6d88baf1

hw/s390x/s390-virtio-ccw.c

+2 −0
Original line number Diff line number Diff line
@@ -669,7 +669,9 @@ DEFINE_CCW_MACHINE(4_1, "4.1", true); 


static void ccw_machine_4_0_instance_options(MachineState *machine)

{

    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V4_0 };

    ccw_machine_4_1_instance_options(machine);

    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);

}



static void ccw_machine_4_0_class_options(MachineClass *mc)

include/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -598,6 +598,7 @@ typedef struct { 
#define HWCAP_S390_ETF3EH       256

#define HWCAP_S390_HIGH_GPRS    512

#define HWCAP_S390_TE           1024

#define HWCAP_S390_VXRS         2048



/* M68K specific definitions. */

/* We use the top 24 bits to encode information about the

linux-user/elfload.c

+28 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,34 @@ static inline void init_thread(struct target_pt_regs *regs, 
#define ELF_DATA	ELFDATA2MSB

#define ELF_ARCH	EM_S390



#include "elf.h"



#define ELF_HWCAP get_elf_hwcap()



#define GET_FEATURE(_feat, _hwcap) \

    do { if (s390_has_feat(_feat)) { hwcap |= _hwcap; } } while (0)



static uint32_t get_elf_hwcap(void)

{

    /*

     * Let's assume we always have esan3 and zarch.

     * 31-bit processes can use 64-bit registers (high gprs).

     */

    uint32_t hwcap = HWCAP_S390_ESAN3 | HWCAP_S390_ZARCH | HWCAP_S390_HIGH_GPRS;



    GET_FEATURE(S390_FEAT_STFLE, HWCAP_S390_STFLE);

    GET_FEATURE(S390_FEAT_MSA, HWCAP_S390_MSA);

    GET_FEATURE(S390_FEAT_LONG_DISPLACEMENT, HWCAP_S390_LDISP);

    GET_FEATURE(S390_FEAT_EXTENDED_IMMEDIATE, HWCAP_S390_EIMM);

    if (s390_has_feat(S390_FEAT_EXTENDED_TRANSLATION_3) &&

        s390_has_feat(S390_FEAT_ETF3_ENH)) {

        hwcap |= HWCAP_S390_ETF3EH;

    }

    GET_FEATURE(S390_FEAT_VECTOR, HWCAP_S390_VXRS);



    return hwcap;

}



static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop)

{

    regs->psw.addr = infop->entry;

linux-user/s390x/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void save_sigregs(CPUS390XState *env, target_sigregs *sregs) 
     */

    //save_fp_regs(&current->thread.fp_regs); FIXME

    for (i = 0; i < 16; i++) {

        __put_user(get_freg(env, i)->ll, &sregs->fpregs.fprs[i]);

        __put_user(*get_freg(env, i), &sregs->fpregs.fprs[i]);

    }

}
@@ -254,7 +254,7 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc) 
        __get_user(env->aregs[i], &sc->regs.acrs[i]);

    }

    for (i = 0; i < 16; i++) {

        __get_user(get_freg(env, i)->ll, &sc->fpregs.fprs[i]);

        __get_user(*get_freg(env, i), &sc->fpregs.fprs[i]);

    }



    return err;

target/s390x/Makefile.objs

+2 −1
Original line number Diff line number Diff line 
obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o

obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o

obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o

obj-$(CONFIG_TCG) += vec_helper.o vec_int_helper.o

obj-$(CONFIG_TCG) += vec_helper.o vec_int_helper.o vec_string_helper.o

obj-$(CONFIG_TCG) += vec_fpu_helper.o

obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o

obj-$(CONFIG_SOFTMMU) += sigp.o

obj-$(CONFIG_KVM) += kvm.o