From 17ec3a51c3344d0664981414ca3665e81b4c6aad Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 May 2015 00:04:12 +0000 Subject: Implement fast_normalize builtin v4 This implementation was ported from the AMD builtin library and has been tested with piglit, OpenCV, and the ocl conformance tests. v2: - Remove f suffix from constant in double implementations. - Consolidate implementations using the .cl/.inc approach. v3: - Use __CLC_FPSIZE instead of __CLC_FP{32,64} v4 (Jan Vesely): - Limit to single precision. llvm-svn: 236920 --- libclc/generic/include/clc/clc.h | 1 + .../generic/include/clc/geometric/fast_normalize.h | 26 ++++++++++++++++++ .../include/clc/geometric/fast_normalize.inc | 24 ++++++++++++++++ libclc/generic/include/clc/geometric/floatn.inc | 10 +++++++ libclc/generic/lib/SOURCES | 1 + libclc/generic/lib/geometric/fast_normalize.cl | 32 ++++++++++++++++++++++ libclc/generic/lib/geometric/fast_normalize.inc | 31 +++++++++++++++++++++ 7 files changed, 125 insertions(+) create mode 100644 libclc/generic/include/clc/geometric/fast_normalize.h create mode 100644 libclc/generic/include/clc/geometric/fast_normalize.inc create mode 100644 libclc/generic/lib/geometric/fast_normalize.cl create mode 100644 libclc/generic/lib/geometric/fast_normalize.inc (limited to 'libclc') diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h index 227adced2f8..9f1f75a4bd5 100644 --- a/libclc/generic/include/clc/clc.h +++ b/libclc/generic/include/clc/clc.h @@ -132,6 +132,7 @@ #include #include #include +#include #include #include diff --git a/libclc/generic/include/clc/geometric/fast_normalize.h b/libclc/generic/include/clc/geometric/fast_normalize.h new file mode 100644 index 00000000000..c50b1c6661e --- /dev/null +++ b/libclc/generic/include/clc/geometric/fast_normalize.h @@ -0,0 +1,26 @@ +/* + * 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 +#define __FLOAT_ONLY +#include +#undef __FLOAT_ONLY diff --git a/libclc/generic/include/clc/geometric/fast_normalize.inc b/libclc/generic/include/clc/geometric/fast_normalize.inc new file mode 100644 index 00000000000..3ef8f8670a6 --- /dev/null +++ b/libclc/generic/include/clc/geometric/fast_normalize.inc @@ -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. + */ + + +_CLC_OVERLOAD _CLC_DECL __CLC_FLOATN fast_normalize(__CLC_FLOATN p); diff --git a/libclc/generic/include/clc/geometric/floatn.inc b/libclc/generic/include/clc/geometric/floatn.inc index fb7a9ae601c..fe5fba69ab4 100644 --- a/libclc/generic/include/clc/geometric/floatn.inc +++ b/libclc/generic/include/clc/geometric/floatn.inc @@ -1,8 +1,11 @@ #define __CLC_FLOAT float +#define __CLC_FPSIZE 32 #define __CLC_FLOATN float +#define __CLC_SCALAR #include __CLC_BODY #undef __CLC_FLOATN +#undef __CLC_SCALAR #define __CLC_FLOATN float2 #include __CLC_BODY @@ -17,14 +20,19 @@ #undef __CLC_FLOATN #undef __CLC_FLOAT +#undef __CLC_FPSIZE +#ifndef __FLOAT_ONLY #ifdef cl_khr_fp64 #define __CLC_FLOAT double +#define __CLC_FPSIZE 64 #define __CLC_FLOATN double +#define __CLC_SCALAR #include __CLC_BODY #undef __CLC_FLOATN +#undef __CLC_SCALAR #define __CLC_FLOATN double2 #include __CLC_BODY @@ -39,7 +47,9 @@ #undef __CLC_FLOATN #undef __CLC_FLOAT +#undef __CLC_FPSIZE +#endif #endif #undef __CLC_BODY diff --git a/libclc/generic/lib/SOURCES b/libclc/generic/lib/SOURCES index d4cb8b86b15..a05cceaead6 100644 --- a/libclc/generic/lib/SOURCES +++ b/libclc/generic/lib/SOURCES @@ -40,6 +40,7 @@ geometric/distance.cl geometric/dot.cl geometric/fast_distance.cl geometric/fast_length.cl +geometric/fast_normalize.cl geometric/length.cl geometric/normalize.cl integer/abs.cl diff --git a/libclc/generic/lib/geometric/fast_normalize.cl b/libclc/generic/lib/geometric/fast_normalize.cl new file mode 100644 index 00000000000..af5f99434f7 --- /dev/null +++ b/libclc/generic/lib/geometric/fast_normalize.cl @@ -0,0 +1,32 @@ +/* + * 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_OVERLOAD _CLC_DEF float fast_normalize(float p) { + return normalize(p); +} + +#define __CLC_BODY +#define __FLOAT_ONLY +#include +#undef __FLOAT_ONLY diff --git a/libclc/generic/lib/geometric/fast_normalize.inc b/libclc/generic/lib/geometric/fast_normalize.inc new file mode 100644 index 00000000000..c1be2b8b942 --- /dev/null +++ b/libclc/generic/lib/geometric/fast_normalize.inc @@ -0,0 +1,31 @@ +/* + * 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. + */ + +#ifndef __CLC_SCALAR + +// Only handle vector implementations +_CLC_OVERLOAD _CLC_DEF __CLC_FLOATN fast_normalize(__CLC_FLOATN p) { + __CLC_FLOAT l2 = dot(p, p); + return l2 == 0.0f ? p : p * half_rsqrt(l2); +} + +#endif -- cgit v1.2.3