From patchwork Tue Jan 16 03:33:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 124581 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp875734lje; Mon, 15 Jan 2018 19:37:05 -0800 (PST) X-Google-Smtp-Source: ACJfBovx+Qd3C6pOwgvoIA5K8jEd2iPpp7/1DirPaEai6ctW94ew3KfS/6ia/7kZGYpWoi/LNTkN X-Received: by 10.37.186.14 with SMTP id t14mr34585558ybg.86.1516073825634; Mon, 15 Jan 2018 19:37:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516073825; cv=none; d=google.com; s=arc-20160816; b=aiNuqvbCyD7HA5jljklgM4voWjrf4rVd3u3PavcTY6PMUZ/FH4pMWg9W+gzQTdRNwt UUB1fFK+1j3v//AyzKMXBuO+tMIMARjWqGDw5SQZnVwSxPw26kfnWeIGJa9SCfeOHTaj 1V794vmn8PqH2HDetlJjb9mgYj0PCqgFLBv/dhWTXZF9KNIVv/U6d7r8m4BPIUBno1xS RAnRylf4XiBHHBEswo/RcTKVJMJGroLrLNQkDFhXk6TgizvGsFUp5xscQJMutz9IWqYF 9r0m5cC4v2/H7RwFz3b7GGxsQVoY5VxjBp2noyatUXm4LOEvyLZ+V63sIMAlj7ajlzPv YhiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=hWNeV+zOx+oAfKu9VCxGrhv2jH/fOaNDlWpbf3/FB4Y=; b=qo3bK6UOoGrBJz/kiHP9HPV+2aoyZu4g4FijQxpGsXxvpObphcP6pRaQHG79oQeVds j1tFB+WFGwpOqq83mnzgfxYsQke6yA3LR1IChaP/3+t3kL2TO5WwmCOJQwo3oDYiPxzW AAGzqZg5tvykyYL2dIUKzgHKty0X5xTrDz9hg5yhnH3ZeX9b4BykyAugwro12ry4gPpO Gm/ICb2OiKNCeZ5+qCmUpHtQPBIBtHeihxdFuwHnZv+JovUkKoFHx7+a9YAsfjSk/kVp lsUbvDep5Uvo1j59VtouwJT5HkkCu9bvI87YsD8TyOCkEYvKy+RPutzaA9LkBvCXAZLG vqyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Yar3j62Q; 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 v184si293341ybe.90.2018.01.15.19.37.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 15 Jan 2018 19:37:05 -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=Yar3j62Q; 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]:59098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebI3c-00061p-UJ for patch@linaro.org; Mon, 15 Jan 2018 22:37:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebI0r-0004l2-PJ for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:34:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebI0q-00038o-NA for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:34:13 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:40722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebI0q-00038Z-FH for qemu-devel@nongnu.org; Mon, 15 Jan 2018 22:34:12 -0500 Received: by mail-pf0-x242.google.com with SMTP id i66so8983685pfd.7 for ; Mon, 15 Jan 2018 19:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hWNeV+zOx+oAfKu9VCxGrhv2jH/fOaNDlWpbf3/FB4Y=; b=Yar3j62QzcUuG8eM6YYw9ezZBcA1BLo2B2mmu/NFxCXTbOiOgwHgChQ/e5egmTHNaN FW+LQuLqk9fAgMKZ141y+7C7uDGMMSqrM7gbxnVl6HUlafNGGUzoCiyUhuIBZYs9u3oA xKvBeL/HI1VO4+fw1XNIOFYrcUSU4sCbQkmY0= 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; bh=hWNeV+zOx+oAfKu9VCxGrhv2jH/fOaNDlWpbf3/FB4Y=; b=ngWrFCF6AJLN93HXu4sfwRau+XmoWqq5ltCYLSSN7a13Ob6+ETfRC8GGNqKdFGl2tV +JMnhbjDTdhGjxZP4kKK23QEgtgYhUh/gw5brVVEYG5a1C5P6v+le6s7JwOex21MtIHN 1ORdT94umaCmvdQ/LXvHk/6wqhFqfse49OHGcEFJ+D3EzqjRrWyXmc0sHLvoZmzvFwcs z+fr7cOymxz7rtHQ9JTxxKR7w7zcg7HYegel/qPCAtuvRGYMx2LC3iD7/XfAXr/jbmIA 5QTy/RrS3lHd/ASDXJcRDoPm3gNhF9QZZVgj5LoRc8PA/8riZFjjTO03H5dbUdtq35EE 1F9A== X-Gm-Message-State: AKwxytcpL0jluhSFYg+zCyzyKWB5PHkHEMlk+OhzCAbRh/IgHKYaY3A9 9uUESeiegNeHiDg3V9P+A29fkBXQkeM= X-Received: by 10.101.82.1 with SMTP id o1mr18597905pgp.259.1516073651104; Mon, 15 Jan 2018 19:34:11 -0800 (PST) Received: from cloudburst.twiddle.net.com (24-181-135-57.dhcp.knwc.wa.charter.com. [24.181.135.57]) by smtp.gmail.com with ESMTPSA id c83sm1281024pfk.8.2018.01.15.19.34.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2018 19:34:10 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 19:33:39 -0800 Message-Id: <20180116033404.31532-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180116033404.31532-1-richard.henderson@linaro.org> References: <20180116033404.31532-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:c00::242 Subject: [Qemu-devel] [PATCH v9 01/26] tcg: Allow multiple word entries into 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will be required for storing vector constants. Signed-off-by: Richard Henderson --- tcg/tcg-pool.inc.c | 115 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 93 insertions(+), 22 deletions(-) -- 2.14.3 diff --git a/tcg/tcg-pool.inc.c b/tcg/tcg-pool.inc.c index 8a85131405..0f76e7bee3 100644 --- a/tcg/tcg-pool.inc.c +++ b/tcg/tcg-pool.inc.c @@ -22,39 +22,110 @@ typedef struct TCGLabelPoolData { struct TCGLabelPoolData *next; - tcg_target_ulong data; tcg_insn_unit *label; - intptr_t addend; - int type; + int addend : 32; + int rtype : 16; + int nlong : 16; + tcg_target_ulong data[]; } TCGLabelPoolData; -static void new_pool_label(TCGContext *s, tcg_target_ulong data, int type, - tcg_insn_unit *label, intptr_t addend) +static TCGLabelPoolData *new_pool_alloc(TCGContext *s, int nlong, int rtype, + tcg_insn_unit *label, int addend) { - TCGLabelPoolData *n = tcg_malloc(sizeof(*n)); - TCGLabelPoolData *i, **pp; + TCGLabelPoolData *n = tcg_malloc(sizeof(TCGLabelPoolData) + + sizeof(tcg_target_ulong) * nlong); - n->data = data; n->label = label; - n->type = type; n->addend = addend; + n->rtype = rtype; + n->nlong = nlong; + return n; +} + +static void new_pool_insert(TCGContext *s, TCGLabelPoolData *n) +{ + TCGLabelPoolData *i, **pp; + int nlong = n->nlong; /* Insertion sort on the pool. */ - for (pp = &s->pool_labels; (i = *pp) && i->data < data; pp = &i->next) { - continue; + for (pp = &s->pool_labels; (i = *pp) != NULL; pp = &i->next) { + if (nlong > i->nlong) { + break; + } + if (nlong < i->nlong) { + continue; + } + if (memcmp(n->data, i->data, sizeof(tcg_target_ulong) * nlong) >= 0) { + break; + } } n->next = *pp; *pp = n; } +/* The "usual" for generic integer code. */ +static inline void new_pool_label(TCGContext *s, tcg_target_ulong d, int rtype, + tcg_insn_unit *label, int addend) +{ + TCGLabelPoolData *n = new_pool_alloc(s, 1, rtype, label, addend); + n->data[0] = d; + new_pool_insert(s, n); +} + +/* For v64 or v128, depending on the host. */ +static inline void new_pool_l2(TCGContext *s, int rtype, tcg_insn_unit *label, + int addend, tcg_target_ulong d0, + tcg_target_ulong d1) +{ + TCGLabelPoolData *n = new_pool_alloc(s, 2, rtype, label, addend); + n->data[0] = d0; + n->data[1] = d1; + new_pool_insert(s, n); +} + +/* For v128 or v256, depending on the host. */ +static inline void new_pool_l4(TCGContext *s, int rtype, tcg_insn_unit *label, + int addend, tcg_target_ulong d0, + tcg_target_ulong d1, tcg_target_ulong d2, + tcg_target_ulong d3) +{ + TCGLabelPoolData *n = new_pool_alloc(s, 4, rtype, label, addend); + n->data[0] = d0; + n->data[1] = d1; + n->data[2] = d2; + n->data[3] = d3; + new_pool_insert(s, n); +} + +/* For v256, for 32-bit host. */ +static inline void new_pool_l8(TCGContext *s, int rtype, tcg_insn_unit *label, + int addend, tcg_target_ulong d0, + tcg_target_ulong d1, tcg_target_ulong d2, + tcg_target_ulong d3, tcg_target_ulong d4, + tcg_target_ulong d5, tcg_target_ulong d6, + tcg_target_ulong d7) +{ + TCGLabelPoolData *n = new_pool_alloc(s, 8, rtype, label, addend); + n->data[0] = d0; + n->data[1] = d1; + n->data[2] = d2; + n->data[3] = d3; + n->data[4] = d4; + n->data[5] = d5; + n->data[6] = d6; + n->data[7] = d7; + new_pool_insert(s, n); +} + /* To be provided by cpu/tcg-target.inc.c. */ static void tcg_out_nop_fill(tcg_insn_unit *p, int count); static bool tcg_out_pool_finalize(TCGContext *s) { TCGLabelPoolData *p = s->pool_labels; - tcg_target_ulong d, *a; + TCGLabelPoolData *l = NULL; + void *a; if (p == NULL) { return true; @@ -62,24 +133,24 @@ static bool tcg_out_pool_finalize(TCGContext *s) /* ??? Round up to qemu_icache_linesize, but then do not round again when allocating the next TranslationBlock structure. */ - a = (void *)ROUND_UP((uintptr_t)s->code_ptr, sizeof(tcg_target_ulong)); + a = (void *)ROUND_UP((uintptr_t)s->code_ptr, + sizeof(tcg_target_ulong) * p->nlong); tcg_out_nop_fill(s->code_ptr, (tcg_insn_unit *)a - s->code_ptr); s->data_gen_ptr = a; - /* Ensure the first comparison fails. */ - d = p->data + 1; - for (; p != NULL; p = p->next) { - if (p->data != d) { - d = p->data; - if (unlikely((void *)a > s->code_gen_highwater)) { + size_t size = sizeof(tcg_target_ulong) * p->nlong; + if (!l || l->nlong != p->nlong || memcmp(l->data, p->data, size)) { + if (unlikely(a > s->code_gen_highwater)) { return false; } - *a++ = d; + memcpy(a, p->data, size); + a += size; + l = p; } - patch_reloc(p->label, p->type, (intptr_t)(a - 1), p->addend); + patch_reloc(p->label, p->rtype, (intptr_t)a - size, p->addend); } - s->code_ptr = (void *)a; + s->code_ptr = a; return true; }