From patchwork Sun Nov 10 12:55:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 2009218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=IYSPUxPY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XmXk84xJmz1xyk for ; Sun, 10 Nov 2024 23:56:32 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E0ED53858C2B for ; Sun, 10 Nov 2024 12:56:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-yb1-xb36.google.com (mail-yb1-xb36.google.com [IPv6:2607:f8b0:4864:20::b36]) by sourceware.org (Postfix) with ESMTPS id 0EEDC385840C for ; Sun, 10 Nov 2024 12:55:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0EEDC385840C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0EEDC385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731243364; cv=none; b=cSkUFBcvsMtwClijmfK/YitsIvRsCKOgKmdD4QxUmFCPZJSK6VXMZ/EoyoY9SwN3GbglXEr5xFd5rr3uXrCLCcUWxTuKOx8PHYCwVxoXYyy1UsqVYDBPVq7WGsYcrce7xXLnf45FUbsHbKMq/Vx3jNRsRB98dMN8h7vwkl+iCbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731243364; c=relaxed/simple; bh=53MMpVNaztxEqzDFEUyHJzmKBKDUHLaCEnHEUS5AW58=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=WFiATNEf2GydlZ14ZPXv1S0tLpRy/MYtp2ihzzx6nzeSd5eIUv8hclvnaluhLjE3xzDiio5loMsngHAVvQtaU208KuP1do53nmhQfYmwSSifkcGEzmUW9sUjzYOPsoFRJBP+0x8RxqOYB6bPaV/vzwdrKcmedEWsXmqQpUIyBbs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb36.google.com with SMTP id 3f1490d57ef6-e30d212b6b1so3354255276.0 for ; Sun, 10 Nov 2024 04:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731243358; x=1731848158; darn=gcc.gnu.org; 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=xveWmWeM3I1zFr6QRlsxnhFDWBEcKzNViUsTfSvZuZc=; b=IYSPUxPY7tzESrtq5nMyMziAcsgtHC1VHnbEwVaD+j+zhQetMn2rIcAUpkZoiRpvYO 2/uzQ9KH0X75RSk2/eI58Npdf725W8YKQEp+RtUBZuVBV1YV+/4GbXTnolnCJamGjeLx TIVTmXhC9jQnnbBULWxWOLlSF6s40saPAZHTfDlNypj192whduRwec6QOFaqQhvedvwH CyKqzGPIVLAmaIGqprR7PgWqZSLPtg0rOHrVNVmtEpWfjzT2KNhAqbHBMyi+/w5dd1zk kgsi9a5ETbzUpIRtyd4+h5PKwc3r+JaKWQ7WwDhnJOHrcQaputY5zYEQDdkcARKwf55i LrGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731243358; x=1731848158; 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=xveWmWeM3I1zFr6QRlsxnhFDWBEcKzNViUsTfSvZuZc=; b=IPj5mFXLZNwa2+/QGuzSd6VykgIjv8mnnUvhW3U/l1filhDPbnXKCM2n/CiQUFAiRw bFh92c6msmh2a02gFSliHgUn1TnikBK9eBUwQ7xaUNgIwbNNbRdgkXO4TBOxMQ2uHq0j lQ68+kbUVw60CCp0B2ohzEousQl2Tv3JQlEILnOwoKFHgD/QwKU90McyuH716jYMAC4L cJYlmN7YpTjhU6kuRtO63+ZXaHSsx91+35rsJPl4LDUqiZKKxJWn1eXJWiIjBF/NIljG ot6b7SN26qPZiRGdVr8QZtp+LcmLd/LmFqcQp68sVfsH0UzCo0oyajhYBR9U3DMJHyE/ yq4g== X-Gm-Message-State: AOJu0Yw8rB57LukCIG6Ak7W/NTbV7TXMnV1rJXbIave1PeLN7ZX5rInu 0U4Rifqwt9Gf8plgV0w1OC2v1XNXBQvJTa0MyalaKXw8pxcSn3yR2hsDXkB/pILgGA== X-Google-Smtp-Source: AGHT+IFGhftKx7bVTamBn1gg1LZRR9Tc9tI5G9Sf+rH8+vzRQx3zgPPsPXk0H8j/c6K0oLvH00riag== X-Received: by 2002:a05:6902:150b:b0:e29:1630:785c with SMTP id 3f1490d57ef6-e337f840d8emr8773615276.10.1731243358084; Sun, 10 Nov 2024 04:55:58 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.142.161]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e336ef20095sm1729586276.15.2024.11.10.04.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 04:55:57 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 981BEC02EF; Sun, 10 Nov 2024 20:55:50 +0800 (CST) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, ubizjak@gmail.com, hongtao.liu@intel.com Subject: [PATCH v3 2/7] Add expand_promote_outgoing_argument Date: Sun, 10 Nov 2024 20:55:45 +0800 Message-ID: <20241110125550.787007-3-hjl.tools@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241110125550.787007-1-hjl.tools@gmail.com> References: <20241110125550.787007-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Since the C/C++/Ada frontends no longer promote integer argument smaller than int, add expand_promote_outgoing_argument to promote it when expanding builtin functions. PR middle-end/14907 * expr.cc (expand_promote_outgoing_argument): New function. * expr.h (expand_promote_outgoing_argument): New prototype. * config/i386/i386-expand.cc (ix86_expand_binop_builtin): Call expand_promote_outgoing_argument to expand the outgoing argument. (ix86_expand_multi_arg_builtin): Likewise. (ix86_expand_unop_vec_merge_builtin): Likewise. (ix86_expand_sse_compare): Likewise. (ix86_expand_sse_comi): Likewise. (ix86_expand_sse_round): Likewise. (ix86_expand_sse_round_vec_pack_sfix): Likewise. (ix86_expand_sse_ptest): Likewise. (ix86_expand_sse_pcmpestr): Likewise. (ix86_expand_sse_pcmpistr): Likewise. (ix86_expand_args_builtin): Likewise. (ix86_expand_sse_comi_round): Likewise. (ix86_expand_round_builtin): Likewise. (ix86_expand_special_args_builtin): Likewise. (ix86_expand_vec_init_builtin): Likewise. (ix86_expand_vec_ext_builtin): Likewise. (ix86_expand_builtin): Likewise. Signed-off-by: H.J. Lu --- gcc/config/i386/i386-expand.cc | 244 ++++++++++++++++----------------- gcc/expr.cc | 18 +++ gcc/expr.h | 1 + 3 files changed, 141 insertions(+), 122 deletions(-) diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc index 5c4a8e07d62..ce887d96f6a 100644 --- a/gcc/config/i386/i386-expand.cc +++ b/gcc/config/i386/i386-expand.cc @@ -10415,8 +10415,8 @@ ix86_expand_binop_builtin (enum insn_code icode, tree exp, rtx target) rtx pat; tree arg0 = CALL_EXPR_ARG (exp, 0); tree arg1 = CALL_EXPR_ARG (exp, 1); - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); machine_mode tmode = insn_data[icode].operand[0].mode; machine_mode mode0 = insn_data[icode].operand[1].mode; machine_mode mode1 = insn_data[icode].operand[2].mode; @@ -10564,7 +10564,7 @@ ix86_expand_multi_arg_builtin (enum insn_code icode, tree exp, rtx target, for (i = 0; i < nargs; i++) { tree arg = CALL_EXPR_ARG (exp, i); - rtx op = expand_normal (arg); + rtx op = expand_promote_outgoing_argument (arg); int adjust = (comparison_p) ? 1 : 0; machine_mode mode = insn_data[icode].operand[i+adjust+1].mode; @@ -10691,7 +10691,7 @@ ix86_expand_unop_vec_merge_builtin (enum insn_code icode, tree exp, { rtx pat; tree arg0 = CALL_EXPR_ARG (exp, 0); - rtx op1, op0 = expand_normal (arg0); + rtx op1, op0 = expand_promote_outgoing_argument (arg0); machine_mode tmode = insn_data[icode].operand[0].mode; machine_mode mode0 = insn_data[icode].operand[1].mode; @@ -10727,8 +10727,8 @@ ix86_expand_sse_compare (const struct builtin_description *d, rtx pat; tree arg0 = CALL_EXPR_ARG (exp, 0); tree arg1 = CALL_EXPR_ARG (exp, 1); - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); rtx op2; machine_mode tmode = insn_data[d->icode].operand[0].mode; machine_mode mode0 = insn_data[d->icode].operand[1].mode; @@ -10823,8 +10823,8 @@ ix86_expand_sse_comi (const struct builtin_description *d, tree exp, rtx pat, set_dst; tree arg0 = CALL_EXPR_ARG (exp, 0); tree arg1 = CALL_EXPR_ARG (exp, 1); - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); enum insn_code icode = d->icode; const struct insn_data_d *insn_p = &insn_data[icode]; machine_mode mode0 = insn_p->operand[0].mode; @@ -10916,7 +10916,7 @@ ix86_expand_sse_round (const struct builtin_description *d, tree exp, { rtx pat; tree arg0 = CALL_EXPR_ARG (exp, 0); - rtx op1, op0 = expand_normal (arg0); + rtx op1, op0 = expand_promote_outgoing_argument (arg0); machine_mode tmode = insn_data[d->icode].operand[0].mode; machine_mode mode0 = insn_data[d->icode].operand[1].mode; @@ -10948,8 +10948,8 @@ ix86_expand_sse_round_vec_pack_sfix (const struct builtin_description *d, rtx pat; tree arg0 = CALL_EXPR_ARG (exp, 0); tree arg1 = CALL_EXPR_ARG (exp, 1); - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); rtx op2; machine_mode tmode = insn_data[d->icode].operand[0].mode; machine_mode mode0 = insn_data[d->icode].operand[1].mode; @@ -10988,8 +10988,8 @@ ix86_expand_sse_ptest (const struct builtin_description *d, tree exp, rtx pat; tree arg0 = CALL_EXPR_ARG (exp, 0); tree arg1 = CALL_EXPR_ARG (exp, 1); - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); machine_mode mode0 = insn_data[d->icode].operand[0].mode; machine_mode mode1 = insn_data[d->icode].operand[1].mode; enum rtx_code comparison = d->comparison; @@ -11047,11 +11047,11 @@ ix86_expand_sse_pcmpestr (const struct builtin_description *d, tree arg3 = CALL_EXPR_ARG (exp, 3); tree arg4 = CALL_EXPR_ARG (exp, 4); rtx scratch0, scratch1; - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); - rtx op2 = expand_normal (arg2); - rtx op3 = expand_normal (arg3); - rtx op4 = expand_normal (arg4); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); + rtx op2 = expand_promote_outgoing_argument (arg2); + rtx op3 = expand_promote_outgoing_argument (arg3); + rtx op4 = expand_promote_outgoing_argument (arg4); machine_mode tmode0, tmode1, modev2, modei3, modev4, modei5, modeimm; tmode0 = insn_data[d->icode].operand[0].mode; @@ -11150,9 +11150,9 @@ ix86_expand_sse_pcmpistr (const struct builtin_description *d, tree arg1 = CALL_EXPR_ARG (exp, 1); tree arg2 = CALL_EXPR_ARG (exp, 2); rtx scratch0, scratch1; - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); - rtx op2 = expand_normal (arg2); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); + rtx op2 = expand_promote_outgoing_argument (arg2); machine_mode tmode0, tmode1, modev2, modev3, modeimm; tmode0 = insn_data[d->icode].operand[0].mode; @@ -12135,7 +12135,7 @@ ix86_expand_args_builtin (const struct builtin_description *d, for (i = 0; i < nargs; i++) { tree arg = CALL_EXPR_ARG (exp, i); - rtx op = expand_normal (arg); + rtx op = expand_promote_outgoing_argument (arg); machine_mode mode = insn_p->operand[i + 1].mode; /* Need to fixup modeless constant before testing predicate. */ op = fixup_modeless_constant (op, mode); @@ -12400,10 +12400,10 @@ ix86_expand_sse_comi_round (const struct builtin_description *d, tree arg1 = CALL_EXPR_ARG (exp, 1); tree arg2 = CALL_EXPR_ARG (exp, 2); tree arg3 = CALL_EXPR_ARG (exp, 3); - rtx op0 = expand_normal (arg0); - rtx op1 = expand_normal (arg1); - rtx op2 = expand_normal (arg2); - rtx op3 = expand_normal (arg3); + rtx op0 = expand_promote_outgoing_argument (arg0); + rtx op1 = expand_promote_outgoing_argument (arg1); + rtx op2 = expand_promote_outgoing_argument (arg2); + rtx op3 = expand_promote_outgoing_argument (arg3); enum insn_code icode = d->icode; const struct insn_data_d *insn_p = &insn_data[icode]; machine_mode mode0 = insn_p->operand[0].mode; @@ -12870,7 +12870,7 @@ ix86_expand_round_builtin (const struct builtin_description *d, for (i = 0; i < nargs; i++) { tree arg = CALL_EXPR_ARG (exp, i); - rtx op = expand_normal (arg); + rtx op = expand_promote_outgoing_argument (arg); machine_mode mode = insn_p->operand[i + 1].mode; bool match = insn_p->operand[i + 1].predicate (op, mode); @@ -13318,7 +13318,7 @@ ix86_expand_special_args_builtin (const struct builtin_description *d, if (klass == store) { arg = CALL_EXPR_ARG (exp, 0); - op = expand_normal (arg); + op = expand_promote_outgoing_argument (arg); gcc_assert (target == 0); if (memory) { @@ -13355,7 +13355,7 @@ ix86_expand_special_args_builtin (const struct builtin_description *d, machine_mode mode = insn_p->operand[i + 1].mode; arg = CALL_EXPR_ARG (exp, i + arg_adjust); - op = expand_normal (arg); + op = expand_promote_outgoing_argument (arg); if (i == memory) { @@ -13479,7 +13479,7 @@ ix86_expand_vec_init_builtin (tree type, tree exp, rtx target) for (i = 0; i < n_elt; ++i) { - rtx x = expand_normal (CALL_EXPR_ARG (exp, i)); + rtx x = expand_promote_outgoing_argument (CALL_EXPR_ARG (exp, i)); RTVEC_ELT (v, i) = gen_lowpart (inner_mode, x); } @@ -13505,7 +13505,7 @@ ix86_expand_vec_ext_builtin (tree exp, rtx target) arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); elt = get_element_number (TREE_TYPE (arg0), arg1); tmode = TYPE_MODE (TREE_TYPE (TREE_TYPE (arg0))); @@ -13727,9 +13727,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg1 = CALL_EXPR_ARG (exp, 0); arg2 = CALL_EXPR_ARG (exp, 1); arg0 = CALL_EXPR_ARG (exp, 2); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); mode0 = insn_data[icode].operand[0].mode; mode1 = insn_data[icode].operand[1].mode; mode2 = insn_data[icode].operand[2].mode; @@ -13750,7 +13750,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, return 0; case IX86_BUILTIN_LDMXCSR: - op0 = expand_normal (CALL_EXPR_ARG (exp, 0)); + op0 = expand_promote_outgoing_argument (CALL_EXPR_ARG (exp, 0)); target = assign_stack_temp (SImode, GET_MODE_SIZE (SImode)); emit_move_insn (target, op0); emit_insn (gen_sse_ldmxcsr (target)); @@ -13763,7 +13763,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_CLFLUSH: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); icode = CODE_FOR_sse2_clflush; if (!insn_data[icode].operand[0].predicate (op0, Pmode)) op0 = ix86_zero_extend_to_Pmode (op0); @@ -13773,7 +13773,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_CLWB: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); icode = CODE_FOR_clwb; if (!insn_data[icode].operand[0].predicate (op0, Pmode)) op0 = ix86_zero_extend_to_Pmode (op0); @@ -13783,7 +13783,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_CLFLUSHOPT: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); icode = CODE_FOR_clflushopt; if (!insn_data[icode].operand[0].predicate (op0, Pmode)) op0 = ix86_zero_extend_to_Pmode (op0); @@ -13796,9 +13796,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); arg2 = CALL_EXPR_ARG (exp, 2); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); if (!REG_P (op0)) op0 = ix86_zero_extend_to_Pmode (op0); if (!REG_P (op1)) @@ -13814,8 +13814,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_MWAIT: arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); if (!REG_P (op0)) op0 = copy_to_mode_reg (SImode, op0); if (!REG_P (op1)) @@ -13827,9 +13827,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); arg2 = CALL_EXPR_ARG (exp, 2); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); if (!REG_P (op0)) op0 = copy_to_mode_reg (SImode, op0); if (!REG_P (op1)) @@ -13841,7 +13841,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_UMONITOR: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); op0 = ix86_zero_extend_to_Pmode (op0); emit_insn (gen_umonitor (Pmode, op0)); @@ -13851,8 +13851,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_TPAUSE: arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); if (!REG_P (op0)) op0 = copy_to_mode_reg (SImode, op0); @@ -13925,7 +13925,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_CLZERO: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); if (!REG_P (op0)) op0 = ix86_zero_extend_to_Pmode (op0); emit_insn (gen_clzero (Pmode, op0)); @@ -13933,7 +13933,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_CLDEMOTE: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); icode = CODE_FOR_cldemote; if (!insn_data[icode].operand[0].predicate (op0, Pmode)) op0 = ix86_zero_extend_to_Pmode (op0); @@ -13948,10 +13948,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg2 = CALL_EXPR_ARG (exp, 2); arg3 = CALL_EXPR_ARG (exp, 3); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); - op3 = expand_normal (arg3); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); + op3 = expand_promote_outgoing_argument (arg3); if (!REG_P (op0)) op0 = copy_to_mode_reg (V2DImode, op0); @@ -13988,9 +13988,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg1 = CALL_EXPR_ARG (exp, 1); // __m128i idata arg2 = CALL_EXPR_ARG (exp, 2); // const void *p - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); if (!address_operand (op0, V2DImode)) { @@ -14060,9 +14060,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg1 = CALL_EXPR_ARG (exp, 1); // const __m128i * idata arg2 = CALL_EXPR_ARG (exp, 2); // const void *p - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); if (!address_operand (op2, VOIDmode)) { @@ -14116,9 +14116,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg1 = CALL_EXPR_ARG (exp, 1); // __m128i key arg2 = CALL_EXPR_ARG (exp, 2); // void *h - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); if (!REG_P (op0)) op0 = copy_to_mode_reg (SImode, op0); @@ -14152,10 +14152,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg2 = CALL_EXPR_ARG (exp, 2); // __m128i keyhi arg3 = CALL_EXPR_ARG (exp, 3); // void *h - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); - op3 = expand_normal (arg3); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); + op3 = expand_promote_outgoing_argument (arg3); if (!REG_P (op0)) op0 = copy_to_mode_reg (SImode, op0); @@ -14191,10 +14191,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg2 = CALL_EXPR_ARG (exp, 2); // const int arg3 = CALL_EXPR_ARG (exp, 3); // const int - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); - op3 = expand_normal (arg3); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); + op3 = expand_promote_outgoing_argument (arg3); if (!CONST_INT_P (op1) || !CONST_INT_P (op2) || !CONST_INT_P (op3)) { @@ -14264,8 +14264,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg0 = CALL_EXPR_ARG (exp, 0); // const void * arg1 = CALL_EXPR_ARG (exp, 1); // const int - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); if (!CONST_INT_P (op1)) { @@ -14295,7 +14295,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_UWRMSR: { arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); if (CONST_INT_P (op0)) { @@ -14309,7 +14309,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, if (fcode == IX86_BUILTIN_UWRMSR) { arg1 = CALL_EXPR_ARG (exp, 1); - op1 = expand_normal (arg1); + op1 = expand_promote_outgoing_argument (arg1); op1 = force_reg (DImode, op1); icode = CODE_FOR_uwrmsr; target = 0; @@ -14384,10 +14384,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg1 = CALL_EXPR_ARG (exp, 1); arg2 = CALL_EXPR_ARG (exp, 2); arg3 = CALL_EXPR_ARG (exp, 3); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); - op3 = expand_normal (arg3); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); + op3 = expand_promote_outgoing_argument (arg3); if (!address_operand (op0, VOIDmode)) { @@ -14458,7 +14458,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, if (fcode == IX86_BUILTIN_RDPMC) { arg0 = CALL_EXPR_ARG (exp, 0); - op2 = expand_normal (arg0); + op2 = expand_promote_outgoing_argument (arg0); if (!register_operand (op2, SImode)) op2 = copy_to_mode_reg (SImode, op2); @@ -14470,7 +14470,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, else if (fcode == IX86_BUILTIN_XGETBV) { arg0 = CALL_EXPR_ARG (exp, 0); - op2 = expand_normal (arg0); + op2 = expand_promote_outgoing_argument (arg0); if (!register_operand (op2, SImode)) op2 = copy_to_mode_reg (SImode, op2); @@ -14496,7 +14496,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, emit_insn (insn); arg0 = CALL_EXPR_ARG (exp, 0); - op4 = expand_normal (arg0); + op4 = expand_promote_outgoing_argument (arg0); if (!address_operand (op4, VOIDmode)) { op4 = convert_memory_address (Pmode, op4); @@ -14526,8 +14526,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); op0 = ix86_zero_extend_to_Pmode (op0); if (!address_operand (op1, VOIDmode)) @@ -14597,7 +14597,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, } arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); if (!address_operand (op0, VOIDmode)) { @@ -14614,8 +14614,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_XSETBV: arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); if (!REG_P (op0)) op0 = copy_to_mode_reg (SImode, op0); @@ -14657,8 +14657,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_XSAVEC64: arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); if (!address_operand (op0, VOIDmode)) { @@ -14754,7 +14754,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_LDTILECFG: case IX86_BUILTIN_STTILECFG: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); if (!address_operand (op0, VOIDmode)) { @@ -14772,7 +14772,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, case IX86_BUILTIN_LLWPCB: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); if (!register_operand (op0, Pmode)) op0 = ix86_zero_extend_to_Pmode (op0); @@ -14803,9 +14803,9 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); arg2 = CALL_EXPR_ARG (exp, 2); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); mode0 = insn_data[icode].operand[0].mode; if (!insn_data[icode].operand[0].predicate (op0, mode0)) @@ -14843,8 +14843,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, arg0 = CALL_EXPR_ARG (exp, 0); arg1 = CALL_EXPR_ARG (exp, 1); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); if (!CONST_INT_P (op1)) { @@ -14898,7 +14898,7 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, rdrand_step: arg0 = CALL_EXPR_ARG (exp, 0); - op1 = expand_normal (arg0); + op1 = expand_promote_outgoing_argument (arg0); if (!address_operand (op1, VOIDmode)) { op1 = convert_memory_address (Pmode, op1); @@ -14958,7 +14958,7 @@ rdrand_step: rdseed_step: arg0 = CALL_EXPR_ARG (exp, 0); - op1 = expand_normal (arg0); + op1 = expand_promote_outgoing_argument (arg0); if (!address_operand (op1, VOIDmode)) { op1 = convert_memory_address (Pmode, op1); @@ -15020,17 +15020,17 @@ rdseed_step: arg2 = CALL_EXPR_ARG (exp, 2); /* unsigned int src2. */ arg3 = CALL_EXPR_ARG (exp, 3); /* unsigned int *sum_out. */ - op1 = expand_normal (arg0); + op1 = expand_promote_outgoing_argument (arg0); - op2 = expand_normal (arg1); + op2 = expand_promote_outgoing_argument (arg1); if (!register_operand (op2, mode0)) op2 = copy_to_mode_reg (mode0, op2); - op3 = expand_normal (arg2); + op3 = expand_promote_outgoing_argument (arg2); if (!register_operand (op3, mode0)) op3 = copy_to_mode_reg (mode0, op3); - op4 = expand_normal (arg3); + op4 = expand_promote_outgoing_argument (arg3); if (!address_operand (op4, VOIDmode)) { op4 = convert_memory_address (Pmode, op4); @@ -15087,7 +15087,7 @@ rdseed_step: case IX86_BUILTIN_WRITE_FLAGS: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); if (!general_no_elim_operand (op0, word_mode)) op0 = copy_to_mode_reg (word_mode, op0); @@ -15177,8 +15177,8 @@ rdseed_step: kortest: arg0 = CALL_EXPR_ARG (exp, 0); /* Mask reg src1. */ arg1 = CALL_EXPR_ARG (exp, 1); /* Mask reg src2. */ - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); mode0 = insn_data[icode].operand[0].mode; mode1 = insn_data[icode].operand[1].mode; @@ -15482,11 +15482,11 @@ rdseed_step: arg2 = CALL_EXPR_ARG (exp, 2); arg3 = CALL_EXPR_ARG (exp, 3); arg4 = CALL_EXPR_ARG (exp, 4); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); - op3 = expand_normal (arg3); - op4 = expand_normal (arg4); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); + op3 = expand_promote_outgoing_argument (arg3); + op4 = expand_promote_outgoing_argument (arg4); /* Note the arg order is different from the operand order. */ mode0 = insn_data[icode].operand[1].mode; mode2 = insn_data[icode].operand[3].mode; @@ -15699,11 +15699,11 @@ rdseed_step: arg2 = CALL_EXPR_ARG (exp, 2); arg3 = CALL_EXPR_ARG (exp, 3); arg4 = CALL_EXPR_ARG (exp, 4); - op0 = expand_normal (arg0); - op1 = expand_normal (arg1); - op2 = expand_normal (arg2); - op3 = expand_normal (arg3); - op4 = expand_normal (arg4); + op0 = expand_promote_outgoing_argument (arg0); + op1 = expand_promote_outgoing_argument (arg1); + op2 = expand_promote_outgoing_argument (arg2); + op3 = expand_promote_outgoing_argument (arg3); + op4 = expand_promote_outgoing_argument (arg4); mode1 = insn_data[icode].operand[1].mode; mode2 = insn_data[icode].operand[2].mode; mode3 = insn_data[icode].operand[3].mode; @@ -15812,7 +15812,7 @@ rdseed_step: case IX86_BUILTIN_XABORT: icode = CODE_FOR_xabort; arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); mode0 = insn_data[icode].operand[0].mode; if (!insn_data[icode].operand[0].predicate (op0, mode0)) { @@ -15841,7 +15841,7 @@ rdseed_step: mode = (fcode == IX86_BUILTIN_INCSSPD ? SImode : DImode); arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); op0 = force_reg (mode, op0); @@ -15851,7 +15851,7 @@ rdseed_step: case IX86_BUILTIN_HRESET: icode = CODE_FOR_hreset; arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); op0 = force_reg (SImode, op0); emit_insn (gen_hreset (op0)); return 0; @@ -15859,7 +15859,7 @@ rdseed_step: case IX86_BUILTIN_RSTORSSP: case IX86_BUILTIN_CLRSSBSY: arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); icode = (fcode == IX86_BUILTIN_RSTORSSP ? CODE_FOR_rstorssp : CODE_FOR_clrssbsy); @@ -15881,9 +15881,9 @@ rdseed_step: ? SImode : DImode); arg0 = CALL_EXPR_ARG (exp, 0); - op0 = expand_normal (arg0); + op0 = expand_promote_outgoing_argument (arg0); arg1 = CALL_EXPR_ARG (exp, 1); - op1 = expand_normal (arg1); + op1 = expand_promote_outgoing_argument (arg1); op0 = force_reg (mode, op0); diff --git a/gcc/expr.cc b/gcc/expr.cc index caa1a72ba0b..0a1a70dab3c 100644 --- a/gcc/expr.cc +++ b/gcc/expr.cc @@ -14136,3 +14136,21 @@ int_expr_size (const_tree exp) return tree_to_shwi (size); } + +/* Expand an outgoing argument ARG with promotion. Since the C/C++ + frontends no longer promote integer argument smaller than int, + promote it when expanding built functions. */ + +rtx +expand_promote_outgoing_argument (tree arg) +{ + tree type = TREE_TYPE (arg); + if (INTEGRAL_TYPE_P (type) + && TYPE_PRECISION (type) < TYPE_PRECISION (integer_type_node)) + { + tree promoted_type = (TYPE_UNSIGNED (type) + ? unsigned_type_node : integer_type_node); + arg = fold_convert (promoted_type, arg); + } + return expand_normal (arg); +} diff --git a/gcc/expr.h b/gcc/expr.h index 04782b15f19..ed14750614b 100644 --- a/gcc/expr.h +++ b/gcc/expr.h @@ -312,6 +312,7 @@ extern rtx expand_expr_real_2 (const_sepops, rtx, machine_mode, extern rtx expand_expr_real_gassign (gassign *, rtx, machine_mode, enum expand_modifier modifier, rtx * = nullptr, bool = false); +extern rtx expand_promote_outgoing_argument (tree); /* Generate code for computing expression EXP. An rtx for the computed value is returned. The value is never null.