From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 48690 invoked by alias); 19 May 2016 03:43:14 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 48669 invoked by uid 89); 19 May 2016 03:43:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=scans, altogether X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 19 May 2016 03:43:02 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1b3ErT-0001xV-NZ from Cesar_Philippidis@mentor.com ; Wed, 18 May 2016 20:42:59 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Wed, 18 May 2016 20:42:59 -0700 Subject: Re: inhibit the sincos optimization when the target has sin and cos instructions To: Nathan Sidwell , Andrew Pinski References: <573628A1.1030501@codesourcery.com> <862033F1-A268-4236-B908-558C102199B5@gmail.com> <573B88B0.2080508@codesourcery.com> <573B8D84.4070908@codesourcery.com> <15446f73-b60a-c3f2-321e-80e0038785f1@acm.org> CC: Richard Biener , "gcc-patches@gcc.gnu.org" From: Cesar Philippidis Message-ID: <573D3642.8080203@codesourcery.com> Date: Thu, 19 May 2016 03:43:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <15446f73-b60a-c3f2-321e-80e0038785f1@acm.org> Content-Type: multipart/mixed; boundary="------------040207050302080403030402" X-SW-Source: 2016-05/txt/msg01428.txt.bz2 --------------040207050302080403030402 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-length: 2169 On 05/18/2016 05:29 AM, Nathan Sidwell wrote: > On 05/17/16 17:30, Cesar Philippidis wrote: >> On 05/17/2016 02:22 PM, Andrew Pinski wrote: >>>> gcc.sum >>>> Tests that now fail, but worked before: >>>> >>>> nvptx-none-run: gcc.c-torture/execute/20100316-1.c -Os execution >>>> test >>>> nvptx-none-run: gcc.c-torture/execute/20100708-1.c -O1 execution >>>> test >>>> nvptx-none-run: gcc.c-torture/execute/20100805-1.c -O0 execution >>>> test >>>> nvptx-none-run: gcc.dg/torture/pr52028.c -O3 -fomit-frame-pointer >>>> -funroll-loops -fpeel-loops -ftracer -finline-functions execution test >>>> nvptx-none-run: gcc.dg/torture/pr52028.c -O3 -g execution test >>>> > > Please determine why these now fail. Those were failing intermittently, at least on my desktop. I'll look into that it next. >> +(define_expand "sincossf3" >> + [(set (match_operand:SF 0 "nvptx_register_operand" "=R") >> + (unspec:SF [(match_operand:SF 2 "nvptx_register_operand" "R")] >> + UNSPEC_COS)) >> + (set (match_operand:SF 1 "nvptx_register_operand" "=R") >> + (unspec:SF [(match_dup 2)] UNSPEC_SIN))] >> + "flag_unsafe_math_optimizations" >> +{ >> + emit_insn (gen_sinsf2 (operands[1], operands[2])); >> + emit_insn (gen_cossf2 (operands[0], operands[2])); >> + >> + DONE; >> +}) > > Why the emit_insn code? that seems to be replicating the RTL > representation -- you're saying the same thing twice. > > Doesn't operands[2] need (conditionally) copying to a new register -- > what if it aliases operands[1]? This patch does that now. >> +++ b/gcc/testsuite/gcc.target/nvptx/sincos-2.c >> @@ -0,0 +1,30 @@ >> +/* { dg-do run } */ >> +/* { dg-options "-O2 -ffast-math" } */ >> + > > What is this test trying to test? I'm puzzled by it. (btw, don't use > assert, either abort, exit(1) or return from main.) My intent was to verify that I got the sin and cos arguments right, i.e., make sure that this sincos expansion didn't mix up sin(x) with cos(x). I guess I can create a test that uses vprintf and scans dg-output for the proper results. But in this patch I just omitted that test case altogether. Is this patch ok for trunk? Cesar --------------040207050302080403030402 Content-Type: text/x-patch; name="nvptx-sincos-20160518.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="nvptx-sincos-20160518.diff" Content-length: 1724 2016-05-18 Cesar Philippidis gcc/ * config/nvptx/nvptx.md (sincossf3): New pattern. gcc/testsuite/ * gcc.target/nvptx/sincos.c: New test. diff --git a/gcc/config/nvptx/nvptx.md b/gcc/config/nvptx/nvptx.md index 33a4862..69bbb22 100644 --- a/gcc/config/nvptx/nvptx.md +++ b/gcc/config/nvptx/nvptx.md @@ -794,6 +794,24 @@ "" "%.\\tsqrt%#%t0\\t%0, %1;") +(define_expand "sincossf3" + [(set (match_operand:SF 0 "nvptx_register_operand" "=R") + (unspec:SF [(match_operand:SF 2 "nvptx_register_operand" "R")] + UNSPEC_COS)) + (set (match_operand:SF 1 "nvptx_register_operand" "=R") + (unspec:SF [(match_dup 2)] UNSPEC_SIN))] + "flag_unsafe_math_optimizations" +{ + if (REGNO (operands[0]) == REGNO (operands[2])) + { + rtx tmp = gen_reg_rtx (GET_MODE (operands[2])); + emit_insn (gen_rtx_SET (tmp, operands[2])); + emit_insn (gen_sinsf2 (operands[1], tmp)); + emit_insn (gen_cossf2 (operands[0], tmp)); + DONE; + } +}) + (define_insn "sinsf2" [(set (match_operand:SF 0 "nvptx_register_operand" "=R") (unspec:SF [(match_operand:SF 1 "nvptx_register_operand" "R")] diff --git a/gcc/testsuite/gcc.target/nvptx/sincos.c b/gcc/testsuite/gcc.target/nvptx/sincos.c new file mode 100644 index 0000000..921ec41 --- /dev/null +++ b/gcc/testsuite/gcc.target/nvptx/sincos.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ffast-math" } */ + +extern float sinf (float); +extern float cosf (float); + +float +sincos_add (float x) +{ + float s = sinf (x); + float c = cosf (x); + + return s + c; +} + +/* { dg-final { scan-assembler-times "sin.approx.f32" 1 } } */ +/* { dg-final { scan-assembler-times "cos.approx.f32" 1 } } */ --------------040207050302080403030402--