From patchwork Wed Apr 3 13:35:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejas Belagod X-Patchwork-Id: 233463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 813E92C0099 for ; Thu, 4 Apr 2013 00:35:52 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=GBGf6CijdN5pZ/wgh7/R+tHZeWMPxWu91Eb4O36K0DC 8DxOHyyNcslhW/Ig9X34vJFSMTBN+gg1o8zoBGoxiCKCe9qZW/sDcHktynNTk/YH I+X/OIT82nK5Hc4MtsGCZkHFrHuS02jia3/wHOkkA5xOaCFKIgAKBbcT8D0pAfWk = 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 :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=9x5neTx4Lq+FeOfDXazQ8jjCpAA=; b=dCbyS6xeq5woyZ91W YoZ/IoMpzWqT996+HW6Cqrg9xLqrSYJ1puOX670lBr7aHY0WoeC10lz/FEvts4+X oFRhp+K4REQQXFre8bnBun88DkQ4IVG9PM/iUdk9CFrFw9vtkpFij3q2sU7VtvMB BNb24weIWxcC2+L6vL6juZcjvU= Received: (qmail 18454 invoked by alias); 3 Apr 2013 13:35:27 -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 18434 invoked by uid 89); 3 Apr 2013 13:35:27 -0000 X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 03 Apr 2013 13:35:23 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 03 Apr 2013 14:35:20 +0100 Received: from [10.1.69.28] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Wed, 3 Apr 2013 14:35:18 +0100 Message-ID: <515C3016.2020802@arm.com> Date: Wed, 03 Apr 2013 14:35:18 +0100 From: Tejas Belagod User-Agent: Thunderbird 2.0.0.18 (X11/20081120) MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Marcus Shawcroft , Richard Earnshaw Subject: [Patch, AArch64] Fix duplication in test case. X-MC-Unique: 113040314352001701 X-Virus-Found: No Hi, The attached patch fixes duplication in a test case for gcc.target/aarch64/. Tested on aarch64-none-elf. OK for trunk and branch? Thanks, Tejas Belagod ARM. 2013-04-03 Tejas Belagod testsuite/ * gcc.target/aarch64/inc/asm-adder-clobber-lr.c: Remove duplication. * gcc.target/aarch64/inc/asm-adder-no-clobber-lr.c: Likewise. * gcc.target/aarch64/test-framepointer-1.c: Likewise. * gcc.target/aarch64/test-framepointer-2.c: Likewise. * gcc.target/aarch64/test-framepointer-3.c: Likewise. * gcc.target/aarch64/test-framepointer-4.c: Likewise. * gcc.target/aarch64/test-framepointer-5.c: Likewise. * gcc.target/aarch64/test-framepointer-6.c: Likewise. * gcc.target/aarch64/test-framepointer-7.c: Likewise. * gcc.target/aarch64/test-framepointer-8.c: Likewise. diff --git a/gcc/testsuite/gcc.target/aarch64/asm-adder-clobber-lr.c b/gcc/testsuite/gcc.target/aarch64/asm-adder-clobber-lr.c index 8a02abc..540c79b 100644 --- a/gcc/testsuite/gcc.target/aarch64/asm-adder-clobber-lr.c +++ b/gcc/testsuite/gcc.target/aarch64/asm-adder-clobber-lr.c @@ -21,28 +21,3 @@ main (int argc, char** argv) return 0; } - -extern void abort (void); - -int -adder (int a, int b) -{ - int result; - __asm__ ("add %w0,%w1,%w2" : "=r"(result) : "r"(a), "r"(b) : "x30"); - return result; -} - -int -main (int argc, char** argv) -{ - int i; - int total = argc; - for (i = 0; i < 20; i++) - total = adder (total, i); - - if (total != (190 + argc)) - abort (); - - return 0; -} - diff --git a/gcc/testsuite/gcc.target/aarch64/asm-adder-no-clobber-lr.c b/gcc/testsuite/gcc.target/aarch64/asm-adder-no-clobber-lr.c index f60cfd3..2543d50 100644 --- a/gcc/testsuite/gcc.target/aarch64/asm-adder-no-clobber-lr.c +++ b/gcc/testsuite/gcc.target/aarch64/asm-adder-no-clobber-lr.c @@ -21,28 +21,3 @@ main (int argc, char** argv) return 0; } - -extern void abort (void); - -int -adder (int a, int b) -{ - int result; - __asm__ ("add %w0,%w1,%w2" : "=r"(result) : "r"(a), "r"(b) : ); - return result; -} - -int -main (int argc, char** argv) -{ - int i; - int total = argc; - for (i = 0; i < 20; i++) - total = adder (total, i); - - if (total != (190 + argc)) - abort (); - - return 0; -} - diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-1.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-1.c index ae10959..e44ca6d 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-1.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-1.c @@ -13,18 +13,3 @@ /* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-no-clobber-lr.c" - -/* omit-frame-pointer is FALSE. - omit-leaf-frame-pointer is FALSE. - LR is not being clobbered in the leaf. - - With no frame pointer omissions, we expect a frame record - for main and the leaf. */ - -/* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-2.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-2.c index 71bc58d..40e4835 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-2.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-2.c @@ -13,18 +13,3 @@ /* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-no-clobber-lr.c" - -/* omit-frame-pointer is TRUE. - omit-leaf-frame-pointer is false, but irrelevant due to omit-frame-pointer. - LR is not being clobbered in the leaf. - - Since we asked to have no frame pointers anywhere, we expect no frame - record in main or the leaf. */ - -/* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-3.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-3.c index de1b32c..98cb2e0 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-3.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-3.c @@ -13,18 +13,3 @@ /* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fomit-frame-pointer -momit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-no-clobber-lr.c" - -/* omit-frame-pointer is TRUE. - omit-leaf-frame-pointer is true, but irrelevant due to omit-frame-pointer. - LR is not being clobbered in the leaf. - - Since we asked to have no frame pointers anywhere, we expect no frame - record in main or the leaf. */ - -/* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-4.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-4.c index d339263..4143a7a 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-4.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-4.c @@ -14,19 +14,3 @@ /* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 1 } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fno-omit-frame-pointer -momit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-no-clobber-lr.c" - -/* omit-frame-pointer is FALSE. - omit-leaf-frame-pointer is TRUE. - LR is not being clobbered in the leaf. - - Unless we are removing all frame records, it's OK to remove the frame - record for a leaf where LR is not clobbered. Therefore, we expect a - frame record only in main. */ - -/* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 1 } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-5.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-5.c index 4be297a..c22bdc3 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-5.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-5.c @@ -13,18 +13,3 @@ /* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-clobber-lr.c" - -/* omit-frame-pointer is FALSE. - omit-leaf-frame-pointer is FALSE. - LR is being clobbered in the leaf. - - With no frame pointer omissions, we expect a frame record for main - and the leaf. */ - -/* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-6.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-6.c index bf53962..e08ee43 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-6.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-6.c @@ -13,18 +13,3 @@ /* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-clobber-lr.c" - -/* omit-frame-pointer is TRUE. - omit-leaf-frame-pointer is false, but irrelevant due to omit-frame-pointer. - LR is being clobbered in the leaf. - - Since we asked to have no frame pointers anywhere, we expect no frame - record in main or the leaf. */ - -/* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-7.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-7.c index 9e88ae3..e8f7cab 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-7.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-7.c @@ -13,18 +13,3 @@ /* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fomit-frame-pointer -momit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-clobber-lr.c" - -/* omit-frame-pointer is TRUE. - omit-leaf-frame-pointer is true, but irrelevant due to omit-frame-pointer. - LR is being clobbered in the leaf. - - Since we asked to have no frame pointers anywhere, we expect no frame - record in main or the leaf. */ - -/* { dg-final { scan-assembler-not "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" } } */ - -/* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/test-framepointer-8.c b/gcc/testsuite/gcc.target/aarch64/test-framepointer-8.c index 08d7667..c09b687 100644 --- a/gcc/testsuite/gcc.target/aarch64/test-framepointer-8.c +++ b/gcc/testsuite/gcc.target/aarch64/test-framepointer-8.c @@ -14,19 +14,3 @@ /* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */ /* { dg-final { cleanup-saved-temps } } */ -/* { dg-do run } */ -/* { dg-options "-O2 -fno-omit-frame-pointer -momit-leaf-frame-pointer -fno-inline --save-temps" } */ - -#include "asm-adder-clobber-lr.c" - -/* omit-frame-pointer is FALSE. - omit-leaf-frame-pointer is TRUE. - LR is being clobbered in the leaf. - - Unless we are removing all frame records (which we aren't), it's - not OK to remove the frame record for a leaf where LR is clobbered. - Therefore, we expect a frame record in main and leaf. */ - -/* { dg-final { scan-assembler-times "stp\tx29, x30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */ - -/* { dg-final { cleanup-saved-temps } } */