From nobody Tue May 7 06:28:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498722943522351.9808265252602; Thu, 29 Jun 2017 00:55:43 -0700 (PDT) Received: from localhost ([::1]:37474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQUIf-0008W0-Gb for importer@patchew.org; Thu, 29 Jun 2017 03:55:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQUFs-0006H7-It for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQUFq-0005wB-Gv for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:48 -0400 Received: from mail-yb0-x242.google.com ([2607:f8b0:4002:c09::242]:34576) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQUFq-0005w4-CT for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:46 -0400 Received: by mail-yb0-x242.google.com with SMTP id b189so3583667yba.1 for ; Thu, 29 Jun 2017 00:52:46 -0700 (PDT) Received: from localhost.localdomain (c-73-207-178-95.hsd1.ga.comcast.net. [73.207.178.95]) by smtp.gmail.com with ESMTPSA id p189sm1816553ywb.30.2017.06.29.00.52.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 00:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JzcfCNDMm2t0lrvIjsuUlrEWFixc200GGM5GpNbVDms=; b=S18+WB9Sj9Fk4jOUUH9QMmBmxjWp/BFHRToyggmGWoBLKax1rPUAHUlwUdTP7kkVPu FwtMcyUBmdAc+2bTY+dvYDgm+tcEX8ffkuSzin0+abG1yCwBiYL7yuZrhVr6/8ojcul0 OvgYIGffIN9GSfZxwSt0jLuziJdnFfRpq84oitJCuujaHcxtGgTlp9fcooLUqmbbZEzn 0aN6VTs3+0xIFnmySeK2QHY474hft4cgfj+lhajLLfCWevAxfiQPuPFmLUglpRp3z551 1Up2rR5WuQ0V12CrDO4YWz6GJSu27F2VXLFU/H331Q7xgunjUsSydhqijjyEEAjMFGPA C/rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JzcfCNDMm2t0lrvIjsuUlrEWFixc200GGM5GpNbVDms=; b=bokhfMry8eZQKD30ZqiR6OhDebrVrJ+lynKvoD23H/wqQC/37BkTpO0JM5ez9RhEf/ rI76HD5zK1fJH4NqD2R0YvS9+jvX03QmUhlcYQf63jlqhMv0M1nM/mbudWl/P44oY7em OD03SUM+3Dl3ohJcj0+L5UaCWUgYm4nJMLX/IDtVKyjWKWG8VQozTpQR+P/vIFrHhEmY U2PLQcK0ElwjwPlQO5tysRZd4G31yhjhTCAd4O8rPt9QZLrzZmX+VRc5bGB4sQtYtqkC gNR7kkMVKwCcFHbXxUyT6f+1nzxntraCVSj3WBZE+96E6j6N0gZY9vlkIxDfo5BZJRlF QBiw== X-Gm-Message-State: AKS2vOyVb8zQ+uh9cMlDgzMj1BKPeDB0MtJsilgwzqWxcUlv84TBOXI8 xiYfg8iuQdeWk9RpLW8= X-Received: by 10.37.111.132 with SMTP id k126mr3729154ybc.63.1498722765675; Thu, 29 Jun 2017 00:52:45 -0700 (PDT) From: Pranith Kumar To: alex.bennee@linaro.org Date: Thu, 29 Jun 2017 03:52:41 -0400 Message-Id: <20170629075243.26984-2-bobby.prani@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170629075243.26984-1-bobby.prani@gmail.com> References: <20170629075243.26984-1-bobby.prani@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c09::242 Subject: [Qemu-devel] [PATCH v2 1/3] tcg/aarch64: Introduce and use long branch to register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We can use a branch to register instruction for exit_tb for offsets greater than 128MB. CC: Richard Henderson CC: Alex Benn=C3=A9e Signed-off-by: Pranith Kumar Reviewed-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 1fa3bccc89..8fce11ace7 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -819,6 +819,17 @@ static inline void tcg_out_goto(TCGContext *s, tcg_ins= n_unit *target) tcg_out_insn(s, 3206, B, offset); } =20 +static inline void tcg_out_goto_long(TCGContext *s, tcg_insn_unit *target) +{ + ptrdiff_t offset =3D target - s->code_ptr; + if (offset =3D=3D sextract64(offset, 0, 26)) { + tcg_out_insn(s, 3206, BL, offset); + } else { + tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, (intptr_t)target); + tcg_out_insn(s, 3207, BR, TCG_REG_TMP); + } +} + static inline void tcg_out_goto_noaddr(TCGContext *s) { /* We pay attention here to not modify the branch target by reading fr= om @@ -1364,10 +1375,10 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_exit_tb: /* Reuse the zeroing that exists for goto_ptr. */ if (a0 =3D=3D 0) { - tcg_out_goto(s, s->code_gen_epilogue); + tcg_out_goto_long(s, s->code_gen_epilogue); } else { tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_X0, a0); - tcg_out_goto(s, tb_ret_addr); + tcg_out_goto_long(s, tb_ret_addr); } break; =20 --=20 2.13.0 From nobody Tue May 7 06:28:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498722844843357.17705960380954; Thu, 29 Jun 2017 00:54:04 -0700 (PDT) Received: from localhost ([::1]:37466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQUH5-00074X-KE for importer@patchew.org; Thu, 29 Jun 2017 03:54:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQUFs-0006H8-VJ for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQUFr-0005wR-WF for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:49 -0400 Received: from mail-yb0-x243.google.com ([2607:f8b0:4002:c09::243]:33050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQUFr-0005wK-Qw for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:47 -0400 Received: by mail-yb0-x243.google.com with SMTP id 84so3588645ybe.0 for ; Thu, 29 Jun 2017 00:52:47 -0700 (PDT) Received: from localhost.localdomain (c-73-207-178-95.hsd1.ga.comcast.net. [73.207.178.95]) by smtp.gmail.com with ESMTPSA id p189sm1816553ywb.30.2017.06.29.00.52.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 00:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dY5i51aDNY3E09hgtGCbJ2+uQFOT5W+QyFrVQJnyfaQ=; b=tpA9BmyxwAbegfPZ++uLmZUFwvTUPeYLo2DLPEwYKnQm4in7F4twm3plLOpA8u91Al gD8Mxt2tXB+TzVXGIJQiueUzEzf6D1TzSF7RlwFO9ZJt+AE41rYlWoDe0bmlpKXpJej1 JWvDUZccY4OEV0lGMy1xdvKEDghZjqebI2dm+u3kx70q+tIyT4yWZ1ieWPxxx1BgX1Uf pWgJkk+4Jzaix1ooqEybz7cQGy2UJwuH555z2OWduXHKY0Cp2G8ofSjl8e9qmTiZe0v4 YZDExQUdGgpJYBUCl1mFPRxDWRpWShTEH/vOVL4dh3h/SfXZc8DZvNCxQ9ZGNmoO1E8J Cb5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dY5i51aDNY3E09hgtGCbJ2+uQFOT5W+QyFrVQJnyfaQ=; b=fUIlToSpPu9+QHUbhljw7XXN2pHvHKYZTQXC2ISXEmb8TA3sidtgHM9PkJujkK1CLG Gi0X77Ozvg5XLh1IecIVjwONDcewuixXOqvy7xpDMMyfBbhOWP60pt/5cN4gXQ85ZJkR xgVQgex+p0lCwDIewQdTAA6ZnUja2YD9WdvYRMwgVsCeLEMhdDUP6+Tb84xxSSw6qhFc qA085I8QoAXn6I+0gBso0GF7M6w7L7IynkGGDzT+aUX/B5UZL9q6ZsB0JXBRPJ1vg114 cY09JNfk6tjIDWlLREXiZVlEUoriBmSjpHTZeTQSY9HTPQMwHdhrgAt9S3Vd+htasaCv kMFQ== X-Gm-Message-State: AKS2vOyq5LRzzQ/U6ydx9PvIxNH53t3036YdV/Bnie1+doL8lYRaqAyc O3xXlc6gtuKgKQ== X-Received: by 10.37.194.196 with SMTP id s187mr2559888ybf.65.1498722767113; Thu, 29 Jun 2017 00:52:47 -0700 (PDT) From: Pranith Kumar To: alex.bennee@linaro.org Date: Thu, 29 Jun 2017 03:52:42 -0400 Message-Id: <20170629075243.26984-3-bobby.prani@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170629075243.26984-1-bobby.prani@gmail.com> References: <20170629075243.26984-1-bobby.prani@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c09::243 Subject: [Qemu-devel] [PATCH v2 2/3] tcg/aarch64: Use ADRP+ADD to compute target address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We use ADRP+ADD to compute the target address for goto_tb. This patch introduces the NOP instruction which is used to align the above instruction pair so that we can use one atomic instruction to patch the destination offsets. CC: Richard Henderson CC: Alex Benn=C3=A9e Signed-off-by: Pranith Kumar --- accel/tcg/translate-all.c | 2 +- tcg/aarch64/tcg-target.inc.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index f6ad46b613..b6d122e087 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -522,7 +522,7 @@ static inline PageDesc *page_find(tb_page_addr_t index) #elif defined(__powerpc__) # define MAX_CODE_GEN_BUFFER_SIZE (32u * 1024 * 1024) #elif defined(__aarch64__) -# define MAX_CODE_GEN_BUFFER_SIZE (128ul * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (3ul * 1024 * 1024 * 1024) #elif defined(__s390x__) /* We have a +- 4GB range on the branches; leave some slop. */ # define MAX_CODE_GEN_BUFFER_SIZE (3ul * 1024 * 1024 * 1024) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 8fce11ace7..b7670ecc90 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -372,6 +372,7 @@ typedef enum { I3510_EON =3D 0x4a200000, I3510_ANDS =3D 0x6a000000, =20 + NOP =3D 0xd503201f, /* System instructions. */ DMB_ISH =3D 0xd50338bf, DMB_LD =3D 0x00000100, @@ -866,10 +867,18 @@ static inline void tcg_out_call(TCGContext *s, tcg_in= sn_unit *target) void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) { tcg_insn_unit *code_ptr =3D (tcg_insn_unit *)jmp_addr; - tcg_insn_unit *target =3D (tcg_insn_unit *)addr; + tcg_insn_unit adrp_insn =3D *code_ptr++; + tcg_insn_unit addi_insn =3D *code_ptr; =20 - reloc_pc26_atomic(code_ptr, target); - flush_icache_range(jmp_addr, jmp_addr + 4); + ptrdiff_t offset =3D (addr >> 12) - (jmp_addr >> 12); + + /* patch ADRP */ + adrp_insn =3D deposit32(adrp_insn, 29, 2, offset & 0x3); + adrp_insn =3D deposit32(adrp_insn, 5, 19, offset >> 2); + /* patch ADDI */ + addi_insn =3D deposit32(addi_insn, 10, 12, addr & 0xfff); + atomic_set((uint64_t *)jmp_addr, adrp_insn | ((uint64_t)addi_insn << 3= 2)); + flush_icache_range(jmp_addr, jmp_addr + 8); } =20 static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l) @@ -1388,10 +1397,17 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, #endif /* consistency for USE_DIRECT_JUMP */ tcg_debug_assert(s->tb_jmp_insn_offset !=3D NULL); + /* Ensure that ADRP+ADD are 8-byte aligned so that an atomic + write can be used to patch the target address. */ + if ((uintptr_t)s->code_ptr & 7) { + tcg_out32(s, NOP); + } s->tb_jmp_insn_offset[a0] =3D tcg_current_code_size(s); /* actual branch destination will be patched by - aarch64_tb_set_jmp_target later, beware retranslation. */ - tcg_out_goto_noaddr(s); + aarch64_tb_set_jmp_target later, beware of retranslation */ + tcg_out_insn(s, 3406, ADRP, TCG_REG_TMP, 0); + tcg_out_insn(s, 3401, ADDI, TCG_TYPE_I64, TCG_REG_TMP, TCG_REG_TMP= , 0); + tcg_out_callr(s, TCG_REG_TMP); s->tb_jmp_reset_offset[a0] =3D tcg_current_code_size(s); break; =20 --=20 2.13.0 From nobody Tue May 7 06:28:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498722943778119.7465140743434; Thu, 29 Jun 2017 00:55:43 -0700 (PDT) Received: from localhost ([::1]:37475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQUIg-0008WS-Cv for importer@patchew.org; Thu, 29 Jun 2017 03:55:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQUFu-0006HM-GB for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQUFt-0005x3-LU for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:50 -0400 Received: from mail-yb0-x244.google.com ([2607:f8b0:4002:c09::244]:34577) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQUFt-0005wv-GF for qemu-devel@nongnu.org; Thu, 29 Jun 2017 03:52:49 -0400 Received: by mail-yb0-x244.google.com with SMTP id b189so3583710yba.1 for ; Thu, 29 Jun 2017 00:52:49 -0700 (PDT) Received: from localhost.localdomain (c-73-207-178-95.hsd1.ga.comcast.net. [73.207.178.95]) by smtp.gmail.com with ESMTPSA id p189sm1816553ywb.30.2017.06.29.00.52.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 00:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3da8XUcpXx8EZFBLzw9tG9Ze+K3xp6g/Eh/XrBbrz/U=; b=XqZ3bq4HHc2yRP2+3fCKBh7Ulax8k6jijA2fnR98O5fHpICe65C2ghfGlbvrZiyVIp G5Sa/1G0sQ2uXxCUk1YXA3LgyTi1rHC2YR7mx1oNWfLTzOsU3ukooh+hOIDThBfaZyLh 6YONGVoIF6kPqBHli+IPMOkixjTloZ2ui55Mt2daCEfEYVsId5/M0jYvL3QHXv3+juyp Ai0jhz4pisYWs9f8SMF8nKmnGYix/9eNqYB+h+sv1mLKRZc2P1+GyiA2Pl56vjWu088V tZwUzertb7jfmJm0i6JIr94vP09fi8EMAsjmsY5uJQkL3tfC6d7c2qYfwCa+TLZ+V+r5 qm0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3da8XUcpXx8EZFBLzw9tG9Ze+K3xp6g/Eh/XrBbrz/U=; b=T8C79c6qs5j+UN/E/OW0d6eWr0FMBwDPvCZZsAnWLvIgSrbuAoySypcyMpCbVmSPCP 7fzhfQW8GVpk1shm+wrFysBUArnbXsKidy/6dCi6gypny7G11qOZLqdgDiTS/oyZAwkM hjkhA8zBUrsJTEbzq2sMDiJfkaD5S47dbezF9d+/XxB9zA4gUQxG32XTKCR/M4By6zGr p9yWqjPCQG65FGgV5hBZ1CMnMOddIg8ERU5ARlPfhloCEvbGtvvdszg9hwTBGAZKD57h FG6IMTbevSJbcIrwgZcCAyA3Seg20WbaGgxwK0FFrhvOXwoMMaVtG2riDaFURPW4r/Xo rRgA== X-Gm-Message-State: AKS2vOyI+9PziG3sNHKIN6eHrw8vvou4rtLrMy2OEidR4Rp5mpYGsHA8 bIHP4emQYOUGpn9z/gA= X-Received: by 10.37.194.5 with SMTP id s5mr11455566ybf.175.1498722768725; Thu, 29 Jun 2017 00:52:48 -0700 (PDT) From: Pranith Kumar To: alex.bennee@linaro.org Date: Thu, 29 Jun 2017 03:52:43 -0400 Message-Id: <20170629075243.26984-4-bobby.prani@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170629075243.26984-1-bobby.prani@gmail.com> References: <20170629075243.26984-1-bobby.prani@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4002:c09::244 Subject: [Qemu-devel] [PATCH v3 3/3] tcg/aarch64: Enable indirect jump path using LDR (literal) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This patch enables the indirect jump path using an LDR (literal) instruction. It will be interesting to test and see which performs better among the two paths. CC: Richard Henderson CC: Alex Benn=C3=A9e Signed-off-by: Pranith Kumar Reviewed-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 42 ++++++++++++++++++++++++++++------------= -- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index b7670ecc90..5381c31b45 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -269,6 +269,8 @@ typedef enum { I3207_BLR =3D 0xd63f0000, I3207_RET =3D 0xd65f0000, =20 + /* Load literal for loading the address at pc-relative offset */ + I3305_LDR =3D 0x58000000, /* Load/store register. Described here as 3.3.12, but the helper that emits them can transform to 3.3.10 or 3.3.13. */ I3312_STRB =3D 0x38000000 | LDST_ST << 22 | MO_8 << 30, @@ -389,6 +391,11 @@ static inline uint32_t tcg_in32(TCGContext *s) #define tcg_out_insn(S, FMT, OP, ...) \ glue(tcg_out_insn_,FMT)(S, glue(glue(glue(I,FMT),_),OP), ## __VA_ARGS_= _) =20 +static void tcg_out_insn_3305(TCGContext *s, AArch64Insn insn, int imm19, = TCGReg rt) +{ + tcg_out32(s, insn | (imm19 & 0x7ffff) << 5 | rt); +} + static void tcg_out_insn_3201(TCGContext *s, AArch64Insn insn, TCGType ext, TCGReg rt, int imm19) { @@ -864,6 +871,8 @@ static inline void tcg_out_call(TCGContext *s, tcg_insn= _unit *target) } } =20 +#ifdef USE_DIRECT_JUMP + void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr) { tcg_insn_unit *code_ptr =3D (tcg_insn_unit *)jmp_addr; @@ -881,6 +890,8 @@ void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uint= ptr_t addr) flush_icache_range(jmp_addr, jmp_addr + 8); } =20 +#endif + static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l) { if (!l->has_value) { @@ -1392,21 +1403,24 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; =20 case INDEX_op_goto_tb: -#ifndef USE_DIRECT_JUMP -#error "USE_DIRECT_JUMP required for aarch64" -#endif - /* consistency for USE_DIRECT_JUMP */ - tcg_debug_assert(s->tb_jmp_insn_offset !=3D NULL); - /* Ensure that ADRP+ADD are 8-byte aligned so that an atomic - write can be used to patch the target address. */ - if ((uintptr_t)s->code_ptr & 7) { - tcg_out32(s, NOP); + if (s->tb_jmp_insn_offset !=3D NULL) { + /* USE_DIRECT_JUMP */ + /* Ensure that ADRP+ADD are 8-byte aligned so that an atomic + write can be used to patch the target address. */ + if ((uintptr_t)s->code_ptr & 7) { + tcg_out32(s, NOP); + } + s->tb_jmp_insn_offset[a0] =3D tcg_current_code_size(s); + /* actual branch destination will be patched by + aarch64_tb_set_jmp_target later, beware of retranslation */ + tcg_out_insn(s, 3406, ADRP, TCG_REG_TMP, 0); + tcg_out_insn(s, 3401, ADDI, TCG_TYPE_I64, TCG_REG_TMP, TCG_REG= _TMP, 0); + } else { + /* !USE_DIRECT_JUMP */ + tcg_debug_assert(s->tb_jmp_target_addr !=3D NULL); + intptr_t offset =3D tcg_pcrel_diff(s, (s->tb_jmp_target_addr += a0)) >> 2; + tcg_out_insn(s, 3305, LDR, offset, TCG_REG_TMP); } - s->tb_jmp_insn_offset[a0] =3D tcg_current_code_size(s); - /* actual branch destination will be patched by - aarch64_tb_set_jmp_target later, beware of retranslation */ - tcg_out_insn(s, 3406, ADRP, TCG_REG_TMP, 0); - tcg_out_insn(s, 3401, ADDI, TCG_TYPE_I64, TCG_REG_TMP, TCG_REG_TMP= , 0); tcg_out_callr(s, TCG_REG_TMP); s->tb_jmp_reset_offset[a0] =3D tcg_current_code_size(s); break; --=20 2.13.0