From patchwork Fri Apr 13 09:15:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Krebbel X-Patchwork-Id: 897895 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-476331-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Wka5m9iO"; 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 40MsdL5Lrvz9s0W for ; Fri, 13 Apr 2018 19:18:13 +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:from :to:subject:date:message-id; q=dns; s=default; b=aCCNy+RDPbwaW9p g0To3RWDwTedVQ2Y7cbUFWvlhc8bzCrA9J6Mh1lx7zo1xbxEkbm7DOPniANREBQb W1y/KRZA608a/8GJigGpbUCHCmm+nK16VnQRQAchf5NRIEzWuJCyCGvYxwH+Zr3w l6MdYyVI5kTULFwTn9tXCBiwi6o4= 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:from :to:subject:date:message-id; s=default; bh=4ux1Li3vUhjxvfQltAxdN IoAvmM=; b=Wka5m9iORs6LwoguTqw+oqCoqof9ASQR6xwNGViYmgfMHlhcE0Z0i 29e3KwZsKZGeoV50Q3zFAV867v0BbO1BW7Wa4l7T0Dg2xORAushshJ02UaLfnGNX JdNUI2aITianWidK5o1QmA7ZR0Fwo1w6Mzr0Xa9vw/19B3fODh9xI4= Received: (qmail 83358 invoked by alias); 13 Apr 2018 09:17:05 -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 82317 invoked by uid 89); 13 Apr 2018 09:15:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=regexps, 19, 5 X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Apr 2018 09:15:20 +0000 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3D9F44h195934 for ; Fri, 13 Apr 2018 05:15:17 -0400 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 2haqqawn90-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Fri, 13 Apr 2018 05:15:16 -0400 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Apr 2018 10:15:14 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 13 Apr 2018 10:15:12 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3D9FCOH10223896 for ; Fri, 13 Apr 2018 09:15:12 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 883E011C04C for ; Fri, 13 Apr 2018 10:07:14 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6D8F511C052 for ; Fri, 13 Apr 2018 10:07:14 +0100 (BST) Received: from maggie.boeblingen.de.ibm.com (unknown [9.152.212.134]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS for ; Fri, 13 Apr 2018 10:07:14 +0100 (BST) From: Andreas Krebbel To: gcc-patches@gcc.gnu.org Subject: [Committed] IBM Z: Get rid of target specific C++ testcase Date: Fri, 13 Apr 2018 11:15:11 +0200 X-TM-AS-GCONF: 00 x-cbid: 18041309-0040-0000-0000-0000044D1BF4 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041309-0041-0000-0000-000020F1534E Message-Id: <20180413091511.27518-1-krebbel@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-04-13_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804130086 X-IsSubscribed: yes gcc/testsuite/ChangeLog: 2018-04-13 Andreas Krebbel PR testsuite/85326 * gcc.target/s390/pr77822-1.C: Rename to ... * gcc.target/s390/pr77822-1.c: ... this. Add asm scan check. * gcc.target/s390/pr77822-2.c: Add asm scan check. * gcc.target/s390/s390.exp: Remove C from testcase regexps. --- .../gcc.target/s390/{pr77822-1.C => pr77822-1.c} | 16 +++++++++------- gcc/testsuite/gcc.target/s390/pr77822-2.c | 2 ++ gcc/testsuite/gcc.target/s390/s390.exp | 13 ++++++++----- 3 files changed, 19 insertions(+), 12 deletions(-) rename gcc/testsuite/gcc.target/s390/{pr77822-1.C => pr77822-1.c} (62%) diff --git a/gcc/testsuite/gcc.target/s390/pr77822-1.C b/gcc/testsuite/gcc.target/s390/pr77822-1.c similarity index 62% rename from gcc/testsuite/gcc.target/s390/pr77822-1.C rename to gcc/testsuite/gcc.target/s390/pr77822-1.c index bd5a9b4..9bf7bf4 100644 --- a/gcc/testsuite/gcc.target/s390/pr77822-1.C +++ b/gcc/testsuite/gcc.target/s390/pr77822-1.c @@ -3,15 +3,15 @@ /* { dg-do compile } */ /* { dg-options "-O3 -march=zEC12" } */ -class A { - void m_fn1(); - char m_datawidth; - char m_subunits; - int m_subunit_infos[]; -}; +void m_fn1(); + +char m_datawidth; +char m_subunits; +int m_subunit_infos[1]; + int a; long b; -void A::m_fn1() { +void m_fn1() { int c = 32, d = m_datawidth / c; for (int e = 0; e < d; e++) { int f = e * 32; @@ -19,3 +19,5 @@ void A::m_fn1() { m_subunit_infos[m_subunits] = a; } } + +/* { dg-final { scan-assembler-not "risbg.*-\[0-9\]+\\\+1\n" } } */ diff --git a/gcc/testsuite/gcc.target/s390/pr77822-2.c b/gcc/testsuite/gcc.target/s390/pr77822-2.c index 6789152..9a0fad2 100644 --- a/gcc/testsuite/gcc.target/s390/pr77822-2.c +++ b/gcc/testsuite/gcc.target/s390/pr77822-2.c @@ -305,3 +305,5 @@ void sizepos_c_13 (signed char b) if (b >> 13 & 1) g = b; } + +/* { dg-final { scan-assembler-not "risbg.*-\[0-9\]+\\\+1\n" } } */ diff --git a/gcc/testsuite/gcc.target/s390/s390.exp b/gcc/testsuite/gcc.target/s390/s390.exp index bb13bfd..93c570a 100644 --- a/gcc/testsuite/gcc.target/s390/s390.exp +++ b/gcc/testsuite/gcc.target/s390/s390.exp @@ -199,23 +199,26 @@ dg-init set md_tests $srcdir/$subdir/md/*.c +# C++ tests belong into g++.dg with a target check. Do NOT add C to +# these regexps! + # Main loop. -dg-runtest [lsort [prune [glob -nocomplain $srcdir/$subdir/*.{c,S,C}] \ +dg-runtest [lsort [prune [glob -nocomplain $srcdir/$subdir/*.{c,S}] \ $md_tests]] "" $DEFAULT_CFLAGS -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*vector*/*.{c,S,C}]] \ +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*vector*/*.{c,S}]] \ "" $DEFAULT_CFLAGS -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/target-attribute/*.{c,S,C}]] \ +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/target-attribute/*.{c,S}]] \ "" $DEFAULT_CFLAGS -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/arch12/*.{c,S,C}]] \ +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/arch12/*.{c,S}]] \ "" "-O3 -march=arch12 -mzarch" dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/vxe/*.{c,S}]] \ "" "-O3 -march=arch12 -mzarch" -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/md/*.{c,S,C}]] \ +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/md/*.{c,S}]] \ "" $DEFAULT_CFLAGS # Additional hotpatch torture tests.