Skip to content

Commit

Permalink
Fixes errors in select(a,b,c)
Browse files Browse the repository at this point in the history 
See doe300/VC4CL#41
  • Loading branch information
@doe300
doe300 committed Jul 9, 2018
1 parent b62ada3 commit 4664bae
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 56 deletions.
4 changes: 2 additions & 2 deletions include/_integer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ SIMPLE_1(uint, abs, uint, val, val)

//based on pocl (pocl/lib/kernel/abs_diff.cl)
SIMPLE_2(uchar, abs_diff, uchar, x, uchar, y, (result_t)abs(x > y ? x - y : y - x))
SIMPLE_2(uchar, abs_diff, char, x, char, y, vc4cl_bitcast_char(vc4cl_msb_set(x & y)) ? /* same sign -> no under/overflow */ (result_t)abs(x - y) : /* different signs */ abs(x) + abs(y))
SIMPLE_2(uchar, abs_diff, char, x, char, y, (vc4cl_msb_set(x & y)) ? /* same sign -> no under/overflow */ (result_t)abs(x - y) : /* different signs */ abs(x) + abs(y))
SIMPLE_2(ushort, abs_diff, ushort, x, ushort, y, (result_t)abs(x > y ? x - y : y - x))
SIMPLE_2(ushort, abs_diff, short, x, short, y, vc4cl_bitcast_short(vc4cl_msb_set(x & y)) ? /* same sign -> no under/overflow */ (result_t)abs(x - y) : /* different signs */ abs(x) + abs(y))
SIMPLE_2(ushort, abs_diff, short, x, short, y, (vc4cl_msb_set(x & y)) ? /* same sign -> no under/overflow */ (result_t)abs(x - y) : /* different signs */ abs(x) + abs(y))
SIMPLE_2(uint, abs_diff, uint, x, uint, y, abs(x > y ? x - y : y - x))
SIMPLE_2(uint, abs_diff, int, x, int, y, vc4cl_msb_set(x & y) ? /* same sign -> no under/overflow */ abs(x - y) : /* different signs */ abs(x) + abs(y))

Expand Down
12 changes: 6 additions & 6 deletions include/_intrinsics.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,12 @@ SIMPLE_1(int, vc4cl_extend, int, val, val)
/*
* Other functions
*/
SIMPLE_1(int, vc4cl_msb_set, uchar, val, vc4cl_extend((val >> 7) == (arg_t)1))
SIMPLE_1(int, vc4cl_msb_set, char, val, vc4cl_extend((val >> 7) == (arg_t)1))
SIMPLE_1(int, vc4cl_msb_set, ushort, val, vc4cl_extend((val >> 15) == (arg_t)1))
SIMPLE_1(int, vc4cl_msb_set, short, val, vc4cl_extend((val >> 15) == (arg_t)1))
SIMPLE_1(int, vc4cl_msb_set, uint, val, vc4cl_extend((val >> 31) == (arg_t)1))
SIMPLE_1(int, vc4cl_msb_set, int, val, vc4cl_extend((val >> 31) == (arg_t)1))
SIMPLE_1(uchar, vc4cl_msb_set, uchar, val, vc4cl_bitcast_uchar(vc4cl_extend(val >> 7 == (arg_t)1)))
SIMPLE_1(char, vc4cl_msb_set, char, val, vc4cl_bitcast_char(vc4cl_and((arg_t)(val >> 7), (arg_t)1)) == (arg_t)1)
SIMPLE_1(ushort, vc4cl_msb_set, ushort, val, vc4cl_bitcast_ushort(vc4cl_extend(val >> 15 == (arg_t)1)))
SIMPLE_1(short, vc4cl_msb_set, short, val, vc4cl_bitcast_short(vc4cl_and((arg_t)(val >> 15), (arg_t)1)) == (arg_t)1)
SIMPLE_1(uint, vc4cl_msb_set, uint, val, vc4cl_bitcast_uint(val >> 31 == 1))
SIMPLE_1(int, vc4cl_msb_set, int, val, (val < (arg_t)0))

