Merge lp://staging/~schnetter/pocl/main into lp://staging/~pocl/pocl/trunk

Hi erik,

lot of functions implemented, great! :)

Just some comments:

1) fmax.cl, fmin.cl and sqrt.cl gave me compilations errors, similar to this:
../../../../src/pocl.schnetter/lib/kernel/fmax.cl:35:11: error: invalid conversion between ext-vector type 'float4' and '__attribute__((__vector_size__(4 * sizeof(float)))) float'
  return ((float4)__builtin_ia32_maxss(*(float4*)&a, *(float4*)&b)).s0;
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../../../src/pocl.schnetter/lib/kernel/fmax.cl:91:11: error: invalid conversion between ext-vector type 'double2' and '__attribute__((__vector_size__(2 * sizeof(double)))) double'
  return ((double2)__builtin_ia32_maxsd(*(double2*)&a, *(double2*)&b)).s0;
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.

2) Makefile in trig directory is not generated (missing the appropiate line at the end of configure.ac).

3) If I add that line trig test still do not compile for me:
/bin/bash ../../libtool --tag=CC --mode=link gcc -g -O2 -o trig trig.o ../../lib/CL/libCL.la
libtool: link: gcc -g -O2 -o .libs/trig trig.o ../../lib/CL/.libs/libCL.so
trig.o: In function `main':
/home/csanchez/prj/ttagpu/bld/pocl.schnetter/examples/trig/../../../../src/pocl.schnetter/examples/trig/trig.c:73: undefined reference to `sqrtf'
/home/csanchez/prj/ttagpu/bld/pocl.schnetter/examples/trig/../../../../src/pocl.schnetter/examples/trig/trig.c:78: undefined reference to `exec_trig_kernel'
/home/csanchez/prj/ttagpu/bld/pocl.schnetter/examples/trig/../../../../src/pocl.schnetter/examples/trig/trig.c:72: undefined reference to `sinf'
/home/csanchez/prj/ttagpu/bld/pocl.schnetter/examples/trig/../../../../src/pocl.schnetter/examples/trig/trig.c:74: undefined reference to `tanf'
/home/csanchez/prj/ttagpu/bld/pocl.schnetter/examples/trig/../../../../src/pocl.schnetter/examples/trig/trig.c:70: undefined reference to `cosf'
collect2: ld returned 1 exit status
make[3]: *** [trig] Error 1

Can you please check those? Are they due to some version mismatch among us?

Carlos

Carlos

I just merged with the current trunk; this has syntax errors in CL/devices. Look for "+++", which should be "++" instead.

I corrected the errors in configure.ac and Makefile.am.

I don't know why you see the link errors for sqrtf and friends. I'm now using Clang __builtin functions instead of calling libm -- maybe that helps. Please look at the current tip of my branch (revision 53).

I really hope that the history of my branch doesn't pollute the main history. It contains quite a few stray paths. (I'm also learning how to merge with bzr.)

Okay, so I resubmit my branch for merging.

Saw the "+++x", yet it compiled with it :o (annoyed)

I think it was taking it as monary + (positive) and then pre increment, so it worked. Fixed, thanks.

Well the linking are not so reprising, -lm was not in the linking line. What surprises me is you not getting those.

I will recheck. And don't worry about stray paths in the history, is there just to track changes, if we start having multiple branches and similar we will care about that but for now it is not so important.

The +++x didn't compile for me. I think it may be interpreted as ++ + x, which (rightfully) doesn't compile.

I'm on Mac OSX Lion, using LLVM 3.0 via MacPorts.

Still same fmax/fmin errors, and some news in nan.cl:

../../../../src/pocl.schnetter/lib/kernel/nan.cl:44:49: error: invalid conversion between ext-vector type 'vtype' (aka 'double16') and
      'unsigned long __attribute__((ext_vector_type(16)))'
                sizeof(stype)==4 /* float */ ? (vtype)((utype)(~FLT_MANT_MASK & as_uint ( NAN)) | ((utype)FLT_MANT_MASK & a)) :
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../../../src/pocl.schnetter/lib/kernel/templates.h:301:28: note: expanded from:
  IMPLEMENT_EXPR_V_U(NAME, EXPR, double16, double, ulong16)
                           ^
../../../../src/pocl.schnetter/lib/kernel/templates.h:287:12: note: expanded from:
    return EXPR; \
           ^~~~

I tried in my Mac os X Lion, same errors. I compiled LLVM/clang from svn source, but should not be a difference AFAIK.

[prj:ttagpu]bash-3.2$ clang --version
clang version 3.0 (branches/release_30 142628)
Target: x86_64-apple-darwin11.2.0
Thread model: posix

The compiler is correct -- my code tries to cast ulong16 to double16, which is not possible. I wonder why this doesn't generate an error for me.

I'll test my branch on a recent Ubuntu.

Ok, it was still needed two minor fixes in trig/Makefile.am to link the math library and the pthreads if used. Now everything works, merged.