From patchwork Fri Aug 20 19:26:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 62305 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]) by ozlabs.org (Postfix) with SMTP id 30F33B6F10 for ; Sat, 21 Aug 2010 05:26:15 +1000 (EST) Received: (qmail 4415 invoked by alias); 20 Aug 2010 19:26:13 -0000 Received: (qmail 4405 invoked by uid 22791); 20 Aug 2010 19:26:12 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, TW_ZJ, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-qw0-f47.google.com (HELO mail-qw0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 20 Aug 2010 19:26:05 +0000 Received: by qwa26 with SMTP id 26so375587qwa.20 for ; Fri, 20 Aug 2010 12:26:03 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.124.80 with SMTP id t16mr1288454qar.204.1282332363336; Fri, 20 Aug 2010 12:26:03 -0700 (PDT) Received: by 10.229.28.200 with HTTP; Fri, 20 Aug 2010 12:26:03 -0700 (PDT) Date: Fri, 20 Aug 2010 21:26:03 +0200 Message-ID: Subject: [PATCH, testsuite]: Fix PR45361, gcc.target/i386/volatile-2.c failed From: Uros Bizjak To: gcc-patches@gcc.gnu.org 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 Hello! 2010-08-20 Uros Bizjak PR testsuite/45361 * gcc.target/i386/volatile-2.c: Update scan strings to also include (%rip) for the memory reference on x86_64. Tested on x86_64-pc-linux-gnu {,-m32}, committed to mainline. Uros. Index: gcc.target/i386/volatile-2.c =================================================================== --- gcc.target/i386/volatile-2.c (revision 163410) +++ gcc.target/i386/volatile-2.c (working copy) @@ -10,8 +10,8 @@ void test_0 (int data) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_0" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_0," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_0(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_0(\\(%rip\\))?," } } */ obj_0 = data; } @@ -19,8 +19,8 @@ int test_1 (int data) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_1" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_1," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_1(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_1(\\(%rip\\))?," } } */ return obj_1 = data; } @@ -28,8 +28,8 @@ int test_2 (void) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_2" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_2," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_2(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_2(\\(%rip\\))?," } } */ return obj_2 = 0; } @@ -40,8 +40,8 @@ int test_3 (int data) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_3" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_3," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_3(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_3(\\(%rip\\))?," } } */ return (obj_3 = data, 0); } @@ -49,16 +49,16 @@ int test_4 (void) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_4" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_4," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_4(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_4(\\(%rip\\))?," } } */ return (obj_4 = 0, 0); } extern int volatile obj_5; int test_5 (void) { /* should reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_5" } } */ - /* { dg-final { scan-assembler "movl\[ \t\]obj_5," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_5(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler "movl\[ \t\]obj_5(\\(%rip\\))?," } } */ return (obj_5 = 0, obj_5); } @@ -68,8 +68,8 @@ void test_6 (int data, int cond) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_6" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_6," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_6(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_6(\\(%rip\\))?," } } */ cond ? obj_6 = data : 0; } @@ -77,8 +77,8 @@ int test_7 (int data, int cond) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_7" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_7," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_7(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_7(\\(%rip\\))?," } } */ return cond ? obj_7 = data : 0; } @@ -86,7 +86,7 @@ int test_8 (int cond) { /* should not reread obj */ - /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_8" } } */ - /* { dg-final { scan-assembler-not "movl\[ \t\]obj_8," } } */ + /* { dg-final { scan-assembler "movl\[ \t\]\[^,\]+, obj_8(\\(%rip\\))?" } } */ + /* { dg-final { scan-assembler-not "movl\[ \t\]obj_8(\\(%rip\\))?," } } */ return cond ? obj_8 = 0 : 0; }