From patchwork Thu Jun 23 18:03:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 639819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rb8hh4Q4bz9s9d for ; Fri, 24 Jun 2016 04:13:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=l4raMXaE; dkim-atps=neutral Received: from localhost ([::1]:38550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG97i-0002qb-7G for incoming@patchwork.ozlabs.org; Thu, 23 Jun 2016 14:13:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8yb-0001he-LJ for qemu-devel@nongnu.org; Thu, 23 Jun 2016 14:03:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG8yV-0000BP-MC for qemu-devel@nongnu.org; Thu, 23 Jun 2016 14:03:41 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:36483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8yV-0000BK-Gx for qemu-devel@nongnu.org; Thu, 23 Jun 2016 14:03:35 -0400 Received: by mail-qk0-x241.google.com with SMTP id l81so17138661qke.3 for ; Thu, 23 Jun 2016 11:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5QT1E9DW5EQiIryuP8AqjqiSLTOLOJSTWSGA8FGK1/Y=; b=l4raMXaEFshqqXc8FKDuWh/UM5fmAqcxtsAmqY+SVhvd1z7dD9z0qfjufVpSqQTBNV Q5j0ayFzDXBdWorWGdt0ikNf73ZMfkRIBsg+iBdj+3t1uBwxpulAMlFC+mIBICj91RKH jHks8v5IUSitLlFvc2IDYQ8FoOgvyxK4ArtM2tytYqBW3tNSzC9uIfKff0sRMOxlB9Rw 6zs84CShEA3+iRGnkAkMGnqF9xNafMBCgn1+1peTkON2yODeavySCTZvqF1F1DVyFr+b 6C6G5CCYvKg8ILDZGpwa/32IPUVegXsFYrPVCRtWliZ5ZJsbQH2c7MGxO1cMySLOo2So qEGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5QT1E9DW5EQiIryuP8AqjqiSLTOLOJSTWSGA8FGK1/Y=; b=Oe+reLofOfWNjFxFMjaqm/Cymx9aek/yHLiAGLfPEzo/8wr1B9bWztomzZqkUCQOF9 XsLveGQ+3oojOKN+AVrIP4lQ/Ai/CA0O8RJmVl2sHd0LgxUiVZ6Bj5J473F73X5S277t eLlJvX9kVaVVFyaovZL1VoNyKttaj8HDE/+aM4TpUOKioTE4WmJNuTd3j/biEvj/ICh3 ui2uvXBf5kO1TZmYDLPo7SmQLBblij3pIIFzFOsu7HM+98z23LqWhawAk1C8sucxTK50 moIlblTmFo5roeAzYqQqbtciyNixjTXdwfGz56RzjyxvhnZv0RJpgnS8FMa6OYUDpH4H B+/A== X-Gm-Message-State: ALyK8tJoplW8VB6I/Ht4fFNoPjZK7mJiZ7MmzjyLiP/5rRKJsBDSrj956z6oaHIvWE+bpw== X-Received: by 10.200.56.230 with SMTP id g35mr47244665qtc.4.1466705015007; Thu, 23 Jun 2016 11:03:35 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id 13sm519937qki.3.2016.06.23.11.03.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2016 11:03:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 23 Jun 2016 11:03:00 -0700 Message-Id: <1466704982-5919-3-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466704982-5919-1-git-send-email-rth@twiddle.net> References: <1466704982-5919-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 2/4] tcg: Reorg TCGOp chaining 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: aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instead of using -1 as end of chain, use 0, and link through the 0 entry as a fully circular double-linked list. Signed-off-by: Richard Henderson --- include/exec/gen-icount.h | 2 +- tcg/optimize.c | 8 ++------ tcg/tcg-op.c | 2 +- tcg/tcg.c | 32 ++++++++++++-------------------- tcg/tcg.h | 20 ++++++++++++-------- 5 files changed, 28 insertions(+), 36 deletions(-) diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index a011324..5f16077 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -59,7 +59,7 @@ static void gen_tb_end(TranslationBlock *tb, int num_insns) } /* Terminate the linked list. */ - tcg_ctx.gen_op_buf[tcg_ctx.gen_last_op_idx].next = -1; + tcg_ctx.gen_op_buf[tcg_ctx.gen_op_buf[0].prev].next = 0; } static inline void gen_io_start(void) diff --git a/tcg/optimize.c b/tcg/optimize.c index c0d975b..8df7fc7 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -103,11 +103,7 @@ static TCGOp *insert_op_before(TCGContext *s, TCGOp *old_op, .prev = prev, .next = next }; - if (prev >= 0) { - s->gen_op_buf[prev].next = oi; - } else { - s->gen_first_op_idx = oi; - } + s->gen_op_buf[prev].next = oi; old_op->prev = oi; return new_op; @@ -583,7 +579,7 @@ void tcg_optimize(TCGContext *s) nb_globals = s->nb_globals; reset_all_temps(nb_temps); - for (oi = s->gen_first_op_idx; oi >= 0; oi = oi_next) { + for (oi = s->gen_op_buf[0].next; oi != 0; oi = oi_next) { tcg_target_ulong mask, partmask, affected; int nb_oargs, nb_iargs, i; TCGArg tmp; diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 569cdc6..62d91b4 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -52,7 +52,7 @@ static void tcg_emit_op(TCGContext *ctx, TCGOpcode opc, int args) int pi = oi - 1; tcg_debug_assert(oi < OPC_BUF_SIZE); - ctx->gen_last_op_idx = oi; + ctx->gen_op_buf[0].prev = oi; ctx->gen_next_op_idx = ni; ctx->gen_op_buf[oi] = (TCGOp){ diff --git a/tcg/tcg.c b/tcg/tcg.c index 4b117fd..3e884e4 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -438,9 +438,9 @@ void tcg_func_start(TCGContext *s) s->goto_tb_issue_mask = 0; #endif - s->gen_first_op_idx = 0; - s->gen_last_op_idx = -1; - s->gen_next_op_idx = 0; + s->gen_op_buf[0].next = 1; + s->gen_op_buf[0].prev = 0; + s->gen_next_op_idx = 1; s->gen_next_parm_idx = 0; s->be = tcg_malloc(sizeof(TCGBackendData)); @@ -869,7 +869,7 @@ void tcg_gen_callN(TCGContext *s, void *func, TCGArg ret, /* Make sure the calli field didn't overflow. */ tcg_debug_assert(s->gen_op_buf[i].calli == real_args); - s->gen_last_op_idx = i; + s->gen_op_buf[0].prev = i; s->gen_next_op_idx = i + 1; s->gen_next_parm_idx = pi; @@ -1005,7 +1005,7 @@ void tcg_dump_ops(TCGContext *s) TCGOp *op; int oi; - for (oi = s->gen_first_op_idx; oi >= 0; oi = op->next) { + for (oi = s->gen_op_buf[0].next; oi != 0; oi = op->next) { int i, k, nb_oargs, nb_iargs, nb_cargs; const TCGOpDef *def; const TCGArg *args; @@ -1017,7 +1017,7 @@ void tcg_dump_ops(TCGContext *s) args = &s->gen_opparam_buf[op->args]; if (c == INDEX_op_insn_start) { - qemu_log("%s ----", oi != s->gen_first_op_idx ? "\n" : ""); + qemu_log("%s ----", oi != s->gen_op_buf[0].next ? "\n" : ""); for (i = 0; i < TARGET_INSN_START_WORDS; ++i) { target_ulong a; @@ -1288,18 +1288,10 @@ void tcg_op_remove(TCGContext *s, TCGOp *op) int next = op->next; int prev = op->prev; - if (next >= 0) { - s->gen_op_buf[next].prev = prev; - } else { - s->gen_last_op_idx = prev; - } - if (prev >= 0) { - s->gen_op_buf[prev].next = next; - } else { - s->gen_first_op_idx = next; - } + s->gen_op_buf[next].prev = prev; + s->gen_op_buf[prev].next = next; - memset(op, -1, sizeof(*op)); + memset(op, 0, sizeof(*op)); #ifdef CONFIG_PROFILER s->del_op_count++; @@ -1346,7 +1338,7 @@ static void tcg_liveness_analysis(TCGContext *s) mem_temps = tcg_malloc(s->nb_temps); tcg_la_func_end(s, dead_temps, mem_temps); - for (oi = s->gen_last_op_idx; oi >= 0; oi = oi_prev) { + for (oi = s->gen_op_buf[0].prev; oi != 0; oi = oi_prev) { int i, nb_iargs, nb_oargs; TCGOpcode opc_new, opc_new2; bool have_opc_new2; @@ -2341,7 +2333,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) { int n; - n = s->gen_last_op_idx + 1; + n = s->gen_op_buf[0].prev + 1; s->op_count += n; if (n > s->op_count_max) { s->op_count_max = n; @@ -2400,7 +2392,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) tcg_out_tb_init(s); num_insns = -1; - for (oi = s->gen_first_op_idx; oi >= 0; oi = oi_next) { + for (oi = s->gen_op_buf[0].next; oi != 0; oi = oi_next) { TCGOp * const op = &s->gen_op_buf[oi]; TCGArg * const args = &s->gen_opparam_buf[op->args]; TCGOpcode opc = op->opc; diff --git a/tcg/tcg.h b/tcg/tcg.h index cc14560..49b396d 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -520,17 +520,21 @@ typedef struct TCGOp { unsigned callo : 2; unsigned calli : 6; - /* Index of the arguments for this op, or -1 for zero-operand ops. */ - signed args : 16; + /* Index of the arguments for this op, or 0 for zero-operand ops. */ + unsigned args : 16; - /* Index of the prex/next op, or -1 for the end of the list. */ - signed prev : 16; - signed next : 16; + /* Index of the prex/next op, or 0 for the end of the list. */ + unsigned prev : 16; + unsigned next : 16; } TCGOp; -QEMU_BUILD_BUG_ON(NB_OPS > 0xff); -QEMU_BUILD_BUG_ON(OPC_BUF_SIZE >= 0x7fff); -QEMU_BUILD_BUG_ON(OPPARAM_BUF_SIZE >= 0x7fff); +/* Make sure operands fit in the bitfields above. */ +QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8)); +QEMU_BUILD_BUG_ON(OPC_BUF_SIZE > (1 << 16)); +QEMU_BUILD_BUG_ON(OPPARAM_BUF_SIZE > (1 << 16)); + +/* Make sure that we don't overflow 64 bits without noticing. */ +QEMU_BUILD_BUG_ON(sizeof(TCGOp) > 8); struct TCGContext { uint8_t *pool_cur, *pool_end;