From patchwork Fri Nov 8 12:09:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Reutner-Fischer X-Patchwork-Id: 289819 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 123132C00CE for ; Fri, 8 Nov 2013 23:10:04 +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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=y7ctMJrbsCao6rFwDI B29kHpj7PE6OKM8h1TRN3e7uCnIBo+eJpHuWE5dO76Lf2bNARo1KST+PqzOJ5opc KrGTaOYfyKBQkSPQ0VyiUQWUHfyfRbcxW9Wuv1ZwwWs7uAM+hGFRB7SSFxN3rqMX hN5Wqdm8R68EINemU+LOoohI0= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=8JX4+YRni1QSqz+8+Zc7eFFT hko=; b=sD+J069HRE05ciX2PNZVOLlCmT7hyU0rXwnonSNcf5xAnJO0zUxoZRk9 6gk+sqAwBQPqtyxitHSWvnN8uVVmyaVdVFi59J7/t6wOxWyi0+kgt2VYGNoim316 g8kNWuEVtO1oF9JS/8QIh11W1FiV7yH5rBWdP0JL3ojkHMrvQ00= Received: (qmail 16630 invoked by alias); 8 Nov 2013 12:09:53 -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 16615 invoked by uid 89); 8 Nov 2013 12:09:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=3.4 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RDNS_NONE, SPAM_SUBJECT, SPF_PASS, URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: mail-la0-f48.google.com Received: from Unknown (HELO mail-la0-f48.google.com) (209.85.215.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 08 Nov 2013 12:09:51 +0000 Received: by mail-la0-f48.google.com with SMTP id n7so613334lam.21 for ; Fri, 08 Nov 2013 04:09:42 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.152.235.40 with SMTP id uj8mr920777lac.39.1383912581803; Fri, 08 Nov 2013 04:09:41 -0800 (PST) Received: by 10.114.70.232 with HTTP; Fri, 8 Nov 2013 04:09:41 -0800 (PST) In-Reply-To: <20131106070450.GT27813@tucnak.zalov.cz> References: <20131105172036.GO27813@tucnak.zalov.cz> <20131106070450.GT27813@tucnak.zalov.cz> Date: Fri, 8 Nov 2013 13:09:41 +0100 Message-ID: Subject: Re: [PATCH] RE: Testsuite / Cilk Plus: Include library path in compile flags in gcc.dg/cilk-plus/cilk-plus.exp From: Bernhard Reutner-Fischer To: Jakub Jelinek Cc: "Iyer, Balaji V" , Iain Sandoe , "Joseph S. Myers" , Tobias Burnus , gcc patches X-IsSubscribed: yes On 6 November 2013 08:04, Jakub Jelinek wrote: > On Wed, Nov 06, 2013 at 02:24:01AM +0000, Iyer, Balaji V wrote: >> Fixed patch is attached. The responses to your question are given below. Is this patch OK? >> >> Here is the ChangeLog entry: >> >> +2013-11-05 Balaji V. Iyer >> + >> + * c-c++-common/cilk-plus/CK/fib.c: Reduced the iteration from >> + 40 to 30. Replaced iteration variable with a #define. Instead of >> + returning non-zero value for error, called __builtin_abort (). Fixed >> + a bug of calling fib_serial in serial case instead of fib. >> + * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Likewise. >> + * c-c++-common/cilk-plus/CK/fib_no_return.c: Likewise. >> + * c-c++-common/cilk-plus/CK/fib_no_sync.c: Likewise. >> + * gcc.dg/cilk-plus/cilk-plus.exp: Removed duplicate/un-necessary >> + compiler flag testing. > > Ok. Balaji, May i suggest you rephrase the .exp so it does not line-wrap and is actually readable like in attached (untested) 01 or at least 00? Thanks for your consideration.. Index: gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp =================================================================== --- gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp (revision 204561) +++ gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp (working copy) @@ -25,31 +25,40 @@ verbose "$tool $libdir" 1 set library_var [get_multilibs] -# Pointing the ld_library_path to the Cilk Runtime library binaries. +# Pointing the ld_library_path to the Cilk Runtime library binaries. set ld_library_path "${library_var}/libcilkrts/.libs" set ALWAYS_CFLAGS "" lappend ALWAYS_CFLAGS "-L${library_var}/libcilkrts/.libs" dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O2 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O3 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O2 -ftree-vectorize -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O2 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O3 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -g -O0 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g -fcilkplus $ALWAYS_CFLAGS " " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -g -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" " " +set tests [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] +for flags [list \ + " -fcilkplus" \ + " -O1 -fcilkplus" \ + " -O2 -fcilkplus" \ + " -O3 -fcilkplus" \ + " -g -fcilkplus" \ + " -g -O2 -ftree-vectorize -fcilkplus" \ + " -fcilkplus -std=c99" \ + " -fcilkplus -O2 -std=c99" \ + " -fcilkplus -O3 -std=c99" \ + " -fcilkplus -g -O0 -std=c99" \ + ] { + dg-runtest $tests "$flags" " " +} +set tests [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] +for flags [list \ + " -g -fcilkplus $ALWAYS_CFLAGS " \ + " -O1 -fcilkplus $ALWAYS_CFLAGS" \ + " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" \ + " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" \ + " -O3 -g -fcilkplus $ALWAYS_CFLAGS" \ + " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" \ + ] { + dg-runtest $tests "$flags" " " +} - dg-finish