Hi! On Fri, 26 Dec 2014 22:15:24 +0300, Ilya Verbin <iver...@gmail.com> 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 <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
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(-)
diff --git libgomp/ChangeLog libgomp/ChangeLog
index afbde87..beecba9 100644
--- libgomp/ChangeLog
+++ libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-08 Thomas Schwinge <tho...@codesourcery.com>
+
+ * testsuite/lib/libgomp.exp (libgomp_init): Correctly match
+ "intelmic" in $offload_targets.
+
2015-01-05 Jakub Jelinek <ja...@redhat.com>
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 <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
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 <tho...@codesourcery.com>
+ * 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"
Grüße,
Thomas
pgp1GJJPnLZ8i.pgp
Description: PGP signature
