From nobody Wed Nov 5 06:58:14 2025 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.zohomail.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 1499672465692511.7269382346519; Mon, 10 Jul 2017 00:41:05 -0700 (PDT) Received: from localhost ([::1]:39051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTJY-0002k0-0a for importer@patchew.org; Mon, 10 Jul 2017 03:41:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTFV-0007y6-Jx for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUTFQ-0007fe-Ln for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:53 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35891) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUTFQ-0007fX-FZ for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:48 -0400 Received: by mail-pg0-f68.google.com with SMTP id u36so11708966pgn.3 for ; Mon, 10 Jul 2017 00:36:48 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id o8sm21619584pgn.52.2017.07.10.00.35.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 00:35:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IP/qPMw1NkXnK0I1vRv+HZLa1kKYGF/ss6svw8YL8+E=; b=ZBff5duxr1Er7BJo+9kdPTogZAdSl8zPNiXNPjg2lkRUJHMNZHGYx7SRYTCG4u4Qw1 WjZb/kssa2mEp+FAFIs5bgz+w9QNMvKyZg7J00nfnD5kBQGtNnjKkpN5gyOVy/L4KjYs RLnnX9/BZO1wX68qPRBknNb89g4PDPH+PnBq4xr+AJbjpOqX0Hq7J6nkOnVw2pH0xXfK qD+/HDqlsVn79OPX84LkFGLSoX+IQEggbfXj7uRSL2mdhiBwK4c+i6kjB3jK9vFeIn5W KCTCYtA4hxs4fa6exH1GEIe8WUNcQHxsHiXBYhtwuEhyFmysV/XHSrA6E4np42a91D+1 J7nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IP/qPMw1NkXnK0I1vRv+HZLa1kKYGF/ss6svw8YL8+E=; b=dzfpb3fiEDVbEoszo90wSYepMZGqVy9FL1Sjj74pjt26v/meoTE9CAdtE8bSN78aPC mSQB5srMgHXNQ6DcE9BdxC/0XzYf5NEWyeA4awWttgOcdYhwK5YhCcP8cDdMEesQoTyo mBfTIqNeFPNGGB/QqSo3VCthK057PKE3BhO6zYfxhFLC5ltjyCxLqPO3sKrcw0msl/HT LvUIsl+zd5exaGoWQwHUT1BM9MJF7PdDJvref7yPk7v+sI75iff5qggP2BOQCuHi3Lu2 cuWviu6tfT5dmN+l24ur/EIDVVGgiFqUasuwacqZZzZcN0BUOQCzz6idgYcodSdgtTyw QfpQ== X-Gm-Message-State: AIVw1118+1dun/0wFIWM/ZcOCTUD38l2tfgZpj4MUlmS/VxiFFp6p2zS FFsitJzBmy29xeo+37Y= X-Received: by 10.84.232.198 with SMTP id x6mr16492460plm.139.1499672147402; Mon, 10 Jul 2017 00:35:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 21:34:57 -1000 Message-Id: <20170710073501.5207-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710073501.5207-1-rth@twiddle.net> References: <20170710073501.5207-1-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.83.68 Subject: [Qemu-devel] [PULL 1/5] 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: peter.maydell@linaro.org, Pranith Kumar , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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 From: Pranith Kumar 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 Message-Id: <20170630143614.31059-1-bobby.prani@gmail.com> Signed-off-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 1fa3bcc..8fce11a 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.9.4 From nobody Wed Nov 5 06:58:14 2025 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.zohomail.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 1499672251235468.0730421843407; Mon, 10 Jul 2017 00:37:31 -0700 (PDT) Received: from localhost ([::1]:39033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTG5-0008Ah-Sa for importer@patchew.org; Mon, 10 Jul 2017 03:37:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTEh-0007PZ-A1 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUTEc-0007Ui-Iz for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:03 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:34317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUTEc-0007UG-CA for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:35:58 -0400 Received: by mail-pf0-x244.google.com with SMTP id c24so13381587pfe.1 for ; Mon, 10 Jul 2017 00:35:58 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id o8sm21619584pgn.52.2017.07.10.00.35.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 00:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eb1hXbkMxmFO3JcbDrJp9EQ7V25/E0cDoCKUAtrRRNI=; b=LHBECG97NqeRWAQS/KZNjm9JF7qxndx1k03jXdA4MoaKXGUIsmUl0bX/chC5ppc+u9 lwhobVdE2YR9Ug/VkA5v/apgOOaCCkmY7/0p0T/u+uYtCbz6itEJIFangktDVoluqf84 jFAQB1sLfzSygIa6zqIdkd/wlhacSlptlydczB9mhw2v28eh9C+JJucWkK9q+ZbaV8I/ GyeuZN0NGVU1TjaztFXRzSMtTENlVEuLGDUk5lehmPAtc7kjrvAXMxUq/i8+4O2KMBIK dh0qR8M39r6jA0uBPf4FEEwoX1LVNDM/Hanu/qnSx9Ys8mL9ezQRVJRzZx+m+d1mwSGY tgvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eb1hXbkMxmFO3JcbDrJp9EQ7V25/E0cDoCKUAtrRRNI=; b=DMUYWvxBJZTEeyOBJknO2N4fb6ooEWBJd1vs9JwqEzr5AsJFcPvJFtetBuwKmIWJ6S w5Poes2RNUJlMegnUtKD8pxAvngmwiblALE8V5LzgF7OFHjdeDaUKnzskd1YUgvUihs2 loJXhCoknhqXX/ArZZOw+cvFz761ynsoxQ0zZsxOvJ2XinhAwtRq5GA4hu+c11COHJVM RH5dDiqToXmZJcUva6kH/1cv/D6PhHrzPwSvUvfpfn9ZjwJSe5mZcPnPnUhWozqzoxzz illwhG3WmqwmXQPgRboQdFivjA8GEO5klWsgv8YO6FcitFpHxPsBVU/msEateX+RpYfJ rHrA== X-Gm-Message-State: AIVw112/QX2fJFr7tkBluMeSgf83yyMuKDfO+uIZtquFTghbfMterKUL FG2NPRb0NTNLWw7vPOM= X-Received: by 10.99.56.21 with SMTP id f21mr13214202pga.235.1499672156733; Mon, 10 Jul 2017 00:35:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 21:34:58 -1000 Message-Id: <20170710073501.5207-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710073501.5207-1-rth@twiddle.net> References: <20170710073501.5207-1-rth@twiddle.net> 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:400e:c00::244 Subject: [Qemu-devel] [PULL 2/5] 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: peter.maydell@linaro.org, Pranith Kumar , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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 From: Pranith Kumar 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: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Signed-off-by: Pranith Kumar Message-Id: <20170630143614.31059-2-bobby.prani@gmail.com> Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 2 +- tcg/aarch64/tcg-target.inc.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index dfb9f0d..0caf80d 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -504,7 +504,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 8fce11a..a84422d 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, @@ -865,11 +866,27 @@ static inline void tcg_out_call(TCGContext *s, tcg_in= sn_unit *target) =20 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; + TCGType rt =3D TCG_TYPE_I64; + TCGReg rd =3D TCG_REG_TMP; + 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 I3206_B | ((offset >> 2) & 0x3ffffff); + i2 =3D NOP; + } else { + offset =3D (addr >> 12) - (jmp_addr >> 12); + + /* patch ADRP */ + i1 =3D I3406_ADRP | (offset & 3) << 29 | (offset & 0x1ffffc) << (5= - 2) | rd; + /* patch ADDI */ + i2 =3D I3401_ADDI | rt << 31 | (addr & 0xfff) << 10 | rd << 5 | rd; + } + pair =3D (uint64_t)i2 << 32 | i1; + 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.9.4 From nobody Wed Nov 5 06:58:14 2025 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.zohomail.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 1499672333341829.5362887779152; Mon, 10 Jul 2017 00:38:53 -0700 (PDT) Received: from localhost ([::1]:39037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTHQ-0000jF-4g for importer@patchew.org; Mon, 10 Jul 2017 03:38:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTFt-0008GX-Bx for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:37:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUTFp-0007p1-36 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:37:17 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:35315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUTFo-0007op-SI for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:37:13 -0400 Received: by mail-pg0-f52.google.com with SMTP id j186so45164317pge.2 for ; Mon, 10 Jul 2017 00:37:12 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id o8sm21619584pgn.52.2017.07.10.00.35.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 00:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uJ0ERl9gFUaXigxow/y7TjEG1XkDxYWJS3OrFqLW6VI=; b=D/rrLGsvMlGUqOG5CBnRVarr9IpSVz7ehVKJ3aqQ95PraffteLIuvy9VGk7VxznSeX 3ZXMufr/bf6iGzymhMRYv+zG7ho9G7otUjZn+owF7/t8b2OUo4a8rf1O6aqMVhBg7SvM IpWha/y+cFParAS70k5ixYsWO5EgfdYX6CPedUUEmUkr7aY2j3larsXG3p2vRzowQVtf dw3isZF9gGcUkmD5AicDTNFSMseByJPkKyF52amKbIVyWXsCphQZBzUAc/dz0d3nikhc 9+oiULPNjFt4E8woVdrR+griv4D0njTk8EG7rx+xXZGuojb4/uNby/pWM3XHP+ti4mOq RWuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uJ0ERl9gFUaXigxow/y7TjEG1XkDxYWJS3OrFqLW6VI=; b=HvBvUAe+ak2koB7d2xHHt4I7tU/7LbZ3QrBrz6gIgC9ve2sO8BtbqZy6zoR9OvB2Sy ko9xY15zGgbZRm1U0FOQGzr9V7dMf9NoHlhR7HwcO7D6G+YlO0ZkeAz7VGINN7H9GkDl WiN6rvl93AHz7EkVgzGc/cO3PaiBpXAIeEV00CMild0rwhwcomcfj1gc34yVWdPpzCDD uJTZFo2WOPtDYA/LGkm3mVD98Ec+427g2Se3dBAixAqZeowSBh5SnjR0gzJ4bP5poikz 5pq13kf/ZHp56wyYgSSqAFHT66GX7vizKB3ey6udswyEsg+YyHw09Vx/8coXUPz1UAFm 1Bhw== X-Gm-Message-State: AIVw113RgM0t759gfbPEKm+tN/GqYGJM8HryR0ZJBjwRdvjigv7irmLK bmMKl4SOJCk6BlDS9JI= X-Received: by 10.84.191.165 with SMTP id a34mr16382381pld.243.1499672171490; Mon, 10 Jul 2017 00:36:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 21:34:59 -1000 Message-Id: <20170710073501.5207-4-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710073501.5207-1-rth@twiddle.net> References: <20170710073501.5207-1-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.83.52 Subject: [Qemu-devel] [PULL 3/5] 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: peter.maydell@linaro.org, Pranith Kumar , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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 From: Pranith Kumar 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 Message-Id: <20170630143614.31059-3-bobby.prani@gmail.com> Signed-off-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 a84422d..04bc369 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 i1, i2; @@ -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.9.4 From nobody Wed Nov 5 06:58:14 2025 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.zohomail.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 1499672379731897.3543807717982; Mon, 10 Jul 2017 00:39:39 -0700 (PDT) Received: from localhost ([::1]:39040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTIA-0001bM-Kt for importer@patchew.org; Mon, 10 Jul 2017 03:39:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTFJ-0007pe-2k for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUTFE-0007cR-ET for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:41 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35057) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUTFE-0007cL-8C for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:36 -0400 Received: by mail-pg0-x242.google.com with SMTP id d193so11723613pgc.2 for ; Mon, 10 Jul 2017 00:36:36 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id o8sm21619584pgn.52.2017.07.10.00.36.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 00:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=6C8dpVCy9UEyafXihhONYCtfhxNRUW9Pm4dO46k6ydQ=; b=p/v+to3yfL03sE+huyGyBglEssHuI3m/j5ef6IsjRMJg3frCBCoczbp029ChNLokD2 EJZSStr9kMBO7TZUhoEyHMv6wpsqnetQKv/42fIsz/G1xA4/e3Ln+7d9GHCyKygnJGG6 +xG6x4UcsvBMGzh1khrfJ8KIFdffSIFB6UXkVxBI9cBtgfQjW5DQ9/r+SqZFmgraBXHo gCSd+7QExds44Gg+yo9Mvbe5m0iLR5FN2FI4p0DdktL3fNQ4A3hxbyo7NTao0f2ETdMM pYSGYELgpNleLjHMUlhVdrE44bg3cEqCnVPPqP8aL3ezkW6PzogBkIHLWkPSK8wdTvio qM5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=6C8dpVCy9UEyafXihhONYCtfhxNRUW9Pm4dO46k6ydQ=; b=bWCOIeMU1JE8MmWEp4atBhQwvV7tPXZBN69P4BDZOvqUt21fOsCbAbKp2JF+FRqJpQ E1nPbo+tJzNXuRM+JP4sWHSQRR5wTIpTs2vdG8lk03+aYjeOgayZIk4seIx7I/t3mb+e 0/1hUzoY9aQcQynUzzF8+MpMcPEe2+UjG4CqUg4mSikpWgpLJ1JRo0XLqM/vDBIaki0x V2o3buQ6CvqhpGgZc2MBfH5hJa+OVbdhq02nqnOybbBsH1IyRFCeMwPvO9YAmcoFU8MA HXWBYkeqfEuSAISdBf1Sc+MfEufZxE63ULeQiiSKe0FmQgfdcDsPZg+ODcTDcjAIpKpk XFbQ== X-Gm-Message-State: AIVw112dpniBFTiM4/a1WygpeVqhz6ZTpf6VYDN1dvisq/OO2jPvf4r9 8xBMlQI3SiFEO/SKQK0= X-Received: by 10.99.163.76 with SMTP id v12mr13579217pgn.37.1499672195064; Mon, 10 Jul 2017 00:36:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 21:35:00 -1000 Message-Id: <20170710073501.5207-5-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710073501.5207-1-rth@twiddle.net> References: <20170710073501.5207-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PULL 4/5] util/cacheinfo: Fix warning generated by clang 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: peter.maydell@linaro.org, Pranith Kumar 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pranith Kumar Clang generates the following warning on aarch64 host: CC util/cacheinfo.o /home/pranith/qemu/util/cacheinfo.c:121:48: warning: value size does not ma= tch register size specified by the constraint and modifier [-Wasm-operand-w= idths] asm volatile("mrs\t%0, ctr_el0" : "=3Dr"(ctr)); ^ /home/pranith/qemu/util/cacheinfo.c:121:28: note: use constraint modifier "= w" asm volatile("mrs\t%0, ctr_el0" : "=3Dr"(ctr)); ^~ %w0 Constraint modifier 'w' is not (yet?) accepted by gcc. Fix this by increasi= ng the ctr size. Tested-by: Emilio G. Cota Reviewed-by: Emilio G. Cota Signed-off-by: Pranith Kumar Message-Id: <20170630153946.11997-1-bobby.prani@gmail.com> Signed-off-by: Richard Henderson --- util/cacheinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cacheinfo.c b/util/cacheinfo.c index f987522..6253049 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -112,7 +112,7 @@ static void sys_cache_info(int *isize, int *dsize) static void arch_cache_info(int *isize, int *dsize) { if (*isize =3D=3D 0 || *dsize =3D=3D 0) { - unsigned ctr; + unsigned long ctr; =20 /* The real cache geometry is in CCSIDR_EL1/CLIDR_EL1/CSSELR_EL1, but (at least under Linux) these are marked protected by the --=20 2.9.4 From nobody Wed Nov 5 06:58:14 2025 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.zohomail.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 1499672412771367.96695562148807; Mon, 10 Jul 2017 00:40:12 -0700 (PDT) Received: from localhost ([::1]:39041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTIg-00022N-Iv for importer@patchew.org; Mon, 10 Jul 2017 03:40:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUTFV-0007y5-Ja for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUTFS-0007g6-JC for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:53 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUTFS-0007fu-D3 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 03:36:50 -0400 Received: by mail-pf0-x241.google.com with SMTP id z6so13400774pfk.3 for ; Mon, 10 Jul 2017 00:36:50 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id o8sm21619584pgn.52.2017.07.10.00.36.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 00:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vuBhGjC3ZgBc0IzpR+FWuVxaoRdZ0itbQgLZR6p81Ig=; b=A6CZ60N8uCNyAnORXpBuZgXBaxk5C4EXeSV61ka/tE8vBU9Nw0NdaS2huVTugEB53k ktekgYyg0MB8unlzpyhoGQvshyRM3l/Lz9wn+sZgw/P9R8E/aqjr78eyQTSunpoZTLQO 6cAybQQbl/ipkOKWIvdtcjPSbwWHQLES1eQCYeTDvdUP0HxxfT2UcVBmeqgRYLMJAO6B nuN9c98VHUbO5IOXjagfdvFRCPANVa9wzkn/9Gyn/CCGMhA7ct7FZvdrtELDagRE0hrw a0kbxgPZfhl+EMEwJIwJXcPk2yToA7LhuE/MadFsF1gTr+rqkIHFwHmXq5wE3XxC1NBy uHcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vuBhGjC3ZgBc0IzpR+FWuVxaoRdZ0itbQgLZR6p81Ig=; b=VCf9fHk4YMi4hIzXxKHI6Jbn9YQGl1syZOHSKB76LiICnNlNDW3Q8JHvsFsra1ffUm vfIsxzDS4ASHMyanT2TWAwXCci2RoMYpDfGogpyarvnHaAxRDtZY4o+a12K5rrkHWhAo Z64QJjJ1XRTWnyQLfVKaIih2sN7b7v37nsPPXNU98jbj63woClY7F+9oK0/c39Dk8p+7 j5KgOAYwVCOk9VjMgjFzUHkhvVkM5XrhvbP0ecQwxT+ZrVwfkD/J/sM1OkxupT1QdBmp BNAlQXBjtOjb0cp6orxdHQDvCMzCxVlQ1SsnJdlyZfEC/IUtxIu0x1I/mz0fyDdp5u3/ jexA== X-Gm-Message-State: AIVw112vUbUN/IqIpsaS5hewim8krFDaQdDIT3qBITL1alIZ71r0m975 ydNQRNl17FMyp+vmW7I= X-Received: by 10.98.70.206 with SMTP id o75mr42364163pfi.60.1499672209238; Mon, 10 Jul 2017 00:36:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Jul 2017 21:35:01 -1000 Message-Id: <20170710073501.5207-6-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710073501.5207-1-rth@twiddle.net> References: <20170710073501.5207-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PULL 5/5] tcg/mips: Bugfix for crash when running program with qemu-i386. 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: peter.maydell@linaro.org, Jiang Biao 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jiang Biao When running a helloworld program with qemu-i386 in linux-user mode on Loongson 3A3000, it will crash. This patch fix the bug. Signed-off-by: Jiang Biao Message-Id: <1499669979-25904-1-git-send-email-jiang.biao2@zte.com.cn> Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.inc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 8cff9a6..85756b8 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -1547,8 +1547,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGA= rg *args, bool is_64) } else if (guest_base =3D=3D (int16_t)guest_base) { tcg_out_opc_imm(s, ALIAS_PADDI, base, addr_regl, guest_base); } else { - tcg_out_movi(s, TCG_TYPE_PTR, base, guest_base); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, addr_regl); + tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, guest_base); + tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP0, addr_regl); } tcg_out_qemu_ld_direct(s, data_regl, data_regh, base, opc, is_64); #endif @@ -1652,8 +1652,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGA= rg *args, bool is_64) } else if (guest_base =3D=3D (int16_t)guest_base) { tcg_out_opc_imm(s, ALIAS_PADDI, base, addr_regl, guest_base); } else { - tcg_out_movi(s, TCG_TYPE_PTR, base, guest_base); - tcg_out_opc_reg(s, ALIAS_PADD, base, base, addr_regl); + tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, guest_base); + tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP0, addr_regl); } tcg_out_qemu_st_direct(s, data_regl, data_regh, base, opc); #endif --=20 2.9.4