From patchwork Wed Jan 10 07:55:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 124031 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4971259qgn; Tue, 9 Jan 2018 23:58:21 -0800 (PST) X-Google-Smtp-Source: ACJfBovUZosj/C0FD+eIWYVEyVq+a9kKDrBOhjogRVMLnnLH5srmYiM6+1wGqQ68gUKLKv9gQrcf X-Received: by 10.37.187.5 with SMTP id z5mr5141082ybg.154.1515571101681; Tue, 09 Jan 2018 23:58:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515571101; cv=none; d=google.com; s=arc-20160816; b=EYD1CqgH0AhGNi/GwiTtK0ypoh3ItXws67prA6suKUbcwtGEIrVLnroKbBVuUSoMWB ZSPIyX+B5pI2jdQvkRfoApbaGtHekgBQ2yRv4WZF5+j1W6fuFrKJUjQ0I9iD7wN0gE/f pLCOjzn42tARrTkPwpCI0WBnJTcXqsDc60tr0L9++v3ysjzdzfoG/DVjFetf7nxOpsjG q0IdLGjPGCzqKQJAYVxBIa8YNHn/c5d2zZE1l8NUMC4/VdcTsp8lgFL07xnCc6qNJTUQ tHYQoWSj44beN+20/5StJjRSzERFrdhEEfm0pN5SGAZ3i7adQnBpJDtAECDVE6o/QKHI IpDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=RkJQxOnAGP0/1GM4j5AhPbVm0ZbUL4Gx9Je9FrSasnc=; b=wNVjv2hGYZOQEWbWXEb0ZYrz11tuwGoi0OQUKjbPKRbyPsTyvzqhaicsQvkPM0Vn0K FWBHaSjqzmb3lPahJ6hPZDIjAxAsBVSLJoao3P7amHDo91iB5zGCTIZoHUf5OP1u272R svHxZXSHrX/xSqpXIVIFcNSEE4mL406ZPMFvoBWEXmYY4g1mFKsUSWXA2YnauLY9+V2q vcd/VZiF/65ng9kR65wsZgOULzDHXFhUuUfS9fioSnpLPqi2FURE7HGUsCsPHOptiGft 93hx+IIeSGWrKBVn8pPcgqzZl/ata6vBIdbUaO/h/rP4VxfUwdqEW6Z3aZ0zMY0MEIQz ez8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NYIK9gWj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q189si3522819ybq.560.2018.01.09.23.58.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 09 Jan 2018 23:58:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NYIK9gWj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZBHB-0006ec-7F for patch@linaro.org; Wed, 10 Jan 2018 02:58:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZBEq-0005lC-2e for qemu-devel@nongnu.org; Wed, 10 Jan 2018 02:55:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZBEn-0000fO-FI for qemu-devel@nongnu.org; Wed, 10 Jan 2018 02:55:56 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:41245) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZBEn-0000en-8i for qemu-devel@nongnu.org; Wed, 10 Jan 2018 02:55:53 -0500 Received: by mail-pl0-x242.google.com with SMTP id q3so1477351plr.8 for ; Tue, 09 Jan 2018 23:55:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=RkJQxOnAGP0/1GM4j5AhPbVm0ZbUL4Gx9Je9FrSasnc=; b=NYIK9gWjTbwq9yDTzdpFXDmsXia+B0vx4db3ZCJ/XGku/Ulkg1lgAPx/XaCLxjZ1QH 7Su3BI3e58eEaO39HfstfiZ5diAit9HQK8lBXtL7jP3JaCOgbnAcCF/D18v1VxAnLnak QM2V18XJWbt+VtgUSPXAJIgjLAZJWNivj965Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RkJQxOnAGP0/1GM4j5AhPbVm0ZbUL4Gx9Je9FrSasnc=; b=YgIKOrVAqah77eRNes5iEpaqbCoZ8kqvuK9XvInKWs/Ou8ORKN9zpqfFyG3CglLmoF +JMGUb7dg6uLt53U/cQH2wGOneFAFjPgS0tixoVBxUJsmESXRFNCVMQz0Mg4DSnRPBni uZGXTtelwJIeB9p3/iJ1Fl34VgL8VqoR4gJnxrfwDOshJuM3VmWZkeEvFou0swdMwJ9U FsOfn2TmhqwHNPP4l926Uq9epL90vsWWAeZC6juyStwgDcymQ5Pu0as2tmK08Fpj087Y qM93kHrZS0Ws0yIeorvuN+Y3CtIoCWminBkI2KgjBsXpcvQXd37kV8OMOLanye5riwdG V9qQ== X-Gm-Message-State: AKGB3mKa0MNZsATCyPycT/oAjIxDCJSKg190Dv15WsLf8lsUzblVTLEP LUviDi9K7EzFe/3R5w5YaJ2aEOzkxtQ= X-Received: by 10.84.138.193 with SMTP id 59mr17979476plp.254.1515570951876; Tue, 09 Jan 2018 23:55:51 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-183-164.tukw.qwest.net. [97.113.183.164]) by smtp.gmail.com with ESMTPSA id h80sm15740147pfj.12.2018.01.09.23.55.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jan 2018 23:55:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 9 Jan 2018 23:55:46 -0800 Message-Id: <20180110075547.15841-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180110075547.15841-1-richard.henderson@linaro.org> References: <20180110075547.15841-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH 1/2] tcg/ppc: Support tlb offsets larger than 64k 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" AArch64 with SVE has an offset of 80k to the 8th TLB. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.inc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.14.3 diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 879885b68b..74f9b4aa34 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -1524,16 +1524,15 @@ static TCGReg tcg_out_tlb_read(TCGContext *s, TCGMemOp opc, /* Compensate for very large offsets. */ if (add_off >= 0x8000) { - /* Most target env are smaller than 32k; none are larger than 64k. - Simplify the logic here merely to offset by 0x7ff0, giving us a - range just shy of 64k. Check this assumption. */ - QEMU_BUILD_BUG_ON(offsetof(CPUArchState, - tlb_table[NB_MMU_MODES - 1][1]) - > 0x7ff0 + 0x7fff); - tcg_out32(s, ADDI | TAI(TCG_REG_TMP1, base, 0x7ff0)); + int low = (int16_t)cmp_off; + int high = cmp_off - low; + assert((high & 0xffff) == 0); + assert(cmp_off - high == (int16_t)(cmp_off - high)); + assert(add_off - high == (int16_t)(add_off - high)); + tcg_out32(s, ADDIS | TAI(TCG_REG_TMP1, base, high >> 16)); base = TCG_REG_TMP1; - cmp_off -= 0x7ff0; - add_off -= 0x7ff0; + cmp_off -= high; + add_off -= high; } /* Extraction and shifting, part 2. */ From patchwork Wed Jan 10 07:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 124030 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4969712qgn; Tue, 9 Jan 2018 23:56:16 -0800 (PST) X-Google-Smtp-Source: ACJfBouJEXKToWCQqfZhm858GBnBpF5G1bIkyz/j8Q32tMw7VRAbovk0wgaqyOzWCMB2os5w23QJ X-Received: by 10.13.247.129 with SMTP id h123mr775659ywf.488.1515570976864; Tue, 09 Jan 2018 23:56:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515570976; cv=none; d=google.com; s=arc-20160816; b=QM8Yfhoxt5JzfYmk9icFuRNWQyQxc7jYI9d/pKFKDjrzf2IEgEJVrb2R/mpI2g7Tyv 6wIo3xYFZHL1bFVKpX8OxfYhWR4IEvunE2VNI7fFk821VVOPLsCzXde/3GUknD5m27l5 HZVO1Yw/Gi9HBMNWzhCDmyxaD/P5aNNkfrtgzCHiCXRCU1MHeM3jmxJ/m9qk1DGAjtPM oiOlKvP3wBTXE0I2d9OyxHOJW+VCv7tXVeiRg4oWWcTScTAJb42I8RaC06BTfx8jks+1 Xngr/0uvoof6R+7kQ68FBuRrzNwhBLy5sC7y1lE2RxNzqQRw7pZlb0hhOGrxFN3cXU19 9ddw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=FUUWRYtwa278VZrUKwI2J5+6Tu8CghM2hw9X/xV8zwA=; b=ShR1bAFyK/isk1yVq1OdSOyeX0KyPBRalIKhgzhyqkgTQcjy9RUBYxu9Vr9ODPKRSH YylgIwp/U8Q8eqhQu0bNTJMEXQHo4k/apBzipiTPelSMEa6w61YksXGq76zOaPhRG5lb 5DQZvdS6fM5ij2v/bOs/9TfGqNK/zMZ5OuSCXlxPAJ8A3sy/EuAUsCqhaBzWfBjhX/xk 1SJK/ybVoRmju3L7LwapYV8UjYuVBp3TyBT+626lgXLAMfhFU+KwLeaZOW2603t6D5kw olO+XUEv91wdpExKjVoGhM+yyQOt4yc8jmQqrgZUvdMh4Q2Xogw+2bzGxMseOqoKos/Y 3EvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vscwwgwh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 4si937409yby.309.2018.01.09.23.56.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 09 Jan 2018 23:56:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vscwwgwh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZBFA-0005mG-Dr for patch@linaro.org; Wed, 10 Jan 2018 02:56:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZBEq-0005lD-2h for qemu-devel@nongnu.org; Wed, 10 Jan 2018 02:55:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZBEo-0000gj-Tb for qemu-devel@nongnu.org; Wed, 10 Jan 2018 02:55:56 -0500 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:38981) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZBEo-0000fz-Ny for qemu-devel@nongnu.org; Wed, 10 Jan 2018 02:55:54 -0500 Received: by mail-pl0-x241.google.com with SMTP id bi12so6826171plb.6 for ; Tue, 09 Jan 2018 23:55:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=FUUWRYtwa278VZrUKwI2J5+6Tu8CghM2hw9X/xV8zwA=; b=VscwwgwhfPW8W7L8zrLf6ul1+iY9IAzWrEGZrYvov/bhMsc5QcZyRVO929bf/trwWd lykzL4OZgfvANeMvh+rp9Gc0xr9pfIzDm8tgi2+6fHolL+JKghlWPztgqcU2HnVtR+VH RToOwRGLvODgWpxkXdF5aPpxV6/w/GlwWv97g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=FUUWRYtwa278VZrUKwI2J5+6Tu8CghM2hw9X/xV8zwA=; b=ZkI9UvdY4PjloX3LwFhlzdaFsDbT8WOC1dr7y3bU2xEgFN2wthFM3c3VWjR0F0XA8G QMaaYVUU00D+JJIakDefX8RVWA0obwXEluDDY/HAHfiIh2Nu/bW3HMni/EJ6toE52mSo 9mCxCA0p8z/tqhVtbu2wi2cBPYWsYBlWhbvN6/boFKUuprl0Zme8VpBNJVwia+S+/XNL adDIhVF2DWg7f2lqukuzfbS+57ziI/0zsQGAdpDtcV7npYCpiB209miSdpznRmxLK/Ut bgBPHFCtOFMrMNIp6Efph+abvvzS0sxLizVy6UY5rZykmJgCMTjN0vMjvx/8dVhW+ZeC 7D6g== X-Gm-Message-State: AKGB3mKLtuq5mC55MZMDb0VsAGPrcD3+NdMV3SHtkLh8bFyjuF//NDz1 eTZarS40gDHD2OTeiOpaUrOSFqBLKLc= X-Received: by 10.159.247.136 with SMTP id e8mr12933988pls.388.1515570953322; Tue, 09 Jan 2018 23:55:53 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-183-164.tukw.qwest.net. [97.113.183.164]) by smtp.gmail.com with ESMTPSA id h80sm15740147pfj.12.2018.01.09.23.55.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jan 2018 23:55:52 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 9 Jan 2018 23:55:47 -0800 Message-Id: <20180110075547.15841-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180110075547.15841-1-richard.henderson@linaro.org> References: <20180110075547.15841-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH 2/2] tcg/ppc: Allow a 32-bit offset to the constant pool 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We recently relaxed the limit of the number of opcodes that can appear in a TranslationBlock. In certain cases this has resulted in relocation overflow. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.inc.c | 67 ++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 28 deletions(-) -- 2.14.3 diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 74f9b4aa34..86f7de5f7e 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -222,33 +222,6 @@ static inline void tcg_out_bc_noaddr(TCGContext *s, int insn) tcg_out32(s, insn | retrans); } -static void patch_reloc(tcg_insn_unit *code_ptr, int type, - intptr_t value, intptr_t addend) -{ - tcg_insn_unit *target; - tcg_insn_unit old; - - value += addend; - target = (tcg_insn_unit *)value; - - switch (type) { - case R_PPC_REL14: - reloc_pc14(code_ptr, target); - break; - case R_PPC_REL24: - reloc_pc24(code_ptr, target); - break; - case R_PPC_ADDR16: - assert(value == (int16_t)value); - old = *code_ptr; - old = deposit32(old, 0, 16, value); - *code_ptr = old; - break; - default: - tcg_abort(); - } -} - /* parse target specific constraints */ static const char *target_parse_constraint(TCGArgConstraint *ct, const char *ct_str, TCGType type) @@ -552,6 +525,43 @@ static const uint32_t tcg_to_isel[] = { [TCG_COND_GTU] = ISEL | BC_(7, CR_GT), }; +static void patch_reloc(tcg_insn_unit *code_ptr, int type, + intptr_t value, intptr_t addend) +{ + tcg_insn_unit *target; + tcg_insn_unit old; + + value += addend; + target = (tcg_insn_unit *)value; + + switch (type) { + case R_PPC_REL14: + reloc_pc14(code_ptr, target); + break; + case R_PPC_REL24: + reloc_pc24(code_ptr, target); + break; + case R_PPC_ADDR16: + /* We are abusing this relocation type. This points to a pair + of insns, addis + load. If the displacement is small, we + can nop out the addis. */ + if (value == (int16_t)value) { + code_ptr[0] = NOP; + old = deposit32(code_ptr[1], 0, 16, value); + code_ptr[1] = deposit32(old, 16, 5, TCG_REG_TB); + } else { + int16_t lo = value; + int hi = value - lo; + assert(hi + lo == value); + code_ptr[0] = deposit32(code_ptr[0], 0, 16, hi >> 16); + code_ptr[1] = deposit32(code_ptr[1], 0, 16, lo); + } + break; + default: + g_assert_not_reached(); + } +} + static void tcg_out_mem_long(TCGContext *s, int opi, int opx, TCGReg rt, TCGReg base, tcg_target_long offset); @@ -690,7 +700,8 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, if (!in_prologue && USE_REG_TB) { new_pool_label(s, arg, R_PPC_ADDR16, s->code_ptr, -(intptr_t)s->code_gen_ptr); - tcg_out32(s, LD | TAI(ret, TCG_REG_TB, 0)); + tcg_out32(s, ADDIS | TAI(ret, TCG_REG_TB, 0)); + tcg_out32(s, LD | TAI(ret, ret, 0)); return; }