[libclc] r236920 - Implement fast_normalize builtin v4
Tom Stellard
thomas.stellard at amd.com
Fri May 8 17:04:12 PDT 2015
Author: tstellar
Date: Fri May 8 19:04:12 2015
New Revision: 236920
URL: http://llvm.org/viewvc/llvm-project?rev=236920&view=rev
Log:
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.
Added:
libclc/trunk/generic/include/clc/geometric/fast_normalize.h
libclc/trunk/generic/include/clc/geometric/fast_normalize.inc
libclc/trunk/generic/lib/geometric/fast_normalize.cl
libclc/trunk/generic/lib/geometric/fast_normalize.inc
Modified:
libclc/trunk/generic/include/clc/clc.h
libclc/trunk/generic/include/clc/geometric/floatn.inc
libclc/trunk/generic/lib/SOURCES
Modified: libclc/trunk/generic/include/clc/clc.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/clc.h?rev=236920&r1=236919&r2=236920&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/clc.h (original)
+++ libclc/trunk/generic/include/clc/clc.h Fri May 8 19:04:12 2015
@@ -132,6 +132,7 @@
#include <clc/geometric/dot.h>
#include <clc/geometric/fast_distance.h>
#include <clc/geometric/fast_length.h>
+#include <clc/geometric/fast_normalize.h>
#include <clc/geometric/length.h>
#include <clc/geometric/normalize.h>
Added: libclc/trunk/generic/include/clc/geometric/fast_normalize.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/fast_normalize.h?rev=236920&view=auto
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/fast_normalize.h (added)
+++ libclc/trunk/generic/include/clc/geometric/fast_normalize.h Fri May 8 19:04:12 2015
@@ -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 <clc/geometric/fast_normalize.inc>
+#define __FLOAT_ONLY
+#include <clc/geometric/floatn.inc>
+#undef __FLOAT_ONLY
Added: libclc/trunk/generic/include/clc/geometric/fast_normalize.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/fast_normalize.inc?rev=236920&view=auto
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/fast_normalize.inc (added)
+++ libclc/trunk/generic/include/clc/geometric/fast_normalize.inc Fri May 8 19:04:12 2015
@@ -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);
Modified: libclc/trunk/generic/include/clc/geometric/floatn.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/floatn.inc?rev=236920&r1=236919&r2=236920&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/floatn.inc (original)
+++ libclc/trunk/generic/include/clc/geometric/floatn.inc Fri May 8 19:04:12 2015
@@ -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
Modified: libclc/trunk/generic/lib/SOURCES
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/SOURCES?rev=236920&r1=236919&r2=236920&view=diff
==============================================================================
--- libclc/trunk/generic/lib/SOURCES (original)
+++ libclc/trunk/generic/lib/SOURCES Fri May 8 19:04:12 2015
@@ -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
Added: libclc/trunk/generic/lib/geometric/fast_normalize.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/fast_normalize.cl?rev=236920&view=auto
==============================================================================
--- libclc/trunk/generic/lib/geometric/fast_normalize.cl (added)
+++ libclc/trunk/generic/lib/geometric/fast_normalize.cl Fri May 8 19:04:12 2015
@@ -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/clc.h>
+
+_CLC_OVERLOAD _CLC_DEF float fast_normalize(float p) {
+ return normalize(p);
+}
+
+#define __CLC_BODY <fast_normalize.inc>
+#define __FLOAT_ONLY
+#include <clc/geometric/floatn.inc>
+#undef __FLOAT_ONLY
Added: libclc/trunk/generic/lib/geometric/fast_normalize.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/fast_normalize.inc?rev=236920&view=auto
==============================================================================
--- libclc/trunk/generic/lib/geometric/fast_normalize.inc (added)
+++ libclc/trunk/generic/lib/geometric/fast_normalize.inc Fri May 8 19:04:12 2015
@@ -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
More information about the cfe-commits
mailing list