/*
* Vector functions
Expand Down
85 changes: 37 additions & 48 deletions include/_relational.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
INLINE FUNC_1(int, func, type##16, x) CONST \
{ \
/* (s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sa, sb, sc, sd, se, sf) */ \
type##16 val0 = vc4cl_bitcast_##type(conv(x)); \
type##16 val0 = conv(x); \
/* (s0 op s1, s1 op s2, s2 op s3, s3 op s4, s4 op s5, s5 op s6, s6 op s7, s7 op s8, s8 op s9, s9 op sa, sa op sb, sb op sc, sc op sd, sd op se, se op sf, sf op s0) */ \
val0 = val0 op vc4cl_vector_rotate(val0, -1); \
/* (s0 op s1 op s2 op s3, s1 op s2 op s3 op s4, s2 op s3 op s4 op s5, s3 op s4 op s5 op s6, s4 op s5 op s6 op s7, s5 op s6 op s7 op s8, s6 op s7 op s8 op s9, s7 op s8 op s9 op sa, s8 op s9 op sa op sb, s9 op sa op sb op sc, sa op sb op sc op sd, sb op sc op sd op se, sc op sd op se op sf, ...) */ \
Expand All @@ -80,7 +80,7 @@
INLINE FUNC_1(int, func, type##8, x) CONST \
{ \
/* (s0, s1, s2, s3, s4, s5, s6, s7) */ \
type##8 val0 = vc4cl_bitcast_##type(conv(x)); \
type##8 val0 = conv(x); \
/* (s0 op s1, s1 op s2, s2 op s3, s3 op s4, s4 op s5, s5 op s6, s6 op s7, s7 op ?) */ \
val0 = val0 op vc4cl_vector_rotate(val0, -1); \
/* (s0 op s1 op s2 op s3, s1 op s2 op s3 op s4, s2 op s3 op s4 op s5, s3 op s4 op s5 op s6, s4 op s5 op s6 op s7, s5 op s6 op s7 op ?, s6 op s7 op ? op ?, s7 op ? op ? op ?) */ \
Expand All @@ -91,7 +91,7 @@
INLINE FUNC_1(int, func, type##4, x) CONST \
{ \
/* (x, y, z, w) */ \
type##4 val0 = vc4cl_bitcast_##type(conv(x)); \
type##4 val0 = conv(x); \
/* (x op y, y op z, z op w, w op ?) */ \
val0 = val0 op vc4cl_vector_rotate(val0, -1); \
/* (z op w, w op ?, ? op ?, ? op ?) */ \
Expand All @@ -101,17 +101,17 @@
} \
INLINE FUNC_1(int, func, type##3, x) CONST \
{ \
type##3 val = vc4cl_bitcast_##type(conv(x)); \
type##3 val = conv(x); \
return val.x op val.y op val.z; \
} \
INLINE FUNC_1(int, func, type##2, x) CONST \
{ \
type##2 val = vc4cl_bitcast_##type(conv(x)); \
type##2 val = conv(x); \
return val.x op val.y; \
} \
INLINE FUNC_1(int, func, type, x) CONST \
{ \
type val = vc4cl_bitcast_##type(conv(x)); \
type val = conv(x); \
return val; \
}

Expand Down Expand Up @@ -140,6 +140,7 @@ FOR_ALL_ELEMENTS(any, short, |, vc4cl_msb_set)
FOR_ALL_ELEMENTS(any, uint, |, vc4cl_msb_set)
FOR_ALL_ELEMENTS(any, int, |, vc4cl_msb_set)

//TODO all(int4) is wrong, the rotation parameter are zeroinitializers?? The bit-cast is somehow optimized away
FOR_ALL_ELEMENTS(all, uchar, &, vc4cl_msb_set)
FOR_ALL_ELEMENTS(all, char, &, vc4cl_msb_set)
FOR_ALL_ELEMENTS(all, ushort, &, vc4cl_msb_set)
Expand All @@ -162,48 +163,36 @@ SIMPLE_3(float, bitselect, float, a, float, b, float, c, vc4cl_bitcast_float((~v
//"For each component of a vector type, result[i] = if MSB of c[i] is set ? b[i] : a[i]"
//"For a scalar type, result = c ? b : a."
//TODO "For a scalar type, result = c ? b : a." So no check for MSB!
SIMPLE_3(uchar, select, uchar, a, uchar, b, uchar, c, vc4cl_bitcast_uchar(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uchar, select, uchar, a, uchar, b, char, c, vc4cl_bitcast_uchar(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uchar, select, uchar, a, uchar, b, ushort, c, vc4cl_bitcast_uchar(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uchar, select, uchar, a, uchar, b, short, c, vc4cl_bitcast_uchar(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uchar, select, uchar, a, uchar, b, uint, c, vc4cl_bitcast_uchar(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uchar, select, uchar, a, uchar, b, int, c, vc4cl_bitcast_uchar(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(char, select, char, a, char, b, uchar, c, vc4cl_bitcast_char(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(char, select, char, a, char, b, char, c, vc4cl_bitcast_char(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(char, select, char, a, char, b, ushort, c, vc4cl_bitcast_char(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(char, select, char, a, char, b, short, c, vc4cl_bitcast_char(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(char, select, char, a, char, b, uint, c, vc4cl_bitcast_char(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(char, select, char, a, char, b, int, c, vc4cl_bitcast_char(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(ushort, select, ushort, a, ushort, b, uchar, c, vc4cl_bitcast_ushort(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(ushort, select, ushort, a, ushort, b, char, c, vc4cl_bitcast_ushort(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(ushort, select, ushort, a, ushort, b, ushort, c, vc4cl_bitcast_ushort(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(ushort, select, ushort, a, ushort, b, short, c, vc4cl_bitcast_ushort(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(ushort, select, ushort, a, ushort, b, uint, c, vc4cl_bitcast_ushort(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(ushort, select, ushort, a, ushort, b, int, c, vc4cl_bitcast_ushort(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(short, select, short, a, short, b, uchar, c, vc4cl_bitcast_short(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(short, select, short, a, short, b, char, c, vc4cl_bitcast_short(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(short, select, short, a, short, b, ushort, c, vc4cl_bitcast_short(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(short, select, short, a, short, b, short, c, vc4cl_bitcast_short(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(short, select, short, a, short, b, uint, c, vc4cl_bitcast_short(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(short, select, short, a, short, b, int, c, vc4cl_bitcast_short(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, uchar, c, vc4cl_bitcast_uint(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, char, c, vc4cl_bitcast_uint(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, ushort, c, vc4cl_bitcast_uint(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, short, c, vc4cl_bitcast_uint(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, uint, c, vc4cl_bitcast_uint(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, int, c, vc4cl_bitcast_uint(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(int, select, int, a, int, b, uchar, c, vc4cl_bitcast_int(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(int, select, int, a, int, b, char, c, vc4cl_bitcast_int(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(int, select, int, a, int, b, ushort, c, vc4cl_bitcast_int(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(int, select, int, a, int, b, short, c, vc4cl_bitcast_int(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(int, select, int, a, int, b, uint, c, vc4cl_bitcast_int(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(int, select, int, a, int, b, int, c, vc4cl_bitcast_int(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(float, select, float, a, float, b, uchar, c, vc4cl_extend(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(float, select, float, a, float, b, char, c, vc4cl_extend(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(float, select, float, a, float, b, ushort, c, vc4cl_extend(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(float, select, float, a, float, b, short, c, vc4cl_extend(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(float, select, float, a, float, b, uint, c, vc4cl_extend(vc4cl_msb_set(c)) ? b : a)
SIMPLE_3(float, select, float, a, float, b, int, c, vc4cl_extend(vc4cl_msb_set(c)) ? b : a)
COMPLEX_3(uchar, select, uchar, a, uchar, b, uchar, c,
{
int_t mask = vc4cl_asr(vc4cl_extend(c) << 24, 32);
return vc4cl_bitcast_uchar(mask & vc4cl_bitcast_int(vc4cl_extend(b)) | (~mask & vc4cl_bitcast_int(vc4cl_extend(a))));
})
COMPLEX_3(uchar, select, uchar, a, uchar, b, char, c,
{
int_t mask = vc4cl_asr(vc4cl_extend(c) << 24, 32);
return vc4cl_bitcast_uchar(mask & vc4cl_bitcast_int(vc4cl_extend(b)) | (~mask & vc4cl_bitcast_int(vc4cl_extend(a))));
})
SIMPLE_3(char, select, char, a, char, b, uchar, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(char, select, char, a, char, b, char, c, vc4cl_msb_set(c) ? b : a)
COMPLEX_3(ushort, select, ushort, a, ushort, b, ushort, c,
{
int_t mask = vc4cl_asr(vc4cl_extend(c) << 16, 32);
return vc4cl_bitcast_ushort(mask & vc4cl_bitcast_int(vc4cl_extend(b)) | (~mask & vc4cl_bitcast_int(vc4cl_extend(a))));
})
COMPLEX_3(ushort, select, ushort, a, ushort, b, short, c,
{
int_t mask = vc4cl_asr(vc4cl_extend(c) << 16, 32);
return vc4cl_bitcast_ushort(mask & vc4cl_bitcast_int(vc4cl_extend(b)) | (~mask & vc4cl_bitcast_int(vc4cl_extend(a))));
})
SIMPLE_3(short, select, short, a, short, b, ushort, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(short, select, short, a, short, b, short, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, uint, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(uint, select, uint, a, uint, b, int, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(int, select, int, a, int, b, uint, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(int, select, int, a, int, b, int, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(float, select, float, a, float, b, uint, c, vc4cl_msb_set(c) ? b : a)
SIMPLE_3(float, select, float, a, float, b, int, c, vc4cl_msb_set(c) ? b : a)

#undef COMPARISON_1
#undef COMPARISON_2
Expand Down

0 comments on commit 4664bae

Please sign in to comment.