diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2016-07-25 22:36:22 +0000 |
|---|---|---|
| committer | Jan Vesely <jan.vesely@rutgers.edu> | 2016-07-25 22:36:22 +0000 |
| commit | 4c59714a52f2b78c0413005d1ec1f23839fa789d (patch) | |
| tree | 5205a49cc5f36c3d961cf424edb4aac215b0a116 /libclc | |
| parent | d5617b554579e20a198d6e96932fb7073993e760 (diff) | |
| download | bcm5719-llvm-4c59714a52f2b78c0413005d1ec1f23839fa789d.tar.gz bcm5719-llvm-4c59714a52f2b78c0413005d1ec1f23839fa789d.zip | |
Make min follow the OCL 1.0 specs
OpenCL 1.0: "Returns y if y < x, otherwise it returns x. If x *and* y
are infinite or NaN, the return values are undefined."
OpenCL 1.1+: "Returns y if y < x, otherwise it returns x. If x *or* y
are infinite or NaN, the return values are undefined."
The 1.0 version is stricter so use that one.
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
llvm-svn: 276704
Diffstat (limited to 'libclc')
| -rw-r--r-- | libclc/generic/lib/shared/min.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libclc/generic/lib/shared/min.inc b/libclc/generic/lib/shared/min.inc index fe42864df25..e15e0559134 100644 --- a/libclc/generic/lib/shared/min.inc +++ b/libclc/generic/lib/shared/min.inc @@ -1,9 +1,9 @@ _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_GENTYPE b) { - return (a < b ? a : b); + return (b < a ? b : a); } #ifndef __CLC_SCALAR _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b) { - return (a < (__CLC_GENTYPE)b ? a : (__CLC_GENTYPE)b); + return (b < (__CLC_GENTYPE)a ? (__CLC_GENTYPE)b : a); } #endif |
