From patchwork Tue Nov 11 13:55:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Brown X-Patchwork-Id: 409461 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D12931400F1 for ; Wed, 12 Nov 2014 00:56:11 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=lGXHVhGVj0OYNRBmldwbMhz+9KMwiWPQ4yrT5zYOU05ju9LQcL v5Tl6ouvjS6YEI1/e2La/ORPxrZ7FzUaqw4h/eNuJdVGzeZent58UHavOv6GLOTj JhPqKUukxJ8P2S6IYP26Saj442M17U1//xfcKwh9zeJF4QjsAt5j8Qxl0= 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:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=uUItK7BBhqR/hw5PHVBaAnV7gPc=; b=ddurVG6K3MUl/0LAiAZY +eVSfYXVcHfxvP3b3CeU3Nbi7PT9KrhHdJP8qRkGCnF91EY07XgdhOKoZ/3A/P2g 1JU5NPK9cTtCWGUrd9ghcNdgpBF8qC+luQd3sE5VFWHwxmy9QATzEpoLdQYImvx8 6icVU1T2fFV2R6lFwUJKG8c= Received: (qmail 27906 invoked by alias); 11 Nov 2014 13:55:36 -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 27852 invoked by uid 89); 11 Nov 2014 13:55:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Nov 2014 13:55:30 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XoBuo-0006o7-MX from Julian_Brown@mentor.com ; Tue, 11 Nov 2014 05:55:27 -0800 Received: from octopus (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.181.6; Tue, 11 Nov 2014 13:55:24 +0000 Date: Tue, 11 Nov 2014 13:55:18 +0000 From: Julian Brown To: CC: Jakub Jelinek , Thomas Schwinge , Ilya Verbin Subject: [PATCH 5/5] OpenACC 2.0 support for libgomp - temporary test harness tweaks Message-ID: <20141111135518.53dea54a@octopus> MIME-Version: 1.0 X-IsSubscribed: yes Hi, As mentioned in the previous mail in this series, testing the OpenACC runtime support in libgomp is going to be awkward until the associated middle-end pieces are ready. This stop-gap patch helps to allow tests (that don't use any of the pragmas, only calling the run-time library directly) to run successfully. OK to apply? Thanks, Julian ChangeLog libgomp/ * testsuite/libgomp.oacc-c++/c++.exp (ALWAYS_CFLAGS): Temporarily replace -fopenacc with -lgomp -lpthread, until -fopenacc support lands upstream. * testsuite/libgomp.oacc-c/c.exp (ALWAYS_CFLAGS): Likewise. * testsuite/libgomp.oacc-fortran/fortran.exp (ALWAYS_CFLAGS): Similar, but without -lpthread. From c70f2aca94bc306e4600282aa81bc1a758ad81fa Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Tue, 11 Nov 2014 02:54:09 -0800 Subject: [PATCH 5/5] Temporary testing tweaks libgomp/ * testsuite/libgomp.oacc-c++/c++.exp (ALWAYS_CFLAGS): Temporarily replace -fopenacc with -lgomp -lpthread, until -fopenacc support lands upstream. * testsuite/libgomp.oacc-c/c.exp (ALWAYS_CFLAGS): Likewise. * testsuite/libgomp.oacc-fortran/fortran.exp (ALWAYS_CFLAGS): Similar, but without -lpthread. --- libgomp/testsuite/libgomp.oacc-c++/c++.exp | 4 +++- libgomp/testsuite/libgomp.oacc-c/c.exp | 4 +++- libgomp/testsuite/libgomp.oacc-fortran/fortran.exp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index b8b3e85..1060344 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -23,7 +23,9 @@ dg-init # Turn on OpenACC. # XXX (TEMPORARY): Remove the -flto once that's properly integrated. -lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +#lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +# TODO: Revert this temporary hack when OpenACC middle-end pieces are submitted. +lappend ALWAYS_CFLAGS "additional_flags=-lgomp -flto -lpthread" set blddir [lookfor_file [get_multilibs] libgomp] diff --git a/libgomp/testsuite/libgomp.oacc-c/c.exp b/libgomp/testsuite/libgomp.oacc-c/c.exp index 5558ec8..85528aa 100644 --- a/libgomp/testsuite/libgomp.oacc-c/c.exp +++ b/libgomp/testsuite/libgomp.oacc-c/c.exp @@ -28,7 +28,9 @@ dg-init # Turn on OpenACC. # XXX (TEMPORARY): Remove the -flto once that's properly integrated. -lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +#lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +# TODO: Revert temporary hack when OpenACC middle-end pieces are submitted. +lappend ALWAYS_CFLAGS "additional_flags=-lgomp -flto -lpthread" lappend libgomp_compile_options "compiler=$GCC_UNDER_TEST" diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp index 0ada038..27cf4d5 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp @@ -23,7 +23,9 @@ dg-init # Turn on OpenACC. # XXX (TEMPORARY): Remove the -flto once that's properly integrated. -lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +#lappend ALWAYS_CFLAGS "additional_flags=-fopenacc -flto" +# TODO: Revert this temporary hack when OpenACC middle-end pieces are submitted. +lappend ALWAYS_CFLAGS "additional_flags=-lgomp -flto" if { $blddir != "" } { set lang_source_re {^.*\.[fF](|90|95|03|08)$} -- 1.7.10.4