From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 59DFB3858C60 for ; Fri, 8 Dec 2023 02:25:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 59DFB3858C60 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 59DFB3858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702002337; cv=none; b=r/N0ZyCGpVOW8tldpyGfM5ArXYGItmJaS/fU+TGJxKi2Ii1s8QZ2XPC+Qs2Eiq5LWCKHGY85RipaRY4fyp1pm2Y0xDiLsts8Baik3EKxCcHg0IPPRMl5FWu8fXUkdgfn7R7pQjIwNKTtFUWV0VyVkKIrpYlGd9odiqPHb27AAcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702002337; c=relaxed/simple; bh=CDShpX6osfqBNZ5YVbQSH+q1EPdJfbhoJ9KH9/eJyRk=; h=DKIM-Signature:Message-ID:Date:Subject:To:From:MIME-Version; b=fO1QrUf0jvNMb/QCbblLn5+ys4KTHaNrResVgZvKBU+NZejfgY0wQNLM9KfO6LUeE0GqLYe7tiplkRpLLQeIoYo/tgRBbTau2fjL0BYvCmfvd4M1OdzJm59Ms94xTEyCaLDRN5BRgcVCOIU/ANu1jp9ZUYiZv/qmo+UplS6awS8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B82PBwV022970; Fri, 8 Dec 2023 02:25:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=PIDQih8DWMkYqiJBVv31eyhslEhtlBhXS3Lv7nKRKP8=; b=c19UspZyf5Cb9drlENCLmWoculflnRhja3l5vzxov3eh9yf2Fr7uPxO838xyx5+g7MW2 hTOZJXQ50FxSk1uh8wS7oCmsTDngt2ms4H1CIvQWuyoZNYtSxQfRbpGqD6PxEtA0B/If Y1GCH6Rk7GJqoKmEoAMJIGDSw6ktEIjkYy6MpYSwHXY3BPiIiECS3dtankQV3kxsK3GC rMwlTlvRvoNy9yy5J7zYPJTd8SGE6K3+VWiFaM8fASaA7xVAY5bA+AIbgtyd5IdV8k3F 2MRx9RvEudOT9ccx97XSP9Xiopk6FkleuroPAufHRjiAxmojX9UAbeqdr5skagKzgtzN jA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uutb9006v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 08 Dec 2023 02:25:33 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3B82PDrY023027; Fri, 8 Dec 2023 02:25:33 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uutb9006m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 08 Dec 2023 02:25:33 +0000 Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3B827Abi004667; Fri, 8 Dec 2023 02:25:32 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3utav4q3et-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 08 Dec 2023 02:25:32 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3B82PTW846989628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Dec 2023 02:25:29 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6DE1020040; Fri, 8 Dec 2023 02:25:29 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 920122004F; Fri, 8 Dec 2023 02:25:27 +0000 (GMT) Received: from [9.197.246.45] (unknown [9.197.246.45]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 8 Dec 2023 02:25:27 +0000 (GMT) Message-ID: <3b4ac7a7-52e0-f6e3-87e4-dc293649c8c8@linux.ibm.com> Date: Fri, 8 Dec 2023 10:25:26 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [patch-2v3, rs6000] Guard fctid on PowerPC64 and PowerPC476 [PR112707] Content-Language: en-US To: HAO CHEN GUI Cc: Segher Boessenkool , David , Peter Bergner , gcc-patches References: <40de57ec-4686-4650-bdfa-3576b1f44051@linux.ibm.com> From: "Kewen.Lin" In-Reply-To: <40de57ec-4686-4650-bdfa-3576b1f44051@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2o6TnJWoaFqiS70s0RdGJoJ951zI07Dq X-Proofpoint-GUID: IRdgKwOSPc82dxDqrkDlWp6idhryEBCB Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-07_19,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 clxscore=1015 phishscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312080019 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Haochen, on 2023/12/8 09:58, HAO CHEN GUI wrote: > Hi, > The "fctid" is supported on 64-bit Power processors and PowerPC476. It > need a guard to check it. The patch fixes the issue. > > Compared with last version, > https://gcc.gnu.org/pipermail/gcc-patches/2023-December/639536.html > the main change is to change the target requirement in pr88558*.c. > > Bootstrapped and tested on x86 and powerpc64-linux BE and LE with no > regressions. Is this OK for trunk? > > > ChangeLog > rs6000: Guard fctid on PowerPC64 and PowerPC476. > > fctid is supported on 64-bit Power processors and powerpc 476. It should Nit: s/is/is only/ > be guarded by this condition. The patch fixes the issue. > > gcc/ > PR target/112707 > * config/rs6000/rs6000.h (TARGET_FCTID): Define. > * config/rs6000/rs6000.md (lrintdi2): Add guard TARGET_FCTID. > * (lrounddi2): Replace TARGET_FPRND with TARGET_FCTID. > > gcc/testsuite/ > PR target/112707 > * gcc.target/powerpc/pr112707.h: New. > * gcc.target/powerpc/pr112707-2.c: New. > * gcc.target/powerpc/pr112707-3.c: New. > * gcc.target/powerpc/pr88558-p7.c: Check fctid on ilp32 and > has_arch_ppc64 as it's now guarded by powerpc64. > * gcc.target/powerpc/pr88558-p8.c: Likewise. > * gfortran.dg/nint_p7.f90: Add powerpc64 target requirement as > lrounddi2 is now guarded by powerpc64. > > patch.diff > diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h > index 22595f6ebd7..8c29ca68ccf 100644 > --- a/gcc/config/rs6000/rs6000.h > +++ b/gcc/config/rs6000/rs6000.h > @@ -467,6 +467,8 @@ extern int rs6000_vector_align[]; > #define TARGET_FCFIDUS TARGET_POPCNTD > #define TARGET_FCTIDUZ TARGET_POPCNTD > #define TARGET_FCTIWUZ TARGET_POPCNTD > +/* Enable fctid on ppc64 and powerpc476. */ Nit: Changed to "Only powerpc64 and powerpc476 support fctid." Ok for trunk with the nits fixed, thanks! BR, Kewen > +#define TARGET_FCTID (TARGET_POWERPC64 || rs6000_cpu == PROCESSOR_PPC476) > #define TARGET_CTZ TARGET_MODULO > #define TARGET_EXTSWSLI (TARGET_MODULO && TARGET_POWERPC64) > #define TARGET_MADDLD TARGET_MODULO > diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md > index 2a1b5ecfaee..3be79d49dc0 100644 > --- a/gcc/config/rs6000/rs6000.md > +++ b/gcc/config/rs6000/rs6000.md > @@ -6718,7 +6718,7 @@ (define_insn "lrintdi2" > [(set (match_operand:DI 0 "gpc_reg_operand" "=d") > (unspec:DI [(match_operand:SFDF 1 "gpc_reg_operand" "")] > UNSPEC_FCTID))] > - "TARGET_HARD_FLOAT" > + "TARGET_HARD_FLOAT && TARGET_FCTID" > "fctid %0,%1" > [(set_attr "type" "fp")]) > > @@ -6784,7 +6784,7 @@ (define_expand "lrounddi2" > (set (match_operand:DI 0 "gpc_reg_operand") > (unspec:DI [(match_dup 2)] > UNSPEC_FCTID))] > - "TARGET_HARD_FLOAT && TARGET_VSX && TARGET_FPRND" > + "TARGET_HARD_FLOAT && TARGET_VSX && TARGET_FCTID" > { > operands[2] = gen_reg_rtx (mode); > }) > diff --git a/gcc/testsuite/gcc.target/powerpc/pr112707-2.c b/gcc/testsuite/gcc.target/powerpc/pr112707-2.c > new file mode 100644 > index 00000000000..672e00691ea > --- /dev/null > +++ b/gcc/testsuite/gcc.target/powerpc/pr112707-2.c > @@ -0,0 +1,9 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -mdejagnu-cpu=7450 -fno-math-errno" } */ > +/* { dg-require-effective-target ilp32 } */ > +/* { dg-skip-if "" { has_arch_ppc64 } } */ > +/* { dg-final { scan-assembler-not {\mfctid\M} } } */ > + > +/* powerpc 7450 doesn't support ppc64 (-m32 -mpowerpc64), so skips it. */ > + > +#include "pr112707.h" > diff --git a/gcc/testsuite/gcc.target/powerpc/pr112707-3.c b/gcc/testsuite/gcc.target/powerpc/pr112707-3.c > new file mode 100644 > index 00000000000..924338fd390 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/powerpc/pr112707-3.c > @@ -0,0 +1,9 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -fno-math-errno -mdejagnu-cpu=476fp" } */ > +/* { dg-require-effective-target ilp32 } */ > + > +/* powerpc 476fp has hard float enabled which is required by fctid */ > + > +#include "pr112707.h" > + > +/* { dg-final { scan-assembler-times {\mfctid\M} 2 } } */ > diff --git a/gcc/testsuite/gcc.target/powerpc/pr112707.h b/gcc/testsuite/gcc.target/powerpc/pr112707.h > new file mode 100644 > index 00000000000..e427dc6a72e > --- /dev/null > +++ b/gcc/testsuite/gcc.target/powerpc/pr112707.h > @@ -0,0 +1,10 @@ > +long long test1 (double a) > +{ > + return __builtin_llrint (a); > +} > + > +long long test2 (float a) > +{ > + return __builtin_llrint (a); > +} > + > diff --git a/gcc/testsuite/gcc.target/powerpc/pr88558-p7.c b/gcc/testsuite/gcc.target/powerpc/pr88558-p7.c > index 3932656c5fd..2fa0b997e52 100644 > --- a/gcc/testsuite/gcc.target/powerpc/pr88558-p7.c > +++ b/gcc/testsuite/gcc.target/powerpc/pr88558-p7.c > @@ -6,7 +6,7 @@ > #include "pr88558.h" > > /* { dg-final { scan-assembler-times {\mfctid\M} 4 { target lp64 } } } */ > -/* { dg-final { scan-assembler-times {\mfctid\M} 2 { target ilp32 } } } */ > +/* { dg-final { scan-assembler-times {\mfctid\M} 2 { target { ilp32 && has_arch_ppc64 } } } } */ > /* { dg-final { scan-assembler-times {\mfctiw\M} 2 { target lp64 } } } */ > /* { dg-final { scan-assembler-times {\mfctiw\M} 4 { target ilp32 } } } */ > /* { dg-final { scan-assembler-times {\mstfiwx\M} 2 { target lp64 } } } */ > diff --git a/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c b/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c > index 1afc8fd4f0d..fffb5b88c20 100644 > --- a/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c > +++ b/gcc/testsuite/gcc.target/powerpc/pr88558-p8.c > @@ -7,7 +7,7 @@ > #include "pr88558.h" > > /* { dg-final { scan-assembler-times {\mfctid\M} 4 { target lp64 } } } */ > -/* { dg-final { scan-assembler-times {\mfctid\M} 2 { target ilp32 } } } */ > +/* { dg-final { scan-assembler-times {\mfctid\M} 2 { target { ilp32 && has_arch_ppc64 } } } } */ > /* { dg-final { scan-assembler-times {\mfctiw\M} 2 { target lp64 } } } */ > /* { dg-final { scan-assembler-times {\mfctiw\M} 4 { target ilp32 } } } */ > /* { dg-final { scan-assembler-times {\mmfvsrwz\M} 2 { target lp64 } } } */ > diff --git a/gcc/testsuite/gfortran.dg/nint_p7.f90 b/gcc/testsuite/gfortran.dg/nint_p7.f90 > index 2239824a7fb..c23eb6783bc 100644 > --- a/gcc/testsuite/gfortran.dg/nint_p7.f90 > +++ b/gcc/testsuite/gfortran.dg/nint_p7.f90 > @@ -2,6 +2,7 @@ > ! { dg-do compile { target { powerpc*-*-* } } } > ! { dg-require-effective-target powerpc_vsx_ok } > ! { dg-options "-O2 -mdejagnu-cpu=power7 -ffast-math" } > +! { dg-require-effective-target has_arch_ppc64 } > ! { dg-final { scan-assembler-times "xsrdpi" 2 } } > > subroutine test_nint(x4,x8) BR, Kewen