[libclc] r326818 - minmag: Condition variable needs to be the same bitwidth as operands

[Jan Vesely via cfe-commits]

Author: jvesely
Date: Tue Mar  6 09:48:40 2018
New Revision: 326818

URL: http://llvm.org/viewvc/llvm-project?rev=326818&view=rev
Log:
minmag: Condition variable needs to be the same bitwidth as operands

No changes wrt CTS

Reviewed-by: Aaron Watry <awatry at gmail.com>
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>

Modified:
    libclc/trunk/generic/lib/math/minmag.cl
    libclc/trunk/generic/lib/math/minmag.inc

Modified: libclc/trunk/generic/lib/math/minmag.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/minmag.cl?rev=326818&r1=326817&r2=326818&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/minmag.cl (original)
+++ libclc/trunk/generic/lib/math/minmag.cl Tue Mar  6 09:48:40 2018
@@ -1,4 +1,5 @@
 #include <clc/clc.h>
+#include <utils.h>
 
 #define __CLC_BODY <minmag.inc>
 #include <clc/math/gentype.inc>

Modified: libclc/trunk/generic/lib/math/minmag.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/minmag.inc?rev=326818&r1=326817&r2=326818&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/minmag.inc (original)
+++ libclc/trunk/generic/lib/math/minmag.inc Tue Mar  6 09:48:40 2018
@@ -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