From patchwork Fri Jan 14 17:47:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 78975 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 F2CF7B70CC for ; Sat, 15 Jan 2011 04:47:35 +1100 (EST) Received: (qmail 21367 invoked by alias); 14 Jan 2011 17:47:31 -0000 Received: (qmail 21351 invoked by uid 22791); 14 Jan 2011 17:47:30 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Jan 2011 17:47:25 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 52399F89; Fri, 14 Jan 2011 18:47:23 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id A6f3fx1bvPDY; Fri, 14 Jan 2011 18:47:21 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 446B5F88; Fri, 14 Jan 2011 18:47:21 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p0EHlEVm003236; Fri, 14 Jan 2011 18:47:14 +0100 (MET) From: Rainer Orth To: Tobias Burnus Cc: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org Subject: Re: [testsuite, fortran] Increase gfortran.dg/cray_pointers_2.f90 timeout References: <4D2F39E6.6010107@net-b.de> Date: Fri, 14 Jan 2011 18:47:14 +0100 In-Reply-To: <4D2F39E6.6010107@net-b.de> (Tobias Burnus's message of "Thu, 13 Jan 2011 18:44:06 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes 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 Tobias Burnus writes: >> Unless the patch can be simplified somewhat to reduce the compilation >> time, I'd like to install the following patch on trunk, 4.4 and 4.5 >> branches. > > I think reducing the test itself is not really an option. What would help > is to run it only once - and not several times with different > options. That's a test case which should work with all options if it works > with -O3. However, I have no idea how to convince DejaGNU to compile/run > this particular test case only once. I've found a way, but it isn't pretty: gcc/testsuite/lib/gfortran-dg.exp (gfortran-dg-runtest) has this snippet: # look if this is dg-do-run test, in which case # we cycle through the option list, otherwise we don't if [expr [search_for $test "dg-do run"]] { set option_list $torture_with_loops } else { set option_list [list { -O } ] } Since I've found no part of the gfortran testsuite that doesn't cycle through optimization options, the following hack makes use of the code above: it puts two spaces between dg-do and run, thus avoiding the loop. You have been warned! Anyway, it works, tested by the appropriate runtest invocation on i386-pc-solaris2.11. Ok for mainline and branches? Rainer 2011-01-14 Rainer Orth * gfortran.dg/cray_pointers_2.f90: Avoid cycling through optimization options. diff -r 6c184227ca86 gcc/testsuite/gfortran.dg/cray_pointers_2.f90 --- a/gcc/testsuite/gfortran.dg/cray_pointers_2.f90 Fri Jan 14 10:25:46 2011 +0100 +++ b/gcc/testsuite/gfortran.dg/cray_pointers_2.f90 Fri Jan 14 18:42:56 2011 +0100 @@ -1,5 +1,7 @@ -! { dg-do run } -! { dg-options "-fcray-pointer -fbounds-check -fno-inline" } +! Using two spaces between dg-do and run is a hack to keep gfortran-dg-runtest +! from cycling through optimization options for this expensive test. +! { dg-do run } +! { dg-options "-O3 -fcray-pointer -fbounds-check -fno-inline" } ! { dg-timeout-factor 4 } ! ! Series of routines for testing a Cray pointer implementation