From patchwork Fri Dec 30 00:02:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 637848 Delivered-To: patch@linaro.org Received: by 2002:a17:906:1189:b0:7d5:1b03:224a with SMTP id n9csp4172743eja; Thu, 29 Dec 2022 16:18:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXtwjTe9QyuUGnHmRdOS5EpSZ2lz599zOmfJ8f3OHoMgJ/mXn8A2toQa8xQVU1RDiEmWkhhr X-Received: by 2002:ac8:7ef8:0:b0:3a5:8688:89db with SMTP id r24-20020ac87ef8000000b003a5868889dbmr44033639qtc.48.1672359509215; Thu, 29 Dec 2022 16:18:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672359509; cv=none; d=google.com; s=arc-20160816; b=HPf6FOhEBN9fxHr8/13hO+xpt5Yq3YhD6CrpCVRRzy4Z3d4fcZnqeTuhETTXXjC+wf rhaRW4x+orhP3QPIfU3wupoS9iI5HPpD5BzPW5udTkIfVX4QIspcPBBjRhzfvv6u9ngg tTutCzWgy0dDaUM3xvQhvVGgTyDxAPEn+LHf5tnZEMFerBG4unDGKq1U+wYAfQXHMmtZ MUxX/oKdjpZgEWMdICQjiA2X4c5KRdHMgAVDfR/IqASTLFYw4EkHvkeC45cOpUaas14E fFe/2WrndWq1wqMLKiebL5W0fHS38C55cXT9TQIQ9UMCFNyiyiyx+f21iX05JyygXk7Q xgKQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ki3ZWlzYefaheNWHG2Yd28+L0tOroJcHx9O8WcgrZBo=; b=X+90Cowr//yKfSJRKHCRjKZWX9w9zVVLwFqXGgzyen6/NYcXlKuHPhvJa/6R+rv/tI w1pelIV+kX3tVuzAVP4xFE4jaCpD+Ncf46f6cR6tEMq+0Uv+jgVRC0bFyVfZKFLKqChg Q2IuF8s3Cet0Cxy4tT1I0SVE/+1kUSDKot++MfQW9S51QC/V5dvRD5JX2t3O9nkzSEnP 6gAz0eQCPu7XRFaMxLM0PKrU4LUY8rnBmcs2dIM9HG+zKRShhfdl0lb783HlTunR8cpJ XgCZFt6Ry3SoG9pkTyr9DyVXJyYvJ73B+LnBQhkfmkg3NsECiyW8lLGoMCavjBikCDrY 2+Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mz9j4mEF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i8-20020a05620a248800b006ff04dc84cdsi9561892qkn.492.2022.12.29.16.18.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Dec 2022 16:18:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mz9j4mEF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pB2rf-0003C2-7m; Thu, 29 Dec 2022 19:03:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pB2rY-00039W-7q for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:03:05 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pB2rS-0002i3-6p for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:03:04 -0500 Received: by mail-pl1-x62f.google.com with SMTP id y19so1329488plb.2 for ; Thu, 29 Dec 2022 16:02:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ki3ZWlzYefaheNWHG2Yd28+L0tOroJcHx9O8WcgrZBo=; b=Mz9j4mEFtIMNllzR5//SL/PKLQGnnVI56p5g1JTsEOe6Q3ZBkh3fhZjLJicJrQXgyj L1/G4SZhWqCGcVVU5Ds6BFcdCh0e+pFUc//s3ShVCbEtoxxKG3Kp68FvWqP2YbZjfk03 hMJtUvy4kcJaO+VJBMC0fEWxDOQCl4AQtIwgmGgrHDy0LQHqAvUwMPG6cgeTD2dJFgnP 8Fx8zS11AyJKCZuyyrkOmLELHLU2aneznbElwN9qbf1wYGyLPrbXSUAFzHpl0QqRS+6L ZnOoOUuAFcpFJPtYemdtmElAWcL5mRQicVVT9NLX2+tYZ8iLtlB1D9WmYxc7xbrQP+JY 2H+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ki3ZWlzYefaheNWHG2Yd28+L0tOroJcHx9O8WcgrZBo=; b=jxvwLCWE3EOnL+kH9A4CMAEUg5MjJJdfCzey3ciOB/Aj19lDDK9/ZTjc03PTmp7sh7 Bhhf2/VTOts0GPtmhWdYpV9PE5O2oAqp9Onp6LnfZIgRMoI98dn11b2lZezWkSSq04L3 Qapv9MYNpzvGjuVWKo0mILr+9Vk4Ir9orNzF5Ok/i+fcSrA1fhzDBiG71e6azN7IDGby HPrPXc5as4ftFdvK625+MKxpPvNDZCOF7I14y8ADZt+NE6RNwtTnyan7Mv8ktTFbY4sL ExcHN7eF0QVD5+W8UKmPx+CZ/mB1fVfJm9UQR+49sw9rAtCsCuaJfJgpyGIK4IHBgdjY UqaA== X-Gm-Message-State: AFqh2krtMFYlfwJ3A0d/1IHy4v2M4Bk2ocCyXmqu4AKeey1TJcHhLSUX ZKsIzMPDFjmZivpAN6zMldIEH9uBdK9SIfbW X-Received: by 2002:a17:902:e2ca:b0:18e:c6b0:b2f6 with SMTP id l10-20020a170902e2ca00b0018ec6b0b2f6mr28012388plc.14.1672358577004; Thu, 29 Dec 2022 16:02:57 -0800 (PST) Received: from stoup.. (76-14-210-194.or.wavecable.com. [76.14.210.194]) by smtp.gmail.com with ESMTPSA id j14-20020a170903028e00b00192849e1d0asm7343953plr.116.2022.12.29.16.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 16:02:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 37/47] tcg: Use output_pref wrapper function Date: Thu, 29 Dec 2022 16:02:11 -0800 Message-Id: <20221230000221.2764875-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221230000221.2764875-1-richard.henderson@linaro.org> References: <20221230000221.2764875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org We will shortly have the possibility of more that two outputs, though only for calls (for which preferences are moot). Avoid direct references to op->output_pref[] when possible. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 5 +++++ tcg/tcg.c | 34 ++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index d430ea10c8..a6310b898f 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -518,6 +518,11 @@ typedef struct TCGOp { /* Make sure operands fit in the bitfields above. */ QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8)); +static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) +{ + return i < ARRAY_SIZE(op->output_pref) ? op->output_pref[i] : 0; +} + typedef struct TCGProfile { int64_t cpu_exec_time; int64_t tb_count1; diff --git a/tcg/tcg.c b/tcg/tcg.c index 0fd41d5951..b84cc3cad3 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1966,7 +1966,7 @@ static void tcg_dump_ops(TCGContext *s, FILE *f, bool have_prefs) if (have_prefs) { for (i = 0; i < nb_oargs; ++i) { - TCGRegSet set = op->output_pref[i]; + TCGRegSet set = output_pref(op, i); if (i == 0) { ne_fprintf(f, " pref="); @@ -2636,11 +2636,11 @@ static void liveness_pass_1(TCGContext *s) } ts->state = TS_DEAD; la_reset_pref(ts); - - /* Not used -- it will be tcg_target_call_oarg_regs[i]. */ - op->output_pref[i] = 0; } + /* Not used -- it will be tcg_target_call_oarg_reg(). */ + memset(op->output_pref, 0, sizeof(op->output_pref)); + if (!(call_flags & (TCG_CALL_NO_WRITE_GLOBALS | TCG_CALL_NO_READ_GLOBALS))) { la_global_kill(s, nb_globals); @@ -2802,7 +2802,9 @@ static void liveness_pass_1(TCGContext *s) ts = arg_temp(op->args[i]); /* Remember the preference of the uses that followed. */ - op->output_pref[i] = *la_temp_pref(ts); + if (i < ARRAY_SIZE(op->output_pref)) { + op->output_pref[i] = *la_temp_pref(ts); + } /* Output args are dead. */ if (ts->state & TS_DEAD) { @@ -2872,7 +2874,7 @@ static void liveness_pass_1(TCGContext *s) set &= ct->regs; if (ct->ialias) { - set &= op->output_pref[ct->alias_index]; + set &= output_pref(op, ct->alias_index); } /* If the combination is not possible, restart. */ if (set == 0) { @@ -3539,7 +3541,7 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) TCGReg oreg, ireg; allocated_regs = s->reserved_regs; - preferred_regs = op->output_pref[0]; + preferred_regs = output_pref(op, 0); ots = arg_temp(op->args[0]); ts = arg_temp(op->args[1]); @@ -3656,7 +3658,7 @@ static void tcg_reg_alloc_dup(TCGContext *s, const TCGOp *op) if (IS_DEAD_ARG(1)) { temp_dead(s, its); } - tcg_reg_alloc_do_movi(s, ots, val, arg_life, op->output_pref[0]); + tcg_reg_alloc_do_movi(s, ots, val, arg_life, output_pref(op, 0)); return; } @@ -3673,7 +3675,7 @@ static void tcg_reg_alloc_dup(TCGContext *s, const TCGOp *op) tcg_regset_set_reg(allocated_regs, its->reg); } oreg = tcg_reg_alloc(s, dup_out_regs, allocated_regs, - op->output_pref[0], ots->indirect_base); + output_pref(op, 0), ots->indirect_base); set_temp_val_reg(s, ots, oreg); } @@ -3792,7 +3794,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) switch (arg_ct->pair) { case 0: /* not paired */ if (arg_ct->ialias) { - i_preferred_regs = op->output_pref[arg_ct->alias_index]; + i_preferred_regs = output_pref(op, arg_ct->alias_index); /* * If the input is not dead after the instruction, @@ -3839,7 +3841,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) * and to identify a few cases where it's not required. */ if (arg_ct->ialias) { - i_preferred_regs = op->output_pref[arg_ct->alias_index]; + i_preferred_regs = output_pref(op, arg_ct->alias_index); if (IS_DEAD_ARG(i1) && IS_DEAD_ARG(i2) && ts->val_type == TEMP_VAL_REG && @@ -3873,7 +3875,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) case 3: /* ialias with second output, no first input */ tcg_debug_assert(arg_ct->ialias); - i_preferred_regs = op->output_pref[arg_ct->alias_index]; + i_preferred_regs = output_pref(op, arg_ct->alias_index); if (IS_DEAD_ARG(i) && ts->val_type == TEMP_VAL_REG && @@ -3996,10 +3998,10 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) } else if (arg_ct->newreg) { reg = tcg_reg_alloc(s, arg_ct->regs, i_allocated_regs | o_allocated_regs, - op->output_pref[k], ts->indirect_base); + output_pref(op, k), ts->indirect_base); } else { reg = tcg_reg_alloc(s, arg_ct->regs, o_allocated_regs, - op->output_pref[k], ts->indirect_base); + output_pref(op, k), ts->indirect_base); } break; @@ -4010,7 +4012,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) break; } reg = tcg_reg_alloc_pair(s, arg_ct->regs, o_allocated_regs, - op->output_pref[k], ts->indirect_base); + output_pref(op, k), ts->indirect_base); break; case 2: /* second of pair */ @@ -4093,7 +4095,7 @@ static bool tcg_reg_alloc_dup2(TCGContext *s, const TCGOp *op) } oreg = tcg_reg_alloc(s, dup_out_regs, allocated_regs, - op->output_pref[0], ots->indirect_base); + output_pref(op, 0), ots->indirect_base); set_temp_val_reg(s, ots, oreg); }