diff options
author | Tom Stellard <thomas.stellard@amd.com> | 2015-03-23 18:10:04 +0000 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2015-03-23 18:10:04 +0000 |
commit | 0a2d1619921545b52303be5608b64dc46f381e97 (patch) | |
tree | c543c388c259586a3fc769c9821993913f4ae32e /generic | |
parent | c7c85a105e33cd9c962a5c4e7f805a65ca1a5aec (diff) |
Implement fast_distance builtin
This implementation was ported from the AMD builtin library
and has been tested with piglit, OpenCV, and the ocl conformance tests.
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@232978 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'generic')
-rw-r--r-- | generic/include/clc/clc.h | 1 | ||||
-rw-r--r-- | generic/include/clc/geometric/fast_distance.h | 24 | ||||
-rw-r--r-- | generic/include/clc/geometric/fast_distance.inc | 23 | ||||
-rw-r--r-- | generic/lib/SOURCES | 1 | ||||
-rw-r--r-- | generic/lib/geometric/fast_distance.cl | 30 | ||||
-rw-r--r-- | generic/lib/geometric/fast_distance.inc | 25 |
6 files changed, 104 insertions, 0 deletions
diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h index efd9b92..21231a4 100644 --- a/generic/include/clc/clc.h +++ b/generic/include/clc/clc.h @@ -120,6 +120,7 @@ #include <clc/geometric/cross.h> #include <clc/geometric/distance.h> #include <clc/geometric/dot.h> +#include <clc/geometric/fast_distance.h> #include <clc/geometric/fast_length.h> #include <clc/geometric/length.h> #include <clc/geometric/normalize.h> diff --git a/generic/include/clc/geometric/fast_distance.h b/generic/include/clc/geometric/fast_distance.h new file mode 100644 index 0000000..91b3fe5 --- /dev/null +++ b/generic/include/clc/geometric/fast_distance.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/geometric/fast_distance.inc> +#include <clc/geometric/floatn.inc> diff --git a/generic/include/clc/geometric/fast_distance.inc b/generic/include/clc/geometric/fast_distance.inc new file mode 100644 index 0000000..1ed7c69 --- /dev/null +++ b/generic/include/clc/geometric/fast_distance.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_FLOAT fast_distance(__CLC_FLOATN p0, __CLC_FLOATN p1); diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES index 3f7db3d..be96b9e 100644 --- a/generic/lib/SOURCES +++ b/generic/lib/SOURCES @@ -36,6 +36,7 @@ common/step.cl geometric/cross.cl geometric/distance.cl geometric/dot.cl +geometric/fast_distance.cl geometric/fast_length.cl geometric/length.cl geometric/normalize.cl diff --git a/generic/lib/geometric/fast_distance.cl b/generic/lib/geometric/fast_distance.cl new file mode 100644 index 0000000..47c9d7a --- /dev/null +++ b/generic/lib/geometric/fast_distance.cl @@ -0,0 +1,30 @@ +/* + * 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> + +#ifdef cl_khr_fp64 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable +#endif + +#define __CLC_BODY <fast_distance.inc> +#include <clc/geometric/floatn.inc> diff --git a/generic/lib/geometric/fast_distance.inc b/generic/lib/geometric/fast_distance.inc new file mode 100644 index 0000000..d8fe3e0 --- /dev/null +++ b/generic/lib/geometric/fast_distance.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_DEF __CLC_FLOAT fast_distance(__CLC_FLOATN p0, __CLC_FLOATN p1) { + return fast_length(p0 - p1); +} |