diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2018-03-06 17:48:40 +0000 |
|---|---|---|
| committer | Jan Vesely <jan.vesely@rutgers.edu> | 2018-03-06 17:48:40 +0000 |
| commit | 44f21978a200b3fe94aaed8aa685cdf1d14da9ac (patch) | |
| tree | e3716d06a3e8716d8a0f370b26ca5cebfa9c0e5e /libclc/generic/lib | |
| parent | 4e72300929d9450f13190cd264d40268af08427c (diff) | |
| download | bcm5719-llvm-44f21978a200b3fe94aaed8aa685cdf1d14da9ac.tar.gz bcm5719-llvm-44f21978a200b3fe94aaed8aa685cdf1d14da9ac.zip | |
minmag: Condition variable needs to be the same bitwidth as operands
No changes wrt CTS
Reviewed-by: Aaron Watry <awatry@gmail.com>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
llvm-svn: 326818
Diffstat (limited to 'libclc/generic/lib')
| -rw-r--r-- | libclc/generic/lib/math/minmag.cl | 1 | ||||
| -rw-r--r-- | libclc/generic/lib/math/minmag.inc | 22 |
2 files changed, 21 insertions, 2 deletions
diff --git a/libclc/generic/lib/math/minmag.cl b/libclc/generic/lib/math/minmag.cl index 1c815fc9b0d..0d898820609 100644 --- a/libclc/generic/lib/math/minmag.cl +++ b/libclc/generic/lib/math/minmag.cl @@ -1,4 +1,5 @@ #include <clc/clc.h> +#include <utils.h> #define __CLC_BODY <minmag.inc> #include <clc/math/gentype.inc> diff --git a/libclc/generic/lib/math/minmag.inc b/libclc/generic/lib/math/minmag.inc index 097822c6502..f8072aa326a 100644 --- a/libclc/generic/lib/math/minmag.inc +++ b/libclc/generic/lib/math/minmag.inc @@ -1,4 +1,22 @@ +#ifdef __CLC_SCALAR +#define __CLC_VECSIZE +#endif + +#if __CLC_FPSIZE == 64 +#define __CLC_CONVERT_NATN __CLC_XCONCAT(convert_long, __CLC_VECSIZE) +#elif __CLC_FPSIZE == 32 +#define __CLC_CONVERT_NATN __CLC_XCONCAT(convert_int, __CLC_VECSIZE) +#elif __CLC_FPSIZE == 16 +#define __CLC_CONVERT_NATN __CLC_XCONCAT(convert_short, __CLC_VECSIZE) +#endif + _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE minmag(__CLC_GENTYPE x, __CLC_GENTYPE y) { - const __CLC_GENTYPE res = select(y, x, isless(fabs(x), fabs(y))); - return select(res, fmin(x, y), isnan(x) | isnan(y) | isequal(fabs(x), fabs(y))); + const __CLC_GENTYPE res = select(y, x, __CLC_CONVERT_NATN(isless(fabs(x), fabs(y)))); + return select(res, fmin(x, y), __CLC_CONVERT_NATN(isnan(x) | isnan(y) | isequal(fabs(x), fabs(y)))); } + +#undef __CLC_CONVERT_NATN + +#ifdef __CLC_SCALAR +#undef __CLC_VECSIZE +#endif |
