From patchwork Mon Mar 14 13:49:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 51949 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BD9E5388CC1C for ; Mon, 14 Mar 2022 13:49:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD9E5388CC1C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1647265775; bh=MmBOsQLDWZneCPSPMcTF1jwdzTrDtkMIryCkKSYmjYg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=OvwhXHBs/47k5gEgHca7ir84n7RYoc0gy6+hEFnVoPEDabJOB+UHd7YMTAwjupqI6 xf2KxITINzBoPxXrEa/M5smVMjpMxMeMth2llUFW5wxgnw+cSvfc9QT5Yk7vpAtysw pqdGiO8qjHR0Pbd5wcHOtu7qei4FO/bRZ/l/Iags= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id A80E3385E02D for ; Mon, 14 Mar 2022 13:49:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A80E3385E02D Received: by mail-pf1-x432.google.com with SMTP id g19so14436970pfc.9 for ; Mon, 14 Mar 2022 06:49:04 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=MmBOsQLDWZneCPSPMcTF1jwdzTrDtkMIryCkKSYmjYg=; b=geVylmvmsqb30h2AeawrIwjhcMrk7rPAgvj8t2/KNYNYZSljfsZsEdZ48itH4TzGbW oOpRSbs4RjfGbuDy8u9y/9L8RhGPJiepWM+24I1rGWQP9olvUYsuphryxhLECeLStugi y5fGtAXGOBZoEdTs7uvlSCngRl3oTMgDmhNwahCbnop51hJMGwydOzLOsjJvXn5D4S3t oyyngfQ+609c7Mb4UCvtRde8sRcrOqBX13KZixOkCuX75415opbPrqPE/tqDP7Fvo1L0 49hGve/D0alHKN9a1Uj+90j+mSdRJh8UtR3Laz+RArLXxUds+SJgGpaZhuIJ/qz9IY9w fVOg== X-Gm-Message-State: AOAM531jXuN3jfdCq/hrwXh/tqRsL1eUxvSCIliENOmt8k6mIwOIob3F gkSsAP11sriCV+8atDK9im3khToaOBw= X-Google-Smtp-Source: ABdhPJwwSdrO/aQuhixtLRmuEWIEl6uyN//5IxRa/hdmGCKaEj67fMcCcm9pfAwW3dwuLTM0FjbIKg== X-Received: by 2002:a63:2fc7:0:b0:381:15fb:3072 with SMTP id v190-20020a632fc7000000b0038115fb3072mr13329337pgv.340.1647265743347; Mon, 14 Mar 2022 06:49:03 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.35.176]) by smtp.gmail.com with ESMTPSA id pf15-20020a17090b1d8f00b001bf5d59a8fdsm23420500pjb.2.2022.03.14.06.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 06:49:03 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 002A1C0461; Mon, 14 Mar 2022 06:49:01 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Ignore OPTION_MASK_ISA_64BIT for -m32 when inlining Date: Mon, 14 Mar 2022 06:49:01 -0700 Message-Id: <20220314134901.1252090-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" gcc/ PR target/104890 * config/i386/i386.cc (ix86_can_inline_p): Ignore OPTION_MASK_ISA_64BIT for -m32. gcc/testsuite/ PR target/104890 * gcc.target/i386/pr104890.c: New test. --- gcc/config/i386/i386.cc | 4 ++++ gcc/testsuite/gcc.target/i386/pr104890.c | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/gcc.target/i386/pr104890.c diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 23bedea92bd..f2bb4765e5b 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -587,6 +587,10 @@ ix86_can_inline_p (tree caller, tree callee) if (TARGET_GENERAL_REGS_ONLY_P (callee_opts->x_ix86_target_flags)) always_inline_safe_mask |= MASK_80387; + /* Ignore OPTION_MASK_ISA_64BIT for -m32. */ + if (!TARGET_64BIT) + always_inline_safe_mask |= OPTION_MASK_ISA_64BIT; + cgraph_node *callee_node = cgraph_node::get (callee); /* Callee's isa options should be a subset of the caller's, i.e. a SSE4 function can inline a SSE2 function but a SSE2 function can't inline diff --git a/gcc/testsuite/gcc.target/i386/pr104890.c b/gcc/testsuite/gcc.target/i386/pr104890.c new file mode 100644 index 00000000000..cb430eef688 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr104890.c @@ -0,0 +1,11 @@ +/* { dg-do compile { target ia32 } } */ +/* { dg-options "-O2 -mshstk -march=i686" } */ + +#include + +__attribute__((target ("general-regs-only"))) +int +foo () +{ + return _get_ssp (); +}