From patchwork Fri Jul 28 04:42:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Gribov X-Patchwork-Id: 794632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-459224-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="VKQuxMb+"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xJbml3CFSz9s4q for ; Fri, 28 Jul 2017 14:42:29 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:cc:message-id:date:mime-version:content-type; q= dns; s=default; b=ZVn2oIQHUqAtOamzrB2HM1a9mxvM1L0RhsS5t+CZgGqKqP eEZ8lGlf04s3HMSsKDWXYaKsbIUxCymO5UO0+9nHf0JEwlGX0nZ/jlqsHn/gNHGb O62051jNsqIilvWKfP+6+6wX3Kl32Xtwb40B1Y+uZmXWD1o67bZ2enfk8sbaA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:cc:message-id:date:mime-version:content-type; s= default; bh=vfANO8bdeVzmNKVC8LhlNu+X3cg=; b=VKQuxMb+8aAlDo+fC4r1 Z0UYBPj2dj47aXo6bhdYxzGnrELdzM2vm3Vrz49H5fkEV8hXCEXswKEXEf6C/BnX lFK4xKmUh7CUwYPUYnMWN/FxZwl2zrHfidocWVtYtIuvdAeImhXz6p3lvNq8bVgG qR+n4Y4DsRKefO2OuikXz8g= Received: (qmail 124014 invoked by alias); 28 Jul 2017 04:42:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 123951 invoked by uid 89); 28 Jul 2017 04:42:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=8, 22 X-Spam-User: qpsmtpd, 5 recipients X-HELO: mail-wr0-f193.google.com Received: from mail-wr0-f193.google.com (HELO mail-wr0-f193.google.com) (209.85.128.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Jul 2017 04:42:13 +0000 Received: by mail-wr0-f193.google.com with SMTP id y67so24871292wrb.3; Thu, 27 Jul 2017 21:42:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:cc:message-id:date:user-agent :mime-version:content-language; bh=bVUYlEZlvcusuREd11NhkkkMxNntyC1bdeCg2kUV0OM=; b=pfaQRnVNERcYb23JFM95gT7ioUNSV6InFlj7cX00V8rUTJN/ChnqLoycSH5EirHwDz 3WecpqzsD9kTOrtXaGH/xFlCTQNZRSkdhn7Oge4m+NflEQkh51PsMXIi+1mLiYHkl8Rq utuXZrM+PqD4VBPN09ch+u6L/1sm52+vnMrf+Frp/NQqLW3Uku4OQTV6pazDsmQ4FA/3 iLN2Kly1qE1NHrtykalyQnf/sc0wAtc5jz71M+g5KRtdwYT19sqJdH0gW8ojXjSLQiVT X7P5msGDVbbLQuHRwmmpNqxiPEzD7fYl6rnvbExlQEtRSjTVozlKUyIugGDdrJKA1VFs xQsw== X-Gm-Message-State: AIVw112sMnmsmNIFERAK6WsryErisBcJO/6PFoLCsZdImi0lbDQmaRgx nDZlaniRkd2VVWcpE/I= X-Received: by 10.223.133.146 with SMTP id 18mr5140729wrt.214.1501216931243; Thu, 27 Jul 2017 21:42:11 -0700 (PDT) Received: from [192.168.1.158] (host86-162-252-79.range86-162.btcentralplus.com. [86.162.252.79]) by smtp.gmail.com with ESMTPSA id m72sm16543440wmg.16.2017.07.27.21.42.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jul 2017 21:42:10 -0700 (PDT) To: gcc-patches@gcc.gnu.org From: Yury Gribov Subject: [PATCH][PR target/81535] Fix tests on Power Cc: seurer@gcc.gnu.org, wschmidt@gcc.gnu.org, meissner@gcc.gnu.org, marxin Message-ID: <2bbe67af-554a-30f4-f391-6282ab65c7ef@gmail.com> Date: Fri, 28 Jul 2017 05:42:00 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 X-IsSubscribed: yes Hi all, This patch fixes issues reported in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81535 I removed call to g in pr79439.c because gcc was duplicating the basic block with call depending on compiler flags (so scan-assembler-times pattern wasn't reliable anymore). I also added alias to prevent inlining introduced by recent PR56727 patch. I added Power-specific pattern in pr56727-2.c testcase and disabled testing on Power in pr56727-1.c. Tested on powerpc64-unknown-linux-gnu. Ok for trunk? -Y 2017-07-28 Yury Gribov PR target/81535 * gcc.dg/pr56727-1.c: Do not check output on Power. * gcc.dg/pr56727-2.c: Fix pattern for Power. * gcc.target/powerpc/pr79439.c: Prevent inlining. diff -rupN gcc/gcc/testsuite/gcc.dg/pr56727-1.c gcc-81535/gcc/testsuite/gcc.dg/pr56727-1.c --- gcc/gcc/testsuite/gcc.dg/pr56727-1.c 2017-07-28 02:39:54.770046466 +0000 +++ gcc-81535/gcc/testsuite/gcc.dg/pr56727-1.c 2017-07-28 04:25:04.805648587 +0000 @@ -1,6 +1,6 @@ /* { dg-do compile { target fpic } } */ /* { dg-options "-O2 -fPIC" } */ -/* { dg-final { scan-assembler-not "@(PLT|plt)" { target i?86-*-* x86_64-*-* powerpc*-*-* } } } */ +/* { dg-final { scan-assembler-not "@(PLT|plt)" { target i?86-*-* x86_64-*-* } } } */ #define define_func(type) \ void f_ ## type (type b) { f_ ## type (0); } \ diff -rupN gcc/gcc/testsuite/gcc.dg/pr56727-2.c gcc-81535/gcc/testsuite/gcc.dg/pr56727-2.c --- gcc/gcc/testsuite/gcc.dg/pr56727-2.c 2017-07-28 02:39:54.770046466 +0000 +++ gcc-81535/gcc/testsuite/gcc.dg/pr56727-2.c 2017-07-28 04:21:19.195215187 +0000 @@ -1,10 +1,10 @@ /* { dg-do compile { target fpic } } */ /* { dg-options "-O2 -fPIC" } */ -/* { dg-final { scan-assembler "@(PLT|plt)" { target i?86-*-* x86_64-*-* powerpc*-*-linux* } } } */ __attribute__((noinline, noclone)) void f (short b) { + __builtin_setjmp (0); /* Prevent tailcall */ f (0); } @@ -14,3 +14,5 @@ void h () { g (0); } +/* { dg-final { scan-assembler "@(PLT|plt)" { target i?86-*-* x86_64-*-* } } } */ +/* { dg-final { scan-assembler "bl f\n\[ \t\]*nop" { target powerpc*-*-linux* } } } */ diff -rupN gcc/gcc/testsuite/gcc.target/powerpc/pr79439.c gcc-81535/gcc/testsuite/gcc.target/powerpc/pr79439.c --- gcc/gcc/testsuite/gcc.target/powerpc/pr79439.c 2017-07-28 02:39:55.750048426 +0000 +++ gcc-81535/gcc/testsuite/gcc.target/powerpc/pr79439.c 2017-07-28 04:13:47.834177237 +0000 @@ -8,22 +8,17 @@ int f (void); -void -g (void) -{ -} - int rec (int a) { int ret = 0; if (a > 10 && f ()) ret += rec (a - 1); - g (); return a + ret; } +void rec_alias (short) __attribute__ ((alias ("rec"))); + /* { dg-final { scan-assembler-times {\mbl f\M} 1 } } */ -/* { dg-final { scan-assembler-times {\mbl g\M} 1 } } */ /* { dg-final { scan-assembler-times {\mbl rec\M} 1 } } */ -/* { dg-final { scan-assembler-times {\mnop\M} 3 } } */ +/* { dg-final { scan-assembler-times {\mnop\M} 2 } } */