From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by sourceware.org (Postfix) with ESMTPS id C4C15385803B for ; Thu, 4 Jan 2024 22:32:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C4C15385803B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dabbelt.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=dabbelt.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C4C15385803B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1032 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704407540; cv=none; b=aKuNgT3CwEZuM6gswn3xBDgH+rbADrQYH8AFsYy0IsryuCZK7GUcMg60KzblVkeP0O3jGyERosa/+VEmByzga3KAVmgyld4wqNYNO5sDV79sKU3GQUTEBVvLHEy/F+15gvqk0iiRT0Z4Qcjq5FvLzAJRPKsC8OdS8bKXyJOfFH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704407540; c=relaxed/simple; bh=8Lmr79bmC/5mhDxNJKQZcNHyBemh8BhOS9OvpW+xyYo=; h=DKIM-Signature:Date:Subject:From:To:Message-ID; b=F6J6epOAVFIDqUJSJtXPutRaf4/6qIjfNaJ9MrgS0lAFQf16Qlhb6QudJyZr/SJ+nPe41iiHyLsq4Q7WNNjQ2EcfM2wh6bPWlagGorq68NxpC1cIAPkL9jBjb6PTNQeOB5QeXqenwmT71NyIsKSuAob9gedJU3OaJZ4gM24msJw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-28c0df4b42eso21685a91.1 for ; Thu, 04 Jan 2024 14:32:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20230601.gappssmtp.com; s=20230601; t=1704407526; x=1705012326; darn=gcc.gnu.org; h=message-id:to:from:cc:in-reply-to:subject:date:from:to:cc:subject :date:message-id:reply-to; bh=HNli/TJ87osO6g49dcyEmhXQIO8wZrd+oHTlSaRfm1k=; b=RpyXVerhg2+zWHWpdmMsJG57J4bdcPE3wixWLryH4XMdxLcYK2EdqfGWsMVdwPYxYX fb48/So+2cqHp9DVuy/1H6ZoNYaX5ZppQB+OpiDlpPdE9l1lnjL/dXQzkE6dt0696Y7b N0tF1xG7ueER/Z7kSc609YUDZU/MyMETICf2a9IS8R5jk7sINui8D1iliC8W1THvZdm+ 338Ov/W/VxpLZF9wjzuqDEksayg4B/9+hg6vdiVkTPHb8S0RF62hajNAeisopM9YLJEY SgmV46b8omq9oBdzWD7Ik+p8vTcbwjckuBn7Ml4dQC7nNiS9G3spOCprUT1005WP0v8N qajQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704407526; x=1705012326; h=message-id:to:from:cc:in-reply-to:subject:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HNli/TJ87osO6g49dcyEmhXQIO8wZrd+oHTlSaRfm1k=; b=w9s68XIGvlBQ+LnvHP7Zw+tlKnCY6kieCjzj3qR6P+sHRjHoB2tDvDUjeTidqfr/2k Wrs1fU9TCxmTNV98GNoZElm6G49h03GCv+1Vtd81PYKYEKd9RS3wpwojqZ/OekAeLIV9 jPqalmx6RuZYc/dcSeDaifq74QrGe6QCCXZt2e1tzisctj5ObM1uWArNH7N/8BDditJO m6J/kW3g2P4qxSQYS4PJC61rJEpYjIJVzlekHcKXo6Fym1StctYJthdkxWOwW3iGtNCQ IsMWn4iutmxjDH5r/Q9FSw9/DHeXnuDrHmS9y2xZP5a0OfTIR707J4YSeg+Dd2sCmTbE zVRg== X-Gm-Message-State: AOJu0YwRRL4w3PppyqtF/x0NoQlKqoT1VJxrUbXRRSYS8OmgiNsGN/Sw RiKao0nalCXv+RqdZtvIn0gIcnYcAw1LC8go7+5N4hLxEJw= X-Google-Smtp-Source: AGHT+IEavIa6fsXccIk+e5o6r4udYbN7k0gWcWgtX44EVaUH7tJrCiPw8obarNNaH6B7it3VgzStmQ== X-Received: by 2002:a17:90a:b945:b0:28b:d358:d50c with SMTP id f5-20020a17090ab94500b0028bd358d50cmr1416472pjw.34.1704407526247; Thu, 04 Jan 2024 14:32:06 -0800 (PST) Received: from localhost ([12.44.203.122]) by smtp.gmail.com with ESMTPSA id pd8-20020a17090b1dc800b0028ae9cb6ce0sm4363721pjb.6.2024.01.04.14.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 14:32:05 -0800 (PST) Date: Thu, 04 Jan 2024 14:32:05 -0800 (PST) X-Google-Original-Date: Thu, 04 Jan 2024 14:32:00 PST (-0800) Subject: Re: [PATCH]middle-end: Don't apply copysign optimization if target does not implement optab [PR112468] In-Reply-To: CC: gcc-patches@gcc.gnu.org, nd@arm.com, rguenther@suse.de, Jeff Law From: Palmer Dabbelt To: tamar.christina@arm.com Message-ID: X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,KAM_LOTSOFHASH,RCVD_IN_DNSWL_NONE,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: On Thu, 04 Jan 2024 10:20:25 PST (-0800), tamar.christina@arm.com wrote: > Hi All, > > currently GCC does not treat IFN_COPYSIGN the same as the copysign tree expr. > The latter has a libcall fallback and the IFN can only do optabs. > > Because of this the change I made to optimize copysign only works if the > target has impemented the optab, but it should work for those that have the > libcall too. > > More annoyingly if a target has vector versions of ABS and NEG but not COPYSIGN > then the change made them lose vectorization. > > The proper fix for this is to treat the IFN the same as the tree EXPR and to > enhance expand_COPYSIGN to also support vector calls. > > I have such a patch for GCC 15 but it's quite big and too invasive for stage-4. > As such this is a minimal fix, just don't apply the transformation and leave > targets which don't have the optab unoptimized. > > Targets list for check_effective_target_ifn_copysign was gotten by grepping for > copysign and looking at the optab. > > Bootstrapped Regtested on aarch64-none-linux-gnu and no issues. > Tests ran in x86_64-pc-linux-gnu -m64/-m32 and tests no longer fail. > > Ok for master? > > Thanks, > Tamar > > gcc/ChangeLog: > > PR tree-optimization/112468 > * doc/sourcebuild.texi: Document ifn_copysign. > * match.pd: Only apply transformation if target supports the IFN. > > gcc/testsuite/ChangeLog: > > PR tree-optimization/112468 > * gcc.dg/fold-copysign-1.c: Modify tests based on if target supports > IFN_COPYSIGN. > * gcc.dg/pr55152-2.c: Likewise. > * gcc.dg/tree-ssa/abs-4.c: Likewise. > * gcc.dg/tree-ssa/backprop-6.c: Likewise. > * gcc.dg/tree-ssa/copy-sign-2.c: Likewise. > * gcc.dg/tree-ssa/mult-abs-2.c: Likewise. > * lib/target-supports.exp (check_effective_target_ifn_copysign): New. > > --- inline copy of patch -- > diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi > index 4be67daedb20d394857c02739389cabf23c0d533..f4847dafe65cbbf8c9de34905f614ef6957658b4 100644 > --- a/gcc/doc/sourcebuild.texi > +++ b/gcc/doc/sourcebuild.texi > @@ -2664,6 +2664,10 @@ Target requires a command line argument to enable a SIMD instruction set. > @item xorsign > Target supports the xorsign optab expansion. > > +@item ifn_copysign > +Target supports the IFN_COPYSIGN optab expansion for both scalar and vector > +types. > + > @end table > > @subsubsection Environment attributes > diff --git a/gcc/match.pd b/gcc/match.pd > index d57e29bfe1d68afd4df4dda20fecc2405ff05332..87d13e7e3e1aa6d89119142b614890dc4729b521 100644 > --- a/gcc/match.pd > +++ b/gcc/match.pd > @@ -1159,13 +1159,22 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > (simplify > (copysigns @0 REAL_CST@1) > (if (!REAL_VALUE_NEGATIVE (TREE_REAL_CST (@1))) > - (abs @0)))) > + (abs @0) > +#if GIMPLE > + (if (!direct_internal_fn_supported_p (IFN_COPYSIGN, type, > + OPTIMIZE_FOR_BOTH)) > + (negate (abs @0))) > +#endif > + ))) > > +#if GIMPLE > /* Transform fneg (fabs (X)) -> copysign (X, -1). */ > (simplify > (negate (abs @0)) > - (IFN_COPYSIGN @0 { build_minus_one_cst (type); })) > - > + (if (direct_internal_fn_supported_p (IFN_COPYSIGN, type, > + OPTIMIZE_FOR_BOTH)) > + (IFN_COPYSIGN @0 { build_minus_one_cst (type); }))) > +#endif > /* copysign(copysign(x, y), z) -> copysign(x, z). */ > (for copysigns (COPYSIGN_ALL) > (simplify > diff --git a/gcc/testsuite/gcc.dg/fold-copysign-1.c b/gcc/testsuite/gcc.dg/fold-copysign-1.c > index f9cafd14ab05f5e8ab2f6f68e62801d21c2df6a6..96b80c733794fffada1b08274ef39cc8f6e442ce 100644 > --- a/gcc/testsuite/gcc.dg/fold-copysign-1.c > +++ b/gcc/testsuite/gcc.dg/fold-copysign-1.c > @@ -1,5 +1,6 @@ > /* { dg-do compile } */ > /* { dg-options "-O -fdump-tree-cddce1" } */ > +/* { dg-additional-options "-msse -mfpmath=sse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ > > double foo (double x) > { > @@ -12,5 +13,7 @@ double bar (double x) > return __builtin_copysign (x, minuszero); > } > > -/* { dg-final { scan-tree-dump-times "__builtin_copysign" 1 "cddce1" } } */ > -/* { dg-final { scan-tree-dump-times "= ABS_EXPR" 1 "cddce1" } } */ > +/* { dg-final { scan-tree-dump-times "__builtin_copysign" 1 "cddce1" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "= ABS_EXPR" 1 "cddce1" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "= -" 1 "cddce1" { target { ! ifn_copysign } } } } */ > +/* { dg-final { scan-tree-dump-times "= ABS_EXPR" 2 "cddce1" { target { ! ifn_copysign } } } } */ > diff --git a/gcc/testsuite/gcc.dg/pr55152-2.c b/gcc/testsuite/gcc.dg/pr55152-2.c > index 605f202ed6bc7aa8fe921457b02ff0b88cc63ce6..24068cffa4a8e2807ba7d16c4ed3def4f736e797 100644 > --- a/gcc/testsuite/gcc.dg/pr55152-2.c > +++ b/gcc/testsuite/gcc.dg/pr55152-2.c > @@ -1,5 +1,6 @@ > /* { dg-do compile } */ > /* { dg-options "-O -ffinite-math-only -fno-signed-zeros -fstrict-overflow -fdump-tree-optimized" } */ > +/* { dg-additional-options "-msse -mfpmath=sse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ > > double g (double a) > { > @@ -10,5 +11,6 @@ int f(int a) > return (a<-a)?a:-a; > } > > -/* { dg-final { scan-tree-dump-times "\.COPYSIGN" 1 "optimized" } } */ > -/* { dg-final { scan-tree-dump-times "ABS_EXPR" 1 "optimized" } } */ > +/* { dg-final { scan-tree-dump-times "\.COPYSIGN" 1 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "ABS_EXPR" 1 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "ABS_EXPR" 2 "optimized" { target { ! ifn_copysign } } } } */ > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/abs-4.c b/gcc/testsuite/gcc.dg/tree-ssa/abs-4.c > index e1b825f37f69ac3c4666b3a52d733368805ad31d..80fa448df1259c7dba406797f4198205783a2fba 100644 > --- a/gcc/testsuite/gcc.dg/tree-ssa/abs-4.c > +++ b/gcc/testsuite/gcc.dg/tree-ssa/abs-4.c > @@ -1,5 +1,6 @@ > /* { dg-do compile } */ > /* { dg-options "-O1 -fdump-tree-optimized" } */ > +/* { dg-additional-options "-msse -mfpmath=sse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ > /* PR tree-optimization/109829 */ > > float abs_f(float x) { return __builtin_signbit(x) ? x : -x; } > @@ -9,6 +10,8 @@ long double abs_ld(long double x) { return __builtin_signbit(x) ? x : -x; } > > /* __builtin_signbit(x) ? x : -x. Should be convert into - ABS_EXP */ > /* { dg-final { scan-tree-dump-not "signbit" "optimized"} } */ > -/* { dg-final { scan-tree-dump-times "= ABS_EXPR" 1 "optimized"} } */ > -/* { dg-final { scan-tree-dump-times "= -" 1 "optimized"} } */ > -/* { dg-final { scan-tree-dump-times "= \.COPYSIGN" 2 "optimized"} } */ > +/* { dg-final { scan-tree-dump-times "= ABS_EXPR" 1 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "= -" 1 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "= \.COPYSIGN" 2 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "= ABS_EXPR" 3 "optimized" { target { ! ifn_copysign } } } } */ > +/* { dg-final { scan-tree-dump-times "= -" 3 "optimized" { target { ! ifn_copysign } } } } */ > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/backprop-6.c b/gcc/testsuite/gcc.dg/tree-ssa/backprop-6.c > index c3a138642d6ff7be984e91fa1343cb2718db7ae1..4087ba93018bb71710102eb379460bc760020081 100644 > --- a/gcc/testsuite/gcc.dg/tree-ssa/backprop-6.c > +++ b/gcc/testsuite/gcc.dg/tree-ssa/backprop-6.c > @@ -1,5 +1,6 @@ > /* { dg-do compile } */ > /* { dg-options "-O -fdump-tree-backprop-details" } */ > +/* { dg-additional-options "-msse -mfpmath=sse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ > > void start (void *); > void end (void *); > @@ -26,6 +27,8 @@ TEST_FUNCTION (float, f) > TEST_FUNCTION (double, ) > TEST_FUNCTION (long double, l) > > -/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = -} 4 "backprop" } } */ > -/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = \.COPYSIGN} 2 "backprop" } } */ > -/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = ABS_EXPR <} 1 "backprop" } } */ > +/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = -} 4 "backprop" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = \.COPYSIGN} 2 "backprop" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = ABS_EXPR <} 1 "backprop" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = -} 6 "backprop" { target { ! ifn_copysign } } } } */ > +/* { dg-final { scan-tree-dump-times {Deleting[^\n]* = ABS_EXPR <} 3 "backprop" { target { ! ifn_copysign } } } } */ > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-2.c b/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-2.c > index e5d565c4b9832c00106588ef411fbd8c292a5cad..e43bc315bef2bd11c11cfd2685f5088e792b7bf7 100644 > --- a/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-2.c > +++ b/gcc/testsuite/gcc.dg/tree-ssa/copy-sign-2.c > @@ -1,4 +1,5 @@ > /* { dg-options "-O2 -ffast-math -fdump-tree-optimized" } */ > +/* { dg-additional-options "-msse -mfpmath=sse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ > /* { dg-do compile } */ > float f(float x) > { > @@ -10,5 +11,6 @@ float f1(float x) > float t = __builtin_copysignf (1.0f, -x); > return x * t; > } > -/* { dg-final { scan-tree-dump-times "ABS" 1 "optimized"} } */ > -/* { dg-final { scan-tree-dump-times ".COPYSIGN" 1 "optimized"} } */ > +/* { dg-final { scan-tree-dump-times "ABS" 1 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times ".COPYSIGN" 1 "optimized" { target ifn_copysign } } } */ > +/* { dg-final { scan-tree-dump-times "ABS" 2 "optimized" { target { ! ifn_copysign } } } } */ > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c b/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c > index a22896b21c8b5a4d5d8e28bd8ae0db896e63ade0..675127cfe56b2e9aa9d4c06e2bdce62b59545a08 100644 > --- a/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c > +++ b/gcc/testsuite/gcc.dg/tree-ssa/mult-abs-2.c > @@ -34,5 +34,5 @@ float i1(float x) > { > return x * (x <= 0.f ? 1.f : -1.f); > } > -/* { dg-final { scan-tree-dump-times "ABS" 4 "gimple"} } */ > -/* { dg-final { scan-tree-dump-times "\.COPYSIGN" 4 "gimple"} } */ > + > +/* { dg-final { scan-tree-dump-times "ABS" 8 "gimple" } } */ > diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp > index 7f13ff0ca565efdf19065811f3301db897329073..64a081cfafd78e5ccb7322d3b382f800b30bbe70 100644 > --- a/gcc/testsuite/lib/target-supports.exp > +++ b/gcc/testsuite/lib/target-supports.exp > @@ -7830,6 +7830,29 @@ proc check_effective_target_xorsign { } { > || [istarget aarch64*-*-*] || [istarget arm*-*-*] }}] > } > > +# Return 1 if the target plus current options supports folding of > +# copysign into IFN_COPYSIGN. > +# > +# This won't change for different subtargets so cache the result. > + > +proc check_effective_target_ifn_copysign { } { > + return [check_cached_effective_target_indexed ifn_copysign { > + expr { > + (([istarget i?86-*-*] || [istarget x86_64-*-*]) > + && [is-effective-target sse]) > + || ([istarget loongarch*-*-*] && [check_effective_target_loongarch_sx]) > + || ([istarget powerpc*-*-*] > + && ![istarget powerpc-*-linux*paired*]) > + || [istarget alpha*-*-*] > + || [istarget aarch64*-*-*] > + || [is-effective-target arm_neon] > + || ([istarget s390*-*-*] > + && [check_effective_target_s390_vx]) > + || ([istarget riscv*-*-*] > + && [check_effective_target_riscv_v]) Unless I'm missing something, we have copysign in the scalar floating-point ISAs as well. So I think this should be || ([istarget riscv*-*-*] && [check_effective_target_hard_float]) > + }}] > +} > + > # Return 1 if the target plus current options supports a vector > # widening summation of *short* args into *int* result, 0 otherwise. > #