From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJBot-0002Hv-R7 for qemu-devel@nongnu.org; Mon, 09 Sep 2013 20:28:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJBol-0005lq-8A for qemu-devel@nongnu.org; Mon, 09 Sep 2013 20:28:39 -0400 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]:56274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJBok-0005li-TT for qemu-devel@nongnu.org; Mon, 09 Sep 2013 20:28:31 -0400 Received: by mail-pa0-f51.google.com with SMTP id lf1so6933683pab.24 for ; Mon, 09 Sep 2013 17:28:30 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 9 Sep 2013 17:28:17 -0700 Message-Id: <1378772902-4074-3-git-send-email-rth@twiddle.net> In-Reply-To: <1378772902-4074-1-git-send-email-rth@twiddle.net> References: <1378772902-4074-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v2 2/7] tcg-ppc: use new return-argument ld/st helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, "Vassili Karpov (malc)" , aurelien@aurel32.net, Richard Henderson From: Paolo Bonzini These use a 32-bit load-of-immediate to save a mflr+addi+mtlr sequence. Tested with a Windows 98 guest (pretty much the most recent thing I could run on my PPC machine) and kvm-unit-tests's sieve.flat. The speed up for sieve.flat is as high as 10% for qemu-system-i386, 25% (no kidding) for qemu-system-x86_64 on my PowerBook G4. Signed-off-by: Paolo Bonzini --- include/exec/exec-all.h | 4 +--- tcg/ppc/tcg-target.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index beb4149..a81e805 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -324,9 +324,7 @@ extern uintptr_t tci_tb_ptr; In some implementations, we pass the "logical" return address manually; in others, we must infer the logical return from the true return. */ #if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU) -# if defined (_ARCH_PPC) && !defined (_ARCH_PPC64) -# define GETRA_LDST(RA) (*(int32_t *)((RA) - 4)) -# elif defined(__arm__) +# if defined(__arm__) /* We define two insns between the return address and the branch back to straight-line. Find and decode that branch insn. */ # define GETRA_LDST(RA) tcg_getra_ldst(RA) diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 204ffbe..24a8621 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -550,22 +550,24 @@ static void add_qemu_ldst_label (TCGContext *s, label->label_ptr[0] = label_ptr; } -/* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, - int mmu_idx) */ +/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, + * int mmu_idx, uintptr_t ra) + */ static const void * const qemu_ld_helpers[4] = { - helper_ldb_mmu, - helper_ldw_mmu, - helper_ldl_mmu, - helper_ldq_mmu, + helper_ret_ldub_mmu, + helper_ret_lduw_mmu, + helper_ret_ldul_mmu, + helper_ret_ldq_mmu, }; -/* helper signature: helper_st_mmu(CPUState *env, target_ulong addr, - uintxx_t val, int mmu_idx) */ +/* helper signature: helper_ret_st_mmu(CPUState *env, target_ulong addr, + * uintxx_t val, int mmu_idx, uintptr_t ra) + */ static const void * const qemu_st_helpers[4] = { - helper_stb_mmu, - helper_stw_mmu, - helper_stl_mmu, - helper_stq_mmu, + helper_ret_stb_mmu, + helper_ret_stw_mmu, + helper_ret_stl_mmu, + helper_ret_stq_mmu, }; static void *ld_trampolines[4]; @@ -860,9 +862,9 @@ static void tcg_out_qemu_ld_slow_path (TCGContext *s, TCGLabelQemuLdst *label) tcg_out_mov (s, TCG_TYPE_I32, ir++, label->addrhi_reg); tcg_out_mov (s, TCG_TYPE_I32, ir++, addr_reg); #endif - tcg_out_movi (s, TCG_TYPE_I32, ir, mem_index); + tcg_out_movi (s, TCG_TYPE_I32, ir++, mem_index); + tcg_out_movi (s, TCG_TYPE_I32, ir, (tcg_target_long) raddr); tcg_out_b (s, LK, (tcg_target_long) ld_trampolines[s_bits]); - tcg_out32 (s, (tcg_target_long) raddr); switch (opc) { case 0|4: tcg_out32 (s, EXTSB | RA (data_reg) | RS (3)); @@ -954,10 +956,10 @@ static void tcg_out_qemu_st_slow_path (TCGContext *s, TCGLabelQemuLdst *label) } ir++; - tcg_out_movi (s, TCG_TYPE_I32, ir, mem_index); - tcg_out_b (s, LK, (tcg_target_long) st_trampolines[opc]); - tcg_out32 (s, (tcg_target_long) raddr); - tcg_out_b (s, 0, (tcg_target_long) raddr); + tcg_out_movi (s, TCG_TYPE_I32, ir++, mem_index); + tcg_out_movi (s, TCG_TYPE_I32, ir, (tcg_target_long) raddr); + tcg_out32 (s, MTSPR | RS (ir) | LR); + tcg_out_b (s, 0, (tcg_target_long) st_trampolines[opc]); } void tcg_out_tb_finalize(TCGContext *s) @@ -981,9 +983,6 @@ void tcg_out_tb_finalize(TCGContext *s) #ifdef CONFIG_SOFTMMU static void emit_ldst_trampoline (TCGContext *s, const void *ptr) { - tcg_out32 (s, MFSPR | RT (3) | LR); - tcg_out32 (s, ADDI | RT (3) | RA (3) | 4); - tcg_out32 (s, MTSPR | RS (3) | LR); tcg_out_mov (s, TCG_TYPE_I32, 3, TCG_AREG0); tcg_out_call (s, (tcg_target_long) ptr, 1, 0); } -- 1.8.3.1