From nobody Tue May 7 18:56:36 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 1498783369771309.3355447415181; Thu, 29 Jun 2017 17:42:49 -0700 (PDT) Received: from localhost ([::1]:41839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQk1I-0002d4-7V for importer@patchew.org; Thu, 29 Jun 2017 20:42:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQjzd-0001fI-PC for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQjzb-0006HU-Op for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:05 -0400 Received: from mail-yw0-x243.google.com ([2607:f8b0:4002:c05::243]:35314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQjzb-0006HG-KL for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:03 -0400 Received: by mail-yw0-x243.google.com with SMTP id z21so5860675ywz.2 for ; Thu, 29 Jun 2017 17:41:03 -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 s29sm2914542ywa.45.2017.06.29.17.41.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 17:41:02 -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=YlYU+r9CZ1WfbLrR+FNjtel3zIeloCgLnxvEOP/FaLk=; b=kiu3CNSSfjy/sMCnmGX6KC0/Pe6y/+TBe/UGky9ls5cWHXPSLTcibcKxDSyGhTXDKN 2u/BYMhpdHxznz70BQ38t8KZnZ2+h79sStRXL0kH4OKv7rxaRzH7Ddyr2uGUffh9fdMj L0EtxEL3mN+ole+RLt59DgMhjTbuPZDJiIn2kOGazfXniwRSUpDJh6d8k6Q1rQPcpVYx /ga+sdLvwMHAWDJdgWzr1WBj0qcG0Pd0ckt0TtC/CiGiwM4t9GmF3TIBRRHDHBK0x1O1 AXcGolaLWCRmIK0C3bq7BtJmMEyj2IVb2++I0M/JH+u2w5YVFxaZJ5J2Gl6dGlaEageX Rk/g== 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=YlYU+r9CZ1WfbLrR+FNjtel3zIeloCgLnxvEOP/FaLk=; b=dFBMkYJNXygy8j2aEcsh7hEZAGe5CZhYpRyhCL2xDZJjsX1SwG87hVY8geX9MkvkTs I5F+yM7ffu0cOuzy1V4w59OxY9J6BAzZX6HvtxTVHtMY74Cljhcn7y9hQpOHXIjZNHQK +EpVZDaLsHH9oBSzE+9nOI1sKDFu2WZXgz7KTeDUZs5WqhOCrjEKww3wJ5o/C06Ch3/Q kGsdBFSP/nq974uftpUcdb4UJ3dl2HXXLehuB3CrsqQxCEySj94VGKTNG5HpaPDq876i EEFNRQ/z/RMiKM+K1W519elfC6fUH+rxcyoXs2wJHr/7k/waeRrpL3h+dDRnIzanDAN7 7VGA== X-Gm-Message-State: AKS2vOzapFr0ZGBwQm2LhNsowthCXnq7y7bwX/JihMvqOYL8K68tITVb Ft+aVR+OlZ3Kqx8uTXI= X-Received: by 10.129.163.136 with SMTP id a130mr2694481ywh.266.1498783263082; Thu, 29 Jun 2017 17:41:03 -0700 (PDT) From: Pranith Kumar To: alex.bennee@linaro.org Date: Thu, 29 Jun 2017 20:40:57 -0400 Message-Id: <20170630004059.25619-2-bobby.prani@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170630004059.25619-1-bobby.prani@gmail.com> References: <20170630004059.25619-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:c05::243 Subject: [Qemu-devel] [PATCH v3 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: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Signed-off-by: Pranith Kumar --- 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 18:56:36 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 1498783469340507.7238863194424; Thu, 29 Jun 2017 17:44:29 -0700 (PDT) Received: from localhost ([::1]:41843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQk2u-0004oJ-1F for importer@patchew.org; Thu, 29 Jun 2017 20:44:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQjze-0001fK-Ia for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQjzd-0006IZ-H7 for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:06 -0400 Received: from mail-yw0-x242.google.com ([2607:f8b0:4002:c05::242]:33770) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQjzd-0006IM-CE for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:05 -0400 Received: by mail-yw0-x242.google.com with SMTP id f200so5866226ywb.0 for ; Thu, 29 Jun 2017 17:41:05 -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 s29sm2914542ywa.45.2017.06.29.17.41.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 17:41:03 -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=9O7vZOfGGadYsoKGUMtKiWU0vI5ULhb1JlKyvLLzvfs=; b=lOi6cvJ+PdsZoqkdbFowNzGmwgDuQXdwqj9TPrFePMHeb4KD4hTulqp/sa6NsOryki EkL57U7YLZM61PyU6QEqrY8/mdR0bm4aXfsIor8SgapSJcblfNfAuoWG9m0CPXjiybdQ rxcp1GmZwQx/4UauPGKKP+4gWzZTTpm++llh5WBAeKyTmWa7tDexWUtTkIvj2RYotr+t igpzz0tmE+Zp/cenM5OUQ7o6lEUM8e4PBlnRvUSaYl6J84j9rhLD85cbeNBlXg9NOXiU niHwFgmTspgP0rMrW+djEdiVo/SVGxH4uYKzfehumIFWRNC1/vFSgkjZGTQ3v8ZJTCDV 76Nw== 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=9O7vZOfGGadYsoKGUMtKiWU0vI5ULhb1JlKyvLLzvfs=; b=U8I7c+rIfgLgrsRS3NO/beV0+y99U/BgrhsuZxLzb9K3+1+57D9mRBJROLB43OFZbv lmOFdD0MOmHpFtVCz0ylKC1x/GMfpDGV73LgidphImxxyK1mvNiHFqecYTJBAkr5R/uv 0GPyGi1JjXgssPpvs5ZVmZdEJUZeZvk65h2S61wbCeYhvxCPW3BNoC6mBMTd7Dj8OIZE z1UfnLHC4TnUD7niqP1SuBrpyXhyAYdOiMUlXy4bURmwnvrF/4oZ+bdin8NG6LdcORnf WrlAsr0OCq5Rl90/Vpzeu3BdH9quC9B/QSuQc0LwpPKdOpJ7tJR825B+zu/VrnlrF5vD aoLA== X-Gm-Message-State: AKS2vOzVN00Ax8gsDc+Nm9+PKed9Zm5mGPHDmb70+fei3MF79MsGSptZ bIEidLSPndHaEw== X-Received: by 10.129.50.140 with SMTP id y134mr13895454ywy.312.1498783264672; Thu, 29 Jun 2017 17:41:04 -0700 (PDT) From: Pranith Kumar To: alex.bennee@linaro.org Date: Thu, 29 Jun 2017 20:40:58 -0400 Message-Id: <20170630004059.25619-3-bobby.prani@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170630004059.25619-1-bobby.prani@gmail.com> References: <20170630004059.25619-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:c05::242 Subject: [Qemu-devel] [PATCH v3 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 | 34 +++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index f6ad46b613..65a92dbf67 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 (2ul * 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..f059d9d781 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,26 @@ 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 i1, i2; + uint64_t pair; =20 - reloc_pc26_atomic(code_ptr, target); - flush_icache_range(jmp_addr, jmp_addr + 4); + ptrdiff_t offset =3D addr - jmp_addr; + + if (offset =3D=3D sextract64(offset, 0, 26)) { + i1 =3D NOP; + i2 =3D I3206_B | ((offset >> 2) & 0x3ffffff); + } else { + offset =3D (addr >> 12) - (jmp_addr >> 12); + + /* patch ADRP */ + i2 =3D deposit32(*code_ptr++, 29, 2, offset & 0x3); + i2 =3D deposit32(i2, 5, 19, offset >> 2); + /* patch ADDI */ + i1 =3D deposit32(*code_ptr, 10, 12, addr & 0xfff); + } + pair =3D (uint64_t)i1 << 32 | i2; + atomic_set((uint64_t *)jmp_addr, pair); + flush_icache_range(jmp_addr, jmp_addr + 8); } =20 static inline void tcg_out_goto_label(TCGContext *s, TCGLabel *l) @@ -1388,10 +1405,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. */ + 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_insn(s, 3207, BR, 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 18:56:36 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 149878337514786.87357557276164; Thu, 29 Jun 2017 17:42:55 -0700 (PDT) Received: from localhost ([::1]:41840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQk1N-0002hW-Md for importer@patchew.org; Thu, 29 Jun 2017 20:42:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQjzf-0001fc-Rg for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQjze-0006JU-SJ for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:07 -0400 Received: from mail-yw0-x241.google.com ([2607:f8b0:4002:c05::241]:34149) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQjze-0006JA-Nj for qemu-devel@nongnu.org; Thu, 29 Jun 2017 20:41:06 -0400 Received: by mail-yw0-x241.google.com with SMTP id a12so19204ywh.1 for ; Thu, 29 Jun 2017 17:41:06 -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 s29sm2914542ywa.45.2017.06.29.17.41.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 17:41:04 -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=ldNYyXBXe4fitCOW4uZE6dsmaGLZQljtXhp0lrdSvgg=; b=R0S6Lo9afOQIk7OHUdAQSxIXReO619mAXauJiV1S2sn1oOggrmB6EeBgmR6XNWqGqX 4LkxvqWNy23uLkTG/K2N7CiKil8tMiV2aoO2iuSoh+Jncl7BiBihu8l3v1jpP7slDMg6 lsSks+/7FiSeyuSDKzulJcdelD2LS80MP3zU0QA/g6OccZHDQp9BSu4prlED0iRbt2mH R6wlkFi2wIUV3qi1rMLbl/NJB/fNxgd0L1fdG9vZwNto/P638o4vozWvPrVXbQ8+04Rh Ea5zVlDmfraXA8bqw4x719+gPpCiSkQeg9BKLBPrkEdV8f3Vyhev9A4xc53LHFLnGv5g Xuvw== 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=ldNYyXBXe4fitCOW4uZE6dsmaGLZQljtXhp0lrdSvgg=; b=LeXWmDk9GCS8XQ25PtXsvj9QjFG78uj0ELD7dl9mLZfv0KrCWpxx1hqdUWyoi/v2we 6xCzEVu4J8Olos7Et1cP1Rj8JrkysMPKwZexOdVXBfbPkXvWzLqKrJVg0pM0dceX0fzf RQnUkJPtkTFRkQoYE+DMczP3xP2ZZNz9CZNDwLVXdTr43y3+WWpliJDCHsTR5N+So46M KmYP1nqgGEx5067Yj6Cd1YBnRMU4d6rMJpahCxEQ6KEB67LgEvcCA2oY6ikgVkYtKx2j 9k7MUKc1W3sW9KrcnLvEpMsEu8zy5O21nPL3IXlgw2B63pNaM9WBG56O+ytB9OrrJOdh qvhQ== X-Gm-Message-State: AKS2vOyRMVKNzqkPWTm5QvH4//dK0yxpukhb8nGRP5xkge1igvhSqHTO bfJ5OI7awrzDgw== X-Received: by 10.129.125.4 with SMTP id y4mr454501ywc.299.1498783266088; Thu, 29 Jun 2017 17:41:06 -0700 (PDT) From: Pranith Kumar To: alex.bennee@linaro.org Date: Thu, 29 Jun 2017 20:40:59 -0400 Message-Id: <20170630004059.25619-4-bobby.prani@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170630004059.25619-1-bobby.prani@gmail.com> References: <20170630004059.25619-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:c05::241 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: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Signed-off-by: Pranith Kumar --- 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 f059d9d781..b0801d0259 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; @@ -889,6 +898,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) { @@ -1400,21 +1411,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. */ + 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. */ - 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_insn(s, 3207, BR, TCG_REG_TMP); s->tb_jmp_reset_offset[a0] =3D tcg_current_code_size(s); break; --=20 2.13.0