[Libclc-dev] [PATCH 08/15] Implement fract builtin

Jan Vesely jan.vesely at rutgers.edu
Sat Apr 11 18:57:16 PDT 2015 

LGTM.

Passes on r600 too (after fixing fmin)
On Tue, 2015-04-07 at 18:05 +0000, Tom Stellard wrote:
> This implementation was ported from the AMD builtin library
> and has been tested with piglit, OpenCV, and the ocl conformance tests.
> ---
>  generic/include/clc/clc.h          |  1 +
>  generic/include/clc/math/fract.h   | 24 +++++++++++++++++++
>  generic/include/clc/math/fract.inc | 25 +++++++++++++++++++
>  generic/lib/SOURCES                |  1 +
>  generic/lib/math/fract.cl          | 30 +++++++++++++++++++++++
>  generic/lib/math/fract.inc         | 49 ++++++++++++++++++++++++++++++++++++++
>  6 files changed, 130 insertions(+)
>  create mode 100644 generic/include/clc/math/fract.h
>  create mode 100644 generic/include/clc/math/fract.inc
>  create mode 100644 generic/lib/math/fract.cl
>  create mode 100644 generic/lib/math/fract.inc
> 
> diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
> index 46dd3b7..ee0a847 100644
> --- a/generic/include/clc/clc.h
> +++ b/generic/include/clc/clc.h
> @@ -57,6 +57,7 @@
>  #include <clc/math/fmax.h>
>  #include <clc/math/fmin.h>
>  #include <clc/math/fmod.h>
> +#include <clc/math/fract.h>
>  #include <clc/math/half_rsqrt.h>
>  #include <clc/math/half_sqrt.h>
>  #include <clc/math/hypot.h>
> diff --git a/generic/include/clc/math/fract.h b/generic/include/clc/math/fract.h
> new file mode 100644
> index 0000000..f2c8872
> --- /dev/null
> +++ b/generic/include/clc/math/fract.h
> @@ -0,0 +1,24 @@
> +/*
> + * Copyright (c) 2014, 2015 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#define __CLC_BODY <clc/math/fract.inc>
> +#include <clc/math/gentype.inc>
> diff --git a/generic/include/clc/math/fract.inc b/generic/include/clc/math/fract.inc
> new file mode 100644
> index 0000000..71e6e8a
> --- /dev/null
> +++ b/generic/include/clc/math/fract.inc
> @@ -0,0 +1,25 @@
> +/*
> + * Copyright (c) 2014, 2015 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE fract(__CLC_GENTYPE x, global __CLC_GENTYPE *iptr);
> +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE fract(__CLC_GENTYPE x, local __CLC_GENTYPE *iptr);
> +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE fract(__CLC_GENTYPE x, private __CLC_GENTYPE *iptr);
> diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
> index 808d72f..e047540 100644
> --- a/generic/lib/SOURCES
> +++ b/generic/lib/SOURCES
> @@ -83,6 +83,7 @@ math/exp10.cl
>  math/fmax.cl
>  math/fmin.cl
>  math/fmod.cl
> +math/fract.cl
>  math/half_rsqrt.cl
>  math/half_sqrt.cl
>  math/hypot.cl
> diff --git a/generic/lib/math/fract.cl b/generic/lib/math/fract.cl
> new file mode 100644
> index 0000000..b434071
> --- /dev/null
> +++ b/generic/lib/math/fract.cl
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright (c) 2015 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include <clc/clc.h>
> +
> +#ifdef cl_khr_fp64
> +#pragma OPENCL EXTENSION cl_khr_fp64 : enable
> +#endif
> +
> +#define __CLC_BODY <fract.inc>
> +#include <clc/math/gentype.inc>
> diff --git a/generic/lib/math/fract.inc b/generic/lib/math/fract.inc
> new file mode 100644
> index 0000000..8d2a4d7
> --- /dev/null
> +++ b/generic/lib/math/fract.inc
> @@ -0,0 +1,49 @@
> +/*
> + * Copyright (c) 2015 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#if __CLC_FPSIZE == 32
> +#define MIN_CONSTANT 0x1.fffffep-1f
> +#else
> +#define MIN_CONSTANT 0x1.fffffffffffffp-1
> +#endif
> +
> +_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE fract(__CLC_GENTYPE x, private __CLC_GENTYPE *iptr) {
> +  *iptr = floor(x);
> +  __CLC_GENTYPE r = fmin(x - *iptr, MIN_CONSTANT);
> +  r = isinf(x) ? 0.0f : r;
> +  r = isnan(x) ? x : r;
> +  return r;
> +}
> +
> +
> +#define FRACT_DEF(addrspace) \
> +  _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE fract(__CLC_GENTYPE x, addrspace __CLC_GENTYPE *iptr) { \
> +    __CLC_GENTYPE private_iptr; \
> +    __CLC_GENTYPE ret = fract(x, &private_iptr); \
> +    *iptr = private_iptr; \
> +    return ret; \
> + }
> +
> +FRACT_DEF(local);
> +FRACT_DEF(global);
> +
> +#undef MIN_CONSTANT

-- 
Jan Vesely <jan.vesely at rutgers.edu>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.llvm.org/pipermail/libclc-dev/attachments/20150411/4d3d3cc1/attachment.sig>

More information about the Libclc-dev mailing list