diff options
author | Tom Stellard <thomas.stellard@amd.com> | 2015-03-02 15:29:37 +0000 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2015-03-02 15:29:37 +0000 |
commit | e0d14c1a7d5e63d5468b7ae43ca4905c1f967481 (patch) | |
tree | 7d41db733e1bd07dc6c405eabca9dc3afb9dfabb | |
parent | 3992fca10869aa8db55607831f3a3b78b8a10315 (diff) |
Implement radians builtin v2
This has been tested with piglit, OpenCV, and the ocl conformance tests.
v2:
- Move to the common/ directory
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@230968 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | generic/include/clc/clc.h | 1 | ||||
-rw-r--r-- | generic/include/clc/common/radians.h | 25 | ||||
-rw-r--r-- | generic/include/clc/common/radians.inc | 23 | ||||
-rw-r--r-- | generic/lib/SOURCES | 1 | ||||
-rw-r--r-- | generic/lib/common/radians.cl | 45 |
5 files changed, 95 insertions, 0 deletions
diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h index 168df19..2848e59 100644 --- a/generic/include/clc/clc.h +++ b/generic/include/clc/clc.h @@ -109,6 +109,7 @@ /* 6.11.4 Common Functions */ #include <clc/common/degrees.h> +#include <clc/common/radians.h> #include <clc/common/sign.h> /* 6.11.5 Geometric Functions */ diff --git a/generic/include/clc/common/radians.h b/generic/include/clc/common/radians.h new file mode 100644 index 0000000..6bec9d4 --- /dev/null +++ b/generic/include/clc/common/radians.h @@ -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. + */ + +#define __CLC_BODY <clc/common/radians.inc> +#include <clc/math/gentype.inc> +#undef __CLC_BODY diff --git a/generic/include/clc/common/radians.inc b/generic/include/clc/common/radians.inc new file mode 100644 index 0000000..ae43939 --- /dev/null +++ b/generic/include/clc/common/radians.inc @@ -0,0 +1,23 @@ +/* + * 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 radians(__CLC_GENTYPE x); diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES index e32bf02..fa5d89b 100644 --- a/generic/lib/SOURCES +++ b/generic/lib/SOURCES @@ -28,6 +28,7 @@ cl_khr_local_int32_extended_atomics/atom_or.cl cl_khr_local_int32_extended_atomics/atom_xor.cl convert.cl common/degrees.cl +common/radians.cl common/sign.cl geometric/cross.cl geometric/dot.cl diff --git a/generic/lib/common/radians.cl b/generic/lib/common/radians.cl new file mode 100644 index 0000000..3838dd6 --- /dev/null +++ b/generic/lib/common/radians.cl @@ -0,0 +1,45 @@ +/* + * 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. + */ + +#include <clc/clc.h> + +#include "../clcmacro.h" + +_CLC_OVERLOAD _CLC_DEF float radians(float degrees) { + // pi/180 = ~0.01745329251994329577 or 0x1.1df46a2529d39p-6 or 0x1.1df46ap-6F + return 0x1.1df46ap-6F * degrees; +} + +_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, radians, float); + + +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable + +_CLC_OVERLOAD _CLC_DEF double radians(double degrees) { + // pi/180 = ~0.01745329251994329577 or 0x1.1df46a2529d39p-6 or 0x1.1df46ap-6F + return 0x1.1df46a2529d39p-6 * degrees; +} + +_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, radians, double); + +#endif |