From patchwork Sat Nov 16 00:40:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Stump X-Patchwork-Id: 291731 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 B443F2C00BA for ; Sat, 16 Nov 2013 11:41:15 +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:from :content-type:content-transfer-encoding:subject:date:message-id :cc:to:mime-version; q=dns; s=default; b=E5z5CUK1t2fh3s3IJyzJSB0 KRVpuFGauKVahp3qHiRPuFQhZ5HNl9QbZL5fcbFKH2vuJShwds+sq2u8P61Y0C10 QFCMAOjqwg4ZJX6R7nNqGF4HNl3DKMVy3uFZ6treRnS2tv1PlbK07wO3IviAaqyq MZeKUS1gvbzzYY2IOiDo= 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 :content-type:content-transfer-encoding:subject:date:message-id :cc:to:mime-version; s=default; bh=p6PL2pI0J0s8AnLBNoHZTGRDGGw=; b= YgRQy7I0zCXS0G5K/pJid/oQOd4gN9W/Rnd+8USAibCnThO7fxPxH2F8CTYgLRsQ WNZkYbttNQss0eFK2hr03Tmmx2PFQQHyY0Fkx9U8gSFRNd2vzJ1XolkU1RdZXORB AJ5/xxalplQgRJbPtBQ+mJRSYbCpVGDOJgqZ/U4M9vk= Received: (qmail 28262 invoked by alias); 16 Nov 2013 00:41:03 -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 28249 invoked by uid 89); 16 Nov 2013 00:41:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RDNS_NONE, SPF_PASS autolearn=no version=3.3.2 X-HELO: qmta15.emeryville.ca.mail.comcast.net Received: from Unknown (HELO qmta15.emeryville.ca.mail.comcast.net) (76.96.27.228) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 16 Nov 2013 00:41:02 +0000 Received: from omta23.emeryville.ca.mail.comcast.net ([76.96.30.90]) by qmta15.emeryville.ca.mail.comcast.net with comcast id pzqj1m0011wfjNsAF0goSl; Sat, 16 Nov 2013 00:40:48 +0000 Received: from up.mrs.kithrup.com ([24.4.193.8]) by omta23.emeryville.ca.mail.comcast.net with comcast id q0gu1m0050BKwT48j0gubZ; Sat, 16 Nov 2013 00:40:54 +0000 From: Mike Stump Subject: cilking away Date: Fri, 15 Nov 2013 16:40:53 -0800 Message-Id: <2398071E-9A97-4677-9733-BD8ED3440313@comcast.net> Cc: "gcc-patches@gcc.gnu.org Patches" To: Balaji V Iyer Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) X-IsSubscribed: yes Kenny reported that the library name is mixed into the test case name. This is wrong. This fixes it. I also trimmed -O0, as redundant and added support for C++ runtime tests, once you guys want to add one. The CK tests should either be made to work in C++ land, or moved to gcc.dg/cilk-plus. The -fcilkplus in *.exp is redundant with that option in *.{c,cc}. Please remove one instance of them. * lib/gcc.exp (gcc_target_compile): Add support for random runtime * lib/g++.exp (g++_target_compile): Likewise. * gcc.dg/cilk-plus/cilk-plus.exp: Improve support for runtime libraries. Remove debugging. * g++.dg/cilk-plus/cilk-plus.exp: Add support to find runtime libraries. Remove -O0, redundant with default. Index: g++.dg/cilk-plus/cilk-plus.exp =================================================================== --- g++.dg/cilk-plus/cilk-plus.exp (revision 204881) +++ g++.dg/cilk-plus/cilk-plus.exp (working copy) @@ -29,14 +29,19 @@ g++-dg-runtest [lsort [glob -nocomplain g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" dg-finish +set library_var [get_multilibs] +# Pointing the ld_library_path to the Cilk Runtime library binaries. +set ld_library_path "${library_var}/libcilkrts/.libs" + +global TEST_EXTRA_LIBS +set TEST_EXTRA_LIBS "-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]] " -O0 -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 -ftree-vectorize -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 -O0 -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O1 -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]] " -g -O3 -fcilkplus" " " @@ -56,3 +61,5 @@ dg-runtest [lsort [glob -nocomplain $src dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -g -O3 -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -O3 -ftree-vectorize -fcilkplus -g" " " dg-finish + +unset TEST_EXTRA_LIBS Index: gcc.dg/cilk-plus/cilk-plus.exp =================================================================== --- gcc.dg/cilk-plus/cilk-plus.exp (revision 204881) +++ gcc.dg/cilk-plus/cilk-plus.exp (working copy) @@ -24,13 +24,12 @@ if { ![check_effective_target_cilkplus] return; } -verbose "$tool $libdir" 1 set library_var [get_multilibs] # 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" +global TEST_EXTRA_LIBS +set TEST_EXTRA_LIBS "-L${library_var}/libcilkrts/.libs" dg-init @@ -51,14 +50,15 @@ dg-runtest [lsort [glob -nocomplain $src 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]] " -g -fcilkplus" " " +dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 -fcilkplus" " " +dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 -fcilkplus" " " +dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -ftree-vectorize -fcilkplus" " " +dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -g -fcilkplus" " " if { [check_effective_target_lto] } { - dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" " " + dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus" " " } - dg-finish + +unset TEST_EXTRA_LIBS Index: lib/g++.exp =================================================================== --- lib/g++.exp (revision 204881) +++ lib/g++.exp (working copy) @@ -294,6 +294,11 @@ proc g++_target_compile { source dest ty lappend options "ldflags=${wrap_flags}" } + global TEST_EXTRA_LIBS + if [info exists TEST_EXTRA_LIBS] { + lappend options "ldflags=$TEST_EXTRA_LIBS" + } + lappend options "additional_flags=[libio_include_flags]" lappend options "compiler=$GXX_UNDER_TEST" lappend options "timeout=[timeout_value]" Index: lib/gcc.exp =================================================================== --- lib/gcc.exp (revision 204881) +++ lib/gcc.exp (working copy) @@ -134,6 +134,11 @@ proc gcc_target_compile { source dest ty lappend options "ldflags=$wrap_flags" } + global TEST_EXTRA_LIBS + if [info exists TEST_EXTRA_LIBS] { + lappend options "ldflags=$TEST_EXTRA_LIBS" + } + if [target_info exists gcc,stack_size] { lappend options "additional_flags=-DSTACK_SIZE=[target_info gcc,stack_size]" }