[Beignet] [PATCH 1/2] add built-in function "shuffle2"

[Zhigang Gong]

Forgot to mention, you may also want to enhance your test case to
cover this type of cases. The previous case only hits the code path
which is using shuffle to impelent shuffle2.

On Wed, Jul 24, 2013 at 05:20:53PM +0800, Zhigang Gong wrote:
> On Wed, Jul 24, 2013 at 03:12:23PM +0800, Homer Hsing wrote:
> > 
> > Signed-off-by: Homer Hsing <homer.xing at intel.com>
> > ---
> >  backend/src/ocl_stdlib.tmpl.h | 89 +++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 89 insertions(+)
> > 
> > diff --git a/backend/src/ocl_stdlib.tmpl.h b/backend/src/ocl_stdlib.tmpl.h
> > index 92a822a..45883af 100644
> > --- a/backend/src/ocl_stdlib.tmpl.h
> > +++ b/backend/src/ocl_stdlib.tmpl.h
> > @@ -1192,6 +1192,95 @@ DEF(float)
> >  #undef DEC8
> >  #undef DEC16
> >  
> > +#define DEC4(TYPE, ARGTYPE, TEMPTYPE) \
> > +  INLINE_OVERLOADABLE TYPE##4 shuffle2(ARGTYPE x, ARGTYPE y, uint4 mask) { \
> > +    return shuffle((TEMPTYPE)(x, y), mask); \
> > +  }
> > +
> > +#define DEC4X(TYPE) \
> > +  INLINE_OVERLOADABLE TYPE##4 shuffle2(TYPE##16 x, TYPE##16 y, uint4 mask) { \
> > +    TYPE##4 z; \
> > +    z.s0 = mask.s0 < 16 ? x[mask.s0] : y[mask.s0 & 15]; \
> > +    z.s1 = mask.s1 < 16 ? x[mask.s1] : y[mask.s1 & 15]; \
> > +    z.s2 = mask.s2 < 16 ? x[mask.s2] : y[mask.s2 & 15]; \
> > +    z.s3 = mask.s3 < 16 ? x[mask.s3] : y[mask.s3 & 15]; \
> > +    return z; \
> > +  }
> The above macro may generate the following code which I think is not valid code.
> 
>   short4 shuffle2(short16 x, short16 y, uint4 mask) 
>  { short4 z; z.s0 = mask.s0 < 16 ? x[mask.s0] : y[mask.s0 & 15];
>    z.s1 = mask.s1 < 16 ? x[mask.s1] : y[mask.s1 & 15] ...
> 
> I guess you want to use pointer to access a vector. Right?
> > +
> > +#define DEC8(TYPE, ARGTYPE, TEMPTYPE) \
> > +  INLINE_OVERLOADABLE TYPE##8 shuffle2(ARGTYPE x, ARGTYPE y, uint8 mask) { \
> > +    return shuffle((TEMPTYPE)(x, y), mask); \
> > +  }
> > +
> > +#define DEC8X(TYPE) \
> > +  INLINE_OVERLOADABLE TYPE##8 shuffle2(TYPE##16 x, TYPE##16 y, uint8 mask) { \
> > +    TYPE##8 z; \
> > +    z.s0 = mask.s0 < 16 ? x[mask.s0] : y[mask.s0 & 15]; \
> > +    z.s1 = mask.s1 < 16 ? x[mask.s1] : y[mask.s1 & 15]; \
> > +    z.s2 = mask.s2 < 16 ? x[mask.s2] : y[mask.s2 & 15]; \
> > +    z.s3 = mask.s3 < 16 ? x[mask.s3] : y[mask.s3 & 15]; \
> > +    z.s4 = mask.s4 < 16 ? x[mask.s4] : y[mask.s4 & 15]; \
> > +    z.s5 = mask.s5 < 16 ? x[mask.s5] : y[mask.s5 & 15]; \
> > +    z.s6 = mask.s6 < 16 ? x[mask.s6] : y[mask.s6 & 15]; \
> > +    z.s7 = mask.s7 < 16 ? x[mask.s7] : y[mask.s7 & 15]; \
> > +    return z; \
> > +  }
> 
> > +
> > +#define DEC16(TYPE, ARGTYPE, TEMPTYPE) \
> > +  INLINE_OVERLOADABLE TYPE##16 shuffle2(ARGTYPE x, ARGTYPE y, uint16 mask) { \
> > +    return shuffle((TEMPTYPE)(x, y), mask); \
> > +  }
> > +
> > +#define DEC16X(TYPE) \
> > +  INLINE_OVERLOADABLE TYPE##16 shuffle2(TYPE##16 x, TYPE##16 y, uint16 mask) { \
> > +    TYPE##16 z; \
> > +    z.s0 = mask.s0 < 16 ? x[mask.s0] : y[mask.s0 & 15]; \
> > +    z.s1 = mask.s1 < 16 ? x[mask.s1] : y[mask.s1 & 15]; \
> > +    z.s2 = mask.s2 < 16 ? x[mask.s2] : y[mask.s2 & 15]; \
> > +    z.s3 = mask.s3 < 16 ? x[mask.s3] : y[mask.s3 & 15]; \
> > +    z.s4 = mask.s4 < 16 ? x[mask.s4] : y[mask.s4 & 15]; \
> > +    z.s5 = mask.s5 < 16 ? x[mask.s5] : y[mask.s5 & 15]; \
> > +    z.s6 = mask.s6 < 16 ? x[mask.s6] : y[mask.s6 & 15]; \
> > +    z.s7 = mask.s7 < 16 ? x[mask.s7] : y[mask.s7 & 15]; \
> > +    z.s8 = mask.s8 < 16 ? x[mask.s8] : y[mask.s8 & 15]; \
> > +    z.s9 = mask.s9 < 16 ? x[mask.s9] : y[mask.s9 & 15]; \
> > +    z.sa = mask.sa < 16 ? x[mask.sa] : y[mask.sa & 15]; \
> > +    z.sb = mask.sb < 16 ? x[mask.sb] : y[mask.sb & 15]; \
> > +    z.sc = mask.sc < 16 ? x[mask.sc] : y[mask.sc & 15]; \
> > +    z.sd = mask.sd < 16 ? x[mask.sd] : y[mask.sd & 15]; \
> > +    z.se = mask.se < 16 ? x[mask.se] : y[mask.se & 15]; \
> > +    z.sf = mask.sf < 16 ? x[mask.sf] : y[mask.sf & 15]; \
> > +    return z; \
> > +  }
> > +
> > +#define DEF(TYPE) \
> > +  DEC4(TYPE, TYPE##2, TYPE##4) \
> > +  DEC4(TYPE, TYPE##4, TYPE##8) \
> > +  DEC4(TYPE, TYPE##8, TYPE##16) \
> > +  DEC4X(TYPE) \
> > +  DEC8(TYPE, TYPE##2, TYPE##4) \
> > +  DEC8(TYPE, TYPE##4, TYPE##8) \
> > +  DEC8(TYPE, TYPE##8, TYPE##16) \
> > +  DEC8X(TYPE) \
> > +  DEC16(TYPE, TYPE##2, TYPE##4) \
> > +  DEC16(TYPE, TYPE##4, TYPE##8) \
> > +  DEC16(TYPE, TYPE##8, TYPE##16) \
> > +  DEC16X(TYPE)
> > +
> > +DEF(char)
> > +DEF(uchar)
> > +DEF(short)
> > +DEF(ushort)
> > +DEF(int)
> > +DEF(uint)
> > +DEF(float)
> > +#undef DEF
> > +#undef DEC4
> > +#undef DEC4X
> > +#undef DEC8
> > +#undef DEC8X
> > +#undef DEC16
> > +#undef DEC16X
> >  /////////////////////////////////////////////////////////////////////////////
> >  // Synchronization functions
> >  /////////////////////////////////////////////////////////////////////////////
> > -- 
> > 1.8.1.2
> > 
> > _______________________________________________
> > Beignet mailing list
> > Beignet at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/beignet
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/beignet