From patchwork Tue Oct 15 14:55:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 1997514 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=FWyLvJoX; 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 4XScc04Bx1z1xv6 for ; Wed, 16 Oct 2024 01:56:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4C653857C6D for ; Tue, 15 Oct 2024 14:55:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id C2F153858414 for ; Tue, 15 Oct 2024 14:55:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C2F153858414 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 C2F153858414 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::233 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729004137; cv=none; b=D1tz8wk8xwwIp5ntYEOdu7SkasgRaWKRNRcXkb2THHpLD8KX69PcOJQrmcPWyklwCY62ln/0/TKW49ZaAJiJGbmBZWEIWyHGz8v1Cq+L7nijcWw8VmYa9iiqd48kMJTCJ/wkuPODP6hCQgL5XIlKXByNbeikNjDZNs1t0qC7j04= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729004137; c=relaxed/simple; bh=3vARmfaJt/t6S4/7D6uoZOUTz0Cox1HeuK9Zs4meYyY=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=KSCs1IQA70usXDJcKfHUEk3+Mc9Xhc+v0SUhgLF/W18nAhOI5fe/sFPh3tc0NqH7pwHxMPH/zacY/LqYU7jOL7j6uUf5y064EOs3w8XDaKYj0nQFhGuuOD2fHBVLk09UJKZ4fUj2vl3Dtu7UKqNVfFTSh/ZJJvf2fBx59xXdT9Y= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2fb518014b9so16224971fa.3 for ; Tue, 15 Oct 2024 07:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729004134; x=1729608934; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=CwAzf7Xz6w23M7W+UN7XLcK2roztOEvwv6/Jm1ce6rc=; b=FWyLvJoXCu476/oRU0sN/altaaBuBaiiqme7JbPm/sp5qCxEE1m/ZYtnZgSNSVMPwS 6idYUSaW1KcZ60rnZWQ1w8niNd8sjuMgC2iDJS65v3hgHeBqIHHH5U7ssDjQcSynTkcT UkHn2jhPfqaD6pnMgJ51prfnax/puR3q+A9sABYbdPJsGpSpbJLogdp0+fE69UPBD2Mp WmItP/iWDnARkR4nQCvmozYpLs9QR+CReLzPa47HWUZGk9RqPoCN6WmaCGaZ3jvDEDWO XtN+3qAW275I13pE4OV6Uld/sFn7f2yQb9FLUGStPVDGmE7YcFCr4V7btEbGO2Sv/7AG H3Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729004134; x=1729608934; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=CwAzf7Xz6w23M7W+UN7XLcK2roztOEvwv6/Jm1ce6rc=; b=Ce/R4szJ9qatZtikBXiQGYTVazFi62lFGgEqlWjpWmoMoIQDKCNi3Lg9FHzZH5JCBD 31LzS1bgwcetzD3KQH1Mq9CfkKpmvRcfn5KelL8T1m+kGFMWpzP5JkMheCvLJ1f7PsT1 MBX6dtfK+t2craop8oXLOctaBrPe8hMOWiqi+ClOvH66j2zhzpeLP+i+v37a5gmPpW/+ uxLW4TgqnlliJf5OZXopHpTye9TgJb/pINmFsnKaggRIY6AqjYt5oaERXIKdB48pHCtq eYUieusHGFeqz2VAhro2CAyaGUyFjMWmvTxD0X13+VdMlsCCrNHI9A6TWNXNnWCVIrYD aeig== X-Gm-Message-State: AOJu0Ywb67q5Buhw27Yubkz0o/q6+B8rI80QTyf9GkSx0nIUUblxtEcY fLdwN6E8E8k3ifo6H7T7o1VzNk2eoU5Wd5tvd2JhyIUmqMNx6UF5R7vSOMKQEKpZWZpe9APbZBO SxMY2G5uFsvZKqxRXxcA3OAJp/Abf2QugMps= X-Google-Smtp-Source: AGHT+IHIJuW1In1Rs7F0Q2X+4a7M1sJNm7qDNGmDkJVjN35Q5RZwKEkqDN32MkSiO7PJvRHasSc+nVSOGzXLMpN4NbI= X-Received: by 2002:a05:651c:b0f:b0:2fb:4f0c:e40a with SMTP id 38308e7fff4ca-2fb61bbe1fbmr5376561fa.38.1729004133298; Tue, 15 Oct 2024 07:55:33 -0700 (PDT) MIME-Version: 1.0 From: Uros Bizjak Date: Tue, 15 Oct 2024 16:55:20 +0200 Message-ID: Subject: [committed] i386: Fix expand_vector_set for VEC_MERGE/VEC_DUPLICATE RTX [PR117116] To: "gcc-patches@gcc.gnu.org" X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 Middle end can generate SYMBOL_REF RTX as a value "val" in the call to expand_vector_set, but SYMBOL_REF RTX is not accepted in _pinsr insn pattern, generated via VEC_MERGE/VEC_DUPLICATE RTX path. Force the value into a register before VEC_MERGE/VEC_DUPLICATE RTX is generated if it doesn't satisfy nonimmediate_operand predicate. PR target/117116 gcc/ChangeLog: * config/i386/i386-expand.cc (expand_vector_set): Force "val" into a register before VEC_MERGE/VEC_DUPLICATE RTX is generated if it doesn't satisfy nonimmediate_operand predicate. gcc/testsuite/ChangeLog: * gcc.target/i386/pr117116.c: New test. Bootstrapped and regression tested on x86_64-linux-gnu {-m32}. Uros. diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc index 2b774ff7c4e..63f5e348d64 100644 --- a/gcc/config/i386/i386-expand.cc +++ b/gcc/config/i386/i386-expand.cc @@ -18263,6 +18263,8 @@ quarter: else if (use_vec_merge) { do_vec_merge: + if (!nonimmediate_operand (val, inner_mode)) + val = force_reg (inner_mode, val); tmp = gen_rtx_VEC_DUPLICATE (mode, val); tmp = gen_rtx_VEC_MERGE (mode, tmp, target, GEN_INT (HOST_WIDE_INT_1U << elt)); diff --git a/gcc/testsuite/gcc.target/i386/pr117116.c b/gcc/testsuite/gcc.target/i386/pr117116.c new file mode 100644 index 00000000000..d6e28848a4b --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr117116.c @@ -0,0 +1,18 @@ +/* PR target/117116 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -mavx2" } */ + +typedef void (*StmFct)(); +typedef struct { + StmFct fct_getc; + StmFct fct_putc; + StmFct fct_flush; + StmFct fct_close; +} StmInf; + +StmInf TTY_Getc_pstm; + +void TTY_Getc() { + TTY_Getc_pstm.fct_getc = TTY_Getc; + TTY_Getc_pstm.fct_putc = TTY_Getc_pstm.fct_flush = TTY_Getc_pstm.fct_close = (StmFct)1; +}