From patchwork Tue Dec 25 20:55:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154512 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5227349ljp; Tue, 25 Dec 2018 13:30:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN6ICqNTa2Hqn3KJbrnAOjLthf0UrKqjMqLazYmse9fjmgzWfTkyd8mkL3y1CvuGRdHoMlgw X-Received: by 2002:a37:945:: with SMTP id 66mr16029512qkj.123.1545773417217; Tue, 25 Dec 2018 13:30:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545773417; cv=none; d=google.com; s=arc-20160816; b=hahNJ7632wlHZpzJbWvnmTyilIwWvxNLA2SslIkStXerm5SLe5TZis59O4PgTgRrKT lhipvBoOtndEjd8BmBTrTxpRxY3XgXzfDzMAyk8UN/VGNg9yMFta8EOHmlY9t6qIveem d/nYXceY4jX/oywLa3lieLNpM+uHAqYPCE2Xti6UHIbaecABNOeO2Yd/cFJyRoLjhv5X pn4xzPaZEX6peVj1dbDzj67usS1FHnY2X3YU/pFNknz3xLflXlZQA7GtxL3+Cxx5MsVY cCIipSdu0FpFmpIvAcPzwXj4lGGD7U66VsyX35zpFPugO+Vf18dkdV7X99SbrCfsIem9 cb/g== 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; bh=2RCbLA3yzfhzHYJXHdFlzl/jf2El7S7Vm/chvOblVvc=; b=rlfTEY4WAQf2O5w3MyUzoeD0r2A3tUGnVGvMSXPjiPtga5ME+lTTmqHEaXq1NdfDwn X+WtuVeKn7g20CWB4nLxet1wOfkFXTTrSDB79Ujue7NArDagZyAUiX/Fwnfu1QNPTrGS WhU+9BfgsielaVH45utAR9CWM5KAQQCQcVuZWWwLB2nSiMQfh308xRn+yhoA9xyONzNF mVAVa6ResdnZqa27Rat22l+tlGLJ0qEdI5jmr8UrpzTWD7FKIWWxDn+24KLP2kVji6wQ ymi9V3NrO0u6YnpXKalL2750T4L6MTRECISIkXDiXs71Y+DIJzHA8pWolOVFOkEJV9El qSBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Oy9bfjsG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 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. [208.118.235.17]) by mx.google.com with ESMTPS id v17si1284980qkl.76.2018.12.25.13.30.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:30:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Oy9bfjsG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 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 ([127.0.0.1]:43387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbuHI-0003U8-Op for patch@linaro.org; Tue, 25 Dec 2018 16:30:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtnp-00085I-Qt for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtnp-0001jy-0J for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:49 -0500 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:34477) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtno-0001jE-Qu for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:48 -0500 Received: by mail-pg1-x52a.google.com with SMTP id j10so6829163pga.1 for ; Tue, 25 Dec 2018 12:59:48 -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=2RCbLA3yzfhzHYJXHdFlzl/jf2El7S7Vm/chvOblVvc=; b=Oy9bfjsGhy4ugZC8lufxnVscSSIk7Z+SY4NL+01UTh/ynrbjSI6svWtX0XrOCuAZP6 YE5Ya39YpU2PFinqMEUjSkuGKleAUDfgwrxWFnByGH6ueTjz4e2/99Z1FOy0p5I8qr8L MFHJH/yGGrDGQgZefvXN5lB0dEmbCoHkDmA9g= 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=2RCbLA3yzfhzHYJXHdFlzl/jf2El7S7Vm/chvOblVvc=; b=ozEFED7RH6lO/X4DUM3LfiggZ6aXV4nnDJX5tyyZ/CLg5HWghuq61ucZxxfCEBVoSn 4hD4d/bxaw+5OXtC215BJCa0CHMg7Bs9TnSx1R5y6i6G14PDUOgbKazlEizG1awvKjtX ecyl7ib6hCYhQjY0tdeaS0kFpNAhP1baGrkbqtbmh7dsqA5L5OK8hpbFCR0GSz5Ddx4k W93VCUSwzT8RVsh20PEamtMJOWGn0sEM/0xi4+KF4bt46tNJmMIxJvJ9M6TKyy1BbNlo B+RUSxQL6RFI5fsrugYUDav1lNnLBGrsgMzuMSPk5OnbLB0jRpJ2ThZA1sUdxRYNCDVl Fa5w== X-Gm-Message-State: AJcUuke/jb7NPy0uc2RwDC0gLc/jwDqn8TRl7AFaNgKEIEhn7XHLzOcZ 6W7FMzLd9js3HPfSELNdlf42jmGqTt0= X-Received: by 2002:a63:1d1d:: with SMTP id d29mr16792904pgd.49.1545771587477; Tue, 25 Dec 2018 12:59:47 -0800 (PST) Received: from cloudburst.home (c211-28-135-144.sunsh3.vic.optusnet.com.au. [211.28.135.144]) by smtp.gmail.com with ESMTPSA id t21sm48501628pgg.24.2018.12.25.12.59.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:59:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:55:23 +1100 Message-Id: <20181225205529.10874-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181225205529.10874-1-richard.henderson@linaro.org> References: <20181225205529.10874-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52a Subject: [Qemu-devel] [PULL 36/42] tcg: Dump register preference info with liveness 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" Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- tcg/tcg.h | 3 --- tcg/tcg.c | 44 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 10 deletions(-) -- 2.17.2 diff --git a/tcg/tcg.h b/tcg/tcg.h index c6721cc7a7..5e5cf686a3 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -1082,9 +1082,6 @@ TCGOp *tcg_op_insert_after(TCGContext *s, TCGOp *op, TCGOpcode opc); void tcg_optimize(TCGContext *s); -/* only used for debugging purposes */ -void tcg_dump_ops(TCGContext *s); - TCGv_i32 tcg_const_i32(int32_t val); TCGv_i64 tcg_const_i64(int64_t val); TCGv_i32 tcg_const_local_i32(int32_t val); diff --git a/tcg/tcg.c b/tcg/tcg.c index 32bac5e792..e2ae04d1d0 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1901,7 +1901,7 @@ static inline TCGReg tcg_regset_first(TCGRegSet d) } } -void tcg_dump_ops(TCGContext *s) +static void tcg_dump_ops(TCGContext *s, bool have_prefs) { char buf[128]; TCGOp *op; @@ -2036,12 +2036,15 @@ void tcg_dump_ops(TCGContext *s) col += qemu_log("%s$0x%" TCG_PRIlx, k ? "," : "", op->args[k]); } } - if (op->life) { - unsigned life = op->life; - for (; col < 48; ++col) { + if (have_prefs || op->life) { + for (; col < 40; ++col) { putc(' ', qemu_logfile); } + } + + if (op->life) { + unsigned life = op->life; if (life & (SYNC_ARG * 3)) { qemu_log(" sync:"); @@ -2061,6 +2064,33 @@ void tcg_dump_ops(TCGContext *s) } } } + + if (have_prefs) { + for (i = 0; i < nb_oargs; ++i) { + TCGRegSet set = op->output_pref[i]; + + if (i == 0) { + qemu_log(" pref="); + } else { + qemu_log(","); + } + if (set == 0) { + qemu_log("none"); + } else if (set == MAKE_64BIT_MASK(0, TCG_TARGET_NB_REGS)) { + qemu_log("all"); +#ifdef CONFIG_DEBUG_TCG + } else if (tcg_regset_single(set)) { + TCGReg reg = tcg_regset_first(set); + qemu_log("%s", tcg_target_reg_names[reg]); +#endif + } else if (TCG_TARGET_NB_REGS <= 32) { + qemu_log("%#x", (uint32_t)set); + } else { + qemu_log("%#" PRIx64, (uint64_t)set); + } + } + } + qemu_log("\n"); } } @@ -3647,7 +3677,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) && qemu_log_in_addr_range(tb->pc))) { qemu_log_lock(); qemu_log("OP:\n"); - tcg_dump_ops(s); + tcg_dump_ops(s, false); qemu_log("\n"); qemu_log_unlock(); } @@ -3675,7 +3705,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) && qemu_log_in_addr_range(tb->pc))) { qemu_log_lock(); qemu_log("OP before indirect lowering:\n"); - tcg_dump_ops(s); + tcg_dump_ops(s, false); qemu_log("\n"); qemu_log_unlock(); } @@ -3696,7 +3726,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) && qemu_log_in_addr_range(tb->pc))) { qemu_log_lock(); qemu_log("OP after optimization and liveness analysis:\n"); - tcg_dump_ops(s); + tcg_dump_ops(s, true); qemu_log("\n"); qemu_log_unlock(); }