From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70579C433F5 for ; Tue, 26 Oct 2021 23:52:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CB7C60231 for ; Tue, 26 Oct 2021 23:52:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2CB7C60231 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfWFU-0000yq-7f for qemu-devel@archiver.kernel.org; Tue, 26 Oct 2021 19:52:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfVdH-00005W-0J for qemu-devel@nongnu.org; Tue, 26 Oct 2021 19:13:27 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:40738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfVdE-00036S-TB for qemu-devel@nongnu.org; Tue, 26 Oct 2021 19:13:26 -0400 Received: by mail-pg1-x52f.google.com with SMTP id l186so1021653pge.7 for ; Tue, 26 Oct 2021 16:13:24 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=PmCiFfpbHMLDvaeGsDwSQLjEhMdJFYRFDu2z/zQdWR8=; b=aVlpV0VGLRIBHPFTZxV5Ah9iVbReMqumHs65YKv4IUMP/J5QGNpWCx/VfWoKyvwHHd sWE48sR+tzptb+RMQAk9hGQMMSzhVftLK1vNvORBZXRfkvbdoRFo8Sr4+LwUiYlA+ypv ga7fTZdelUfwbgxkyy5kp4oqBOR7+Ngdbds9QWFxP+W3rvywA15nIoHy8HBh2s4wjxRt 00UtUW2Yswlr4jyZpHXNUMnam0xlnl9No0VEudAapjtXAmrnSljRMCFzfTe8PBLcapaB jFyNFVmAns34lxcPTIkqSX4c0kc2Hz+ik+oRWxhYp7OrYKQOTRN3bP3geIBWGwbZq09d +q/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PmCiFfpbHMLDvaeGsDwSQLjEhMdJFYRFDu2z/zQdWR8=; b=2TknAofiZvj6XfAQiSbWSBMT9OTEFA6KL2KCPWFilsUQG2jf7hSokRcxw9+QqAti39 pCSfJr9osRGlSCiWguKJlkuAR6SGg2akd/ydIgJ+x9SbxWzMWMrwr5DAaZAZ2eMCkK2O nOf8giH+rcXMMuBUuArt8ea8aZsza1fkbnhk/46b2mbuROcL877sBnxCZDRBucHsP6iE 3/9bkY+/qnXW1GXtWz9oUWC15UMqpO18FZbEGF79DhAG4Y7cS25AnTZXEFz4ZRVH30QN oT2gt8OR5u4jGipTfK3/fRUpUo5qHwOS4uiHbeYIC7SgFsaLmKRIgC2+mxvVeDz/Lc6M ap+A== X-Gm-Message-State: AOAM532AA8juQg8yVwrNq1/D8Ve2aemhVEuIl9JIOrDAgB0NxchTYvAR Dnqv3CZl7/8MPbP60N2JPHupPZehI6Gg9w== X-Google-Smtp-Source: ABdhPJxnyFbj+XVroIxWxNcFrAbtU5lbQPPwVg8AF8xS2+sMjPTlZDb5k37w5yUKoqnxkzAhN57kmA== X-Received: by 2002:a05:6a00:1748:b0:47c:dca:f2f2 with SMTP id j8-20020a056a00174800b0047c0dcaf2f2mr8095188pfc.43.1635290003677; Tue, 26 Oct 2021 16:13:23 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id d6sm24158122pfa.39.2021.10.26.16.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 16:13:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 42/51] tcg/optimize: Stop forcing z_mask to "garbage" for 32-bit values Date: Tue, 26 Oct 2021 16:09:34 -0700 Message-Id: <20211026230943.1225890-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211026230943.1225890-1-richard.henderson@linaro.org> References: <20211026230943.1225890-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: luis.pires@eldorado.org.br, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This "garbage" setting pre-dates the addition of the type changing opcodes INDEX_op_ext_i32_i64, INDEX_op_extu_i32_i64, and INDEX_op_extr{l,h}_i64_i32. So now we have a definitive points at which to adjust z_mask to eliminate such bits from the 32-bit operands. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/optimize.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index b72a01910a..3207817b68 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -124,10 +124,6 @@ static void init_ts_info(OptContext *ctx, TCGTemp *ts) ti->is_const = true; ti->val = ts->val; ti->z_mask = ts->val; - if (TCG_TARGET_REG_BITS > 32 && ts->type == TCG_TYPE_I32) { - /* High bits of a 32-bit quantity are garbage. */ - ti->z_mask |= ~0xffffffffull; - } } else { ti->is_const = false; ti->z_mask = -1; @@ -192,7 +188,6 @@ static bool tcg_opt_gen_mov(OptContext *ctx, TCGOp *op, TCGArg dst, TCGArg src) TCGTemp *src_ts = arg_temp(src); TempOptInfo *di; TempOptInfo *si; - uint64_t z_mask; TCGOpcode new_op; if (ts_are_copies(dst_ts, src_ts)) { @@ -224,12 +219,7 @@ static bool tcg_opt_gen_mov(OptContext *ctx, TCGOp *op, TCGArg dst, TCGArg src) op->args[0] = dst; op->args[1] = src; - z_mask = si->z_mask; - if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_mov_i32) { - /* High bits of the destination are now garbage. */ - z_mask |= ~0xffffffffull; - } - di->z_mask = z_mask; + di->z_mask = si->z_mask; if (src_ts->type == dst_ts->type) { TempOptInfo *ni = ts_info(si->next_copy); @@ -247,9 +237,14 @@ static bool tcg_opt_gen_mov(OptContext *ctx, TCGOp *op, TCGArg dst, TCGArg src) static bool tcg_opt_gen_movi(OptContext *ctx, TCGOp *op, TCGArg dst, uint64_t val) { - /* Convert movi to mov with constant temp. */ - TCGTemp *tv = tcg_constant_internal(ctx->type, val); + TCGTemp *tv; + if (ctx->type == TCG_TYPE_I32) { + val = (int32_t)val; + } + + /* Convert movi to mov with constant temp. */ + tv = tcg_constant_internal(ctx->type, val); init_ts_info(ctx, tv); return tcg_opt_gen_mov(ctx, op, dst, temp_arg(tv)); } @@ -721,14 +716,16 @@ static bool fold_masks(OptContext *ctx, TCGOp *op) uint64_t z_mask = ctx->z_mask; /* - * 32-bit ops generate 32-bit results. For the result is zero test - * below, we can ignore high bits, but for further optimizations we - * need to record that the high bits contain garbage. + * 32-bit ops generate 32-bit results, which for the purpose of + * simplifying tcg are sign-extended. Certainly that's how we + * represent our constants elsewhere. Note that the bits will + * be reset properly for a 64-bit value when encountering the + * type changing opcodes. */ if (ctx->type == TCG_TYPE_I32) { - ctx->z_mask |= MAKE_64BIT_MASK(32, 32); - a_mask &= MAKE_64BIT_MASK(0, 32); - z_mask &= MAKE_64BIT_MASK(0, 32); + a_mask = (int32_t)a_mask; + z_mask = (int32_t)z_mask; + ctx->z_mask = z_mask; } if (z_mask == 0) { -- 2.25.1