From patchwork Thu Jan 8 16:02:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 426696 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 2BDDF140142 for ; Fri, 9 Jan 2015 03:03:14 +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:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=sG2iYrj/Xy42Jz9C 7j//E70Yc5zCZiqSl6VT9jsU+wAPsfejESSVymDA7L5RCJ0Vx9CE5Kh5DOj/+yrD SegrgHuxVOvja67e12ymuo8YKf9OUi9Ku0Ec8ZGOlbGIfKGDh5badFBGbDmSKvoN m5SDgRjrr6Ioytit6ngoHPZr2M4= 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 :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=YDg5REbF9hYHFotOMmL/rN kxFQg=; b=o86VOkpoFBIBml5zOntKZWXTE0aneDxsDPb8rqtqFSoC177D2sj3Rz xPpQg1mIBkFaS1JhOFUv146VnlcBmfw0irsZWYgfvVLx7MyKL4mf/lCZ4SoJ9ORu +tDd9t6vjO5Cv0pR9TRApIsJXBVmfbpSVDyv/80Lh2dLLE1LSaaBc= Received: (qmail 14324 invoked by alias); 8 Jan 2015 16:03:07 -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 14309 invoked by uid 89); 8 Jan 2015 16:03:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_BLACK autolearn=no 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; Thu, 08 Jan 2015 16:03:04 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-04.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Y9FY3-0002ju-DF from Thomas_Schwinge@mentor.com ; Thu, 08 Jan 2015 08:02:59 -0800 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-04.mgc.mentorg.com (137.202.0.110) with Microsoft SMTP Server id 14.3.224.2; Thu, 8 Jan 2015 16:02:57 +0000 From: Thomas Schwinge To: Ilya Verbin CC: Jakub Jelinek , Kirill Yukhin , Andrey Turetskiy , gcc Subject: Re: [PATCH 4/4] OpenMP 4.0 offloading to Intel MIC: non-fallback testing In-Reply-To: <20141226191524.GB35839@msticlxl57.ims.intel.com> References: <20141021171323.GA47586@msticlxl57.ims.intel.com> <20141030114001.GA34120@msticlxl57.ims.intel.com> <87tx0t0yh5.fsf@kepler.schwinge.homeip.net> <87oaqvzz0n.fsf@kepler.schwinge.homeip.net> <20141226191524.GB35839@msticlxl57.ims.intel.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Thu, 8 Jan 2015 17:02:50 +0100 Message-ID: <87bnm9w991.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Fri, 26 Dec 2014 22:15:24 +0300, Ilya Verbin wrote: > On 22 Dec 12:48, Thomas Schwinge wrote: > > Here is a patch to correctly match intelmic in $offload_targets; OK to > > commit, I assume? I suppose I'm the first one to ever do build-tree > > testing? (Jakub?) > OK, thanks. > I verified this case some time ago, but missed when it started failing, since > tests just become UNSUPPORTED or PASSED with host fallback, rather than FAILing. Yeah. (I diff the *.sum files, so I do see such regressions.) Committed to trunk in r219348: commit b21c795fa27f6fcefdb38d1bc50f1d1634f4e0b3 Author: tschwinge Date: Thu Jan 8 16:01:24 2015 +0000 libgomp: Fix "intelmic" offloading in build-tree testing. libgomp/ * testsuite/lib/libgomp.exp (libgomp_init): Correctly match "intelmic" in $offload_targets. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219348 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 5 +++++ libgomp/testsuite/lib/libgomp.exp | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) Grüße, Thomas diff --git libgomp/ChangeLog libgomp/ChangeLog index afbde87..beecba9 100644 --- libgomp/ChangeLog +++ libgomp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-08 Thomas Schwinge + + * testsuite/lib/libgomp.exp (libgomp_init): Correctly match + "intelmic" in $offload_targets. + 2015-01-05 Jakub Jelinek Update copyright years. diff --git libgomp/testsuite/lib/libgomp.exp libgomp/testsuite/lib/libgomp.exp index ff22f10..2d6f822 100644 --- libgomp/testsuite/lib/libgomp.exp +++ libgomp/testsuite/lib/libgomp.exp @@ -115,8 +115,7 @@ proc libgomp_init { args } { # Add liboffloadmic build directory in LD_LIBRARY_PATH to support # non-fallback testing for Intel MIC targets - if { [string match "*-intelmic-*" $offload_targets] - || [string match "*-intelmicemul-*" $offload_targets] } { + if { [string match "*,intelmic,*" ",$offload_targets,"] } { append always_ld_library_path ":${blddir}/../liboffloadmic/.libs" append always_ld_library_path ":${blddir}/../liboffloadmic/plugin/.libs" # libstdc++ is required by liboffloadmic > > Here is a patch to fix 32-bit x86 Intel MIC offloading; OK to commit, I > > assume? > OK, thanks. Committed to trunk in r219349: commit 49b6c472197cbb443c55cc1064de5b24384bbf7f Author: tschwinge Date: Thu Jan 8 16:01:37 2015 +0000 libgomp: Fix 32-bit x86 Intel MIC offloading testing. [...] spawn [...]/build-gcc/gcc/xgcc -B[...]/build-gcc/gcc/ [...]/source-gcc/libgomp/testsuite/libgomp.c/examples-4/e.50.1.c -B[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/ -B[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/.libs -I[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp -I[...]/source-gcc/libgomp/testsuite/.. -march=i486 -fmessage-length=0 -fno-diagnostics-show-caret -fdiagnostics-color=never -B[...]/install/offload-x86_64-intelmicemul-linux-gnu/libexec/gcc/x86_64-unknown-linux-gnu/5.0.0 -B[...]/install/offload-x86_64-intelmicemul-linux-gnu/bin -fopenmp -O2 -L[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/.libs -lm -m32 -o ./e.50.1.exe PASS: libgomp.c/examples-4/e.50.1.c (test for excess errors) Setting LD_LIBRARY_PATH to .:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/../liboffloadmic/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/../liboffloadmic/plugin/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/../libstdc++-v3/src/.libs:[...]/install/offload-x86_64-intelmicemul-linux-gnu/lib64:[...]/install/offload-x86_64-intelmicemul-linux-gnu/lib:[...]/build-gcc/gcc:[...]/build-gcc/gcc/32:.:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/../liboffloadmic/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/../liboffloadmic/plugin/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/32/libgomp/../libstdc++-v3/src/.libs:[...]/install/offload-x86_64-intelmicemul-linux-gnu/lib64:[...]/install/offload-x86_64-intelmicemul-linux-gnu/lib:[...]/build-gcc/gcc:[...]/build-gcc/gcc/32:[...]/build-gcc/x86_64-unknown-linux-gnu/libstdc++-v3/src/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libsanitizer/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libvtv/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libcilkrts/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/liboffloadmic/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libssp/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libgomp/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libitm/.libs:[...]/build-gcc/x86_64-unknown-linux-gnu/libatomic/.libs:[...]/build-gcc/./gcc:[...]/build-gcc/./prev-gcc spawn [open ...] /tmp/offload_WCXKRZ/offload_target_main: error while loading shared libraries: liboffloadmic_target.so.5: wrong ELF class: ELFCLASS64 WARNING: program timed out. FAIL: libgomp.c/examples-4/e.50.1.c execution test [...] $ find -name liboffloadmic_target.so.5 ./install/offload-x86_64-intelmicemul-linux-gnu/lib64/liboffloadmic_target.so.5 ./install/offload-x86_64-intelmicemul-linux-gnu/lib32/liboffloadmic_target.so.5 ./build-gcc-offload-x86_64-intelmicemul-linux-gnu/x86_64-intelmicemul-linux-gnu/32/liboffloadmic/.libs/liboffloadmic_target.so.5 ./build-gcc-offload-x86_64-intelmicemul-linux-gnu/x86_64-intelmicemul-linux-gnu/liboffloadmic/.libs/liboffloadmic_target.so.5 This is a "standard" GCC configuration: x86_64-intelmicemul-linux-gnu with (default) multilibs enabled. libgomp/ * configure.ac [tgt_dir] (offload_additional_lib_paths): Also add "$tgt_dir/lib32". * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219349 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 4 ++++ libgomp/configure | 2 +- libgomp/configure.ac | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git libgomp/ChangeLog libgomp/ChangeLog index beecba9..11e0086 100644 --- libgomp/ChangeLog +++ libgomp/ChangeLog @@ -1,5 +1,9 @@ 2015-01-08 Thomas Schwinge + * configure.ac [tgt_dir] (offload_additional_lib_paths): Also add + "$tgt_dir/lib32". + * configure: Regenerate. + * testsuite/lib/libgomp.exp (libgomp_init): Correctly match "intelmic" in $offload_targets. diff --git libgomp/configure libgomp/configure index f5d6b6b..d109fc1 100755 --- libgomp/configure +++ libgomp/configure @@ -16262,7 +16262,7 @@ if test x"$enable_offload_targets" != x; then fi if test x"$tgt_dir" != x; then offload_additional_options="$offload_additional_options -B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin" - offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib" + offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32" else offload_additional_options="$offload_additional_options -B\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) -B\$(bindir)" offload_additional_lib_paths="$offload_additional_lib_paths:$toolexeclibdir" diff --git libgomp/configure.ac libgomp/configure.ac index 16ec158..c8a98f0 100644 --- libgomp/configure.ac +++ libgomp/configure.ac @@ -304,7 +304,7 @@ if test x"$enable_offload_targets" != x; then fi if test x"$tgt_dir" != x; then offload_additional_options="$offload_additional_options -B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin" - offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib" + offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32" else offload_additional_options="$offload_additional_options -B\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) -B\$(bindir)" offload_additional_lib_paths="$offload_additional_lib_paths:$toolexeclibdir"