Merge lp:~sumit-semwal/pocl/arm-chrome-port into lp:~pocl/pocl/trunk

[Sumit Semwal]

ARM chromebook port: some minor build changes needed to get a pocl working set under ubuntu 13.04, with 3.3 llvm.

[Kalle Raiskila (kraiskil)]

This causes all tests (except AMD's radix sort!) to fail with:

+WARNING: Linking two modules of different target triples: /home/buildbot/buildslave/lp_pocl-ARM/build/lib/kernel/arm/kernel-armv7.bc: 'armv7--' and 'armv4t--'

This on Ubuntu 12.04, ARM CortexA9

review: Needs Fixing

[Pekka Jääskeläinen (pekka-jaaskelainen)]

Probably because the kernel binary is compiled with different clang parameters (in devices/common.c) than the kernel library.

[Kalle Raiskila (kraiskil)]

Looks like cause is the line(s) 61/62 in the diff. Is that there by mistake?

[Sumit Semwal (sumit-semwal)]

Yes, it is due to line(s) 61/62, and yes, it is there by mistake! Sending out a new merge request to test!

review: Needs Resubmitting

[lp:~sumit-semwal/pocl/arm-chrome-port]

726. By Pekka Jääskeläinen on 2013-05-07

Clang++ 3.3 fails to compile the libstdc++ headers from gcc 4.7 in the std=gnu++11 mode. c++11 works.

727. By Pekka Jääskeläinen on 2013-05-07

Fixed the test suite status' for i686/Ubuntu 12.04LTS (Pentium 4).

728. By Pekka Jääskeläinen on 2013-05-07

The rotate case seems to fail on LLVM 3.2. XFAIL back until figured out why.

729. By Pekka Jääskeläinen on 2013-05-07

egrep instead of grep -e seems to be more compatible.

730. By Kalle Raiskila on 2013-05-08

Don't choke on doubles in test_rotate

731. By Kalle Raiskila on 2013-05-08

Add --disable-tce option to configure

732. By Pekka Jääskeläinen on 2013-05-08

Reverted r725 because it caused all tests using cl.hpp to segfault on CentOS x86_64 and ARM. Added cl.hpp to CLEANFILES.

733. By Kalle Raiskila on 2013-05-08

Handle LLVM 3.4 gracefully.

734. By Kalle Raiskila on 2013-05-08

Unmark convert type: it started to pass on PPC

735. By Kalle Raiskila on 2013-05-08

Fix 729 - x86 only should fail.

736. By Kalle Raiskila on 2013-05-08

Fix compiler flags for ARM gnueabihf (i.e. Ubuntu 13.04).

Patch by Sumit Semwal. Thanks!

=== modified file 'config/xclang'
--- config/xclang	2012-11-21 10:53:42 +0000
+++ config/xclang	2013-05-06 16:09:33 +0000
@@ -52,5 +52,13 @@
 fi
 
 $CLANG -target $host -c -emit-llvm -o $tmpdir/xclang.bc $@
-$LLC -mtriple=$build -o $tmpdir/xclang.s $tmpdir/xclang.bc
+
+# Adjust $LLC call for hard-float in case the build is that
+case "$build" in
+arm*gnueabihf)
+   $LLC -mtriple=$build -float-abi=hard -o $tmpdir/xclang.s $tmpdir/xclang.bc;;
+*)
+   $LLC -mtriple=$build -o $tmpdir/xclang.s $tmpdir/xclang.bc;;
+esac
+
 exec $CLANG -target $build $output $tmpdir/xclang.s
 
=== modified file 'configure.ac'
--- configure.ac	2013-04-30 15:30:29 +0000
+++ configure.ac	2013-05-06 16:09:33 +0000
@@ -591,15 +591,22 @@
     ;;  
 esac
 AC_SUBST([ICD_LD_FLAGS])
-
 case $host_cpu in
   armv7l)
     AC_MSG_NOTICE([using the ARM optimized kernel lib for the native device])
-    #armv7l seems a popular host_cpu in distros. Clang uses "armv7", though
-    OCL_KERNEL_TARGET="armv7"
+    # check for gnueabihf, and set clang target accordingly
+    case $host in
+      armv7l*gnueabihf)
+         OCL_KERNEL_TARGET="armv7l-unknown-linux-gnueabihf"
+         HOST_LLC_FLAGS="$HOST_LLC_FLAGS -float-abi=hard";;
+      *)
+         #armv7l seems a popular host_cpu in distros. Clang uses "armv7", though
+         OCL_KERNEL_TARGET="armv7";;
+    esac
+
     # Assume -lm should not be used. TODO: add an embedded math lib
     # for compiling kernels for ARM envs without usable math libs.
-    HOST_CLANG_FLAGS="$HOST_CLANG_FLAGS -target $OCL_KERNEL_TARGET -mfloat-abi=hard -fPIC"
+    HOST_CLANG_FLAGS="$HOST_CLANG_FLAGS -target $OCL_KERNEL_TARGET -mfloat-abi=hard"
     kernel_dir="arm"
     CL_DEVICE_ADDRESS_BITS=32
     ;;
 
=== modified file 'scripts/pocl-build.in'
--- scripts/pocl-build.in	2013-04-25 13:51:09 +0000
+++ scripts/pocl-build.in	2013-05-06 16:09:33 +0000
@@ -45,6 +45,8 @@
 
 target_dir=${target}
 case $target in
+  arm*gnueabihf)    target_dir="arm"
+                    target="armv7l-unknown-linux-gnueabihf";;
   arm*)        target_dir="arm"
                target="armv7";;
   cellspu-*)   target_dir="cellspu";;