[PATCH] Fix bitselect for float/double types

We need to reinterpret float/double types as uint/ulong in order to
perform the bitwise operations.

This has been tested with piglit, OpenCV, and the ocl conformance tests.

We need to reinterpret float/double types as uint/ulong in order to
perform the bitwise operations.

This has been tested with piglit, OpenCV, and the ocl conformance tests.
---
generic/include/clc/relational/bitselect.h | 29 ++++++++++++++++-
generic/include/clc/relational/bitselect.inc | 23 ++++++++++++++
generic/lib/SOURCES | 1 +
generic/lib/relational/bitselect.cl | 47
++++++++++++++++++++++++++++
generic/lib/relational/bitselect.inc | 27 ++++++++++++++++
5 files changed, 126 insertions(+), 1 deletion(-)
create mode 100644 generic/include/clc/relational/bitselect.inc
create mode 100644 generic/lib/relational/bitselect.cl
create mode 100644 generic/lib/relational/bitselect.inc

diff --git a/generic/include/clc/relational/bitselect.h
b/generic/include/clc/relational/bitselect.h
index e91cbfd..0c7b2f7 100644
--- a/generic/include/clc/relational/bitselect.h
+++ b/generic/include/clc/relational/bitselect.h
@@ -1 +1,28 @@
-#define bitselect(x, y, z) ((x) ^ ((z) & ((y) ^ (x))))
+/*
+ * 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.
+ */
+
+#define __CLC_BODY <clc/relational/bitselect.inc>
+#include <clc/math/gentype.inc>
+#define __CLC_BODY <clc/relational/bitselect.inc>
+#include <clc/integer/gentype.inc>
+
+#undef __CLC_BODY
diff --git a/generic/include/clc/relational/bitselect.inc
b/generic/include/clc/relational/bitselect.inc
new file mode 100644
index 0000000..364d649
--- /dev/null
+++ b/generic/include/clc/relational/bitselect.inc
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE bitselect(__CLC_GENTYPE x,
__CLC_GENTYPE y, __CLC_GENTYPE z);
diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
index a7b2fa2..ac3d870 100644
--- a/generic/lib/SOURCES
+++ b/generic/lib/SOURCES
@@ -80,6 +80,7 @@ math/sincos_helpers.cl
math/tan.cl
relational/all.cl
relational/any.cl
+relational/bitselect.cl
relational/isequal.cl
relational/isfinite.cl
relational/isgreater.cl
diff --git a/generic/lib/relational/bitselect.cl b/generic/lib/relational/
bitselect.cl
new file mode 100644
index 0000000..29f07d1
--- /dev/null
+++ b/generic/lib/relational/bitselect.cl
@@ -0,0 +1,47 @@
+/*
+ * 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"
+
+#define __CLC_BODY <bitselect.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
+
+_CLC_OVERLOAD _CLC_DEF float bitselect(float x, float y, float z) {
+ return as_float(bitselect(as_uint(x), as_uint(y), as_uint(z)));
+}
+
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, bitselect, float,
float, float);
+

This looks ok as it is, but I do want to point out that by doing the
float/double bitselects this way, we are explicitly splitting the
float/double vectors into scalars, running bitselect(int_type), and then
rebuilding a float vector from the results of the individual scalar
operations.

Previously, this was handled directly as vectors (even though
incorrectly). For SI, this probably doesn't matter. For EG/NI, it might.
In either case, we're forcing LLVM to do more work when running
optimization passes.

If you don't want to change this, that's fine. It was broken before, and
will be correct now. That's good enough for me. We can always speed it up
later as needed.

--Aaron

We need to reinterpret float/double types as uint/ulong in order to
perform the bitwise operations.

This has been tested with piglit, OpenCV, and the ocl conformance tests.

v2:
  - Use vector operations rather than splitting vectors into scalar
    components.

We need to reinterpret float/double types as uint/ulong in order to
perform the bitwise operations.

This has been tested with piglit, OpenCV, and the ocl conformance tests.

v2:
  - Use vector operations rather than splitting vectors into scalar
    components.
---
generic/include/clc/relational/bitselect.h | 29 ++++++++++++++-
generic/include/clc/relational/bitselect.inc | 23 ++++++++++++
generic/lib/SOURCES | 1 +
generic/lib/relational/bitselect.cl | 53
++++++++++++++++++++++++++++
generic/lib/relational/bitselect.inc | 27 ++++++++++++++
5 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 generic/include/clc/relational/bitselect.inc
create mode 100644 generic/lib/relational/bitselect.cl
create mode 100644 generic/lib/relational/bitselect.inc

diff --git a/generic/include/clc/relational/bitselect.h
b/generic/include/clc/relational/bitselect.h
index e91cbfd..0c7b2f7 100644
--- a/generic/include/clc/relational/bitselect.h
+++ b/generic/include/clc/relational/bitselect.h
@@ -1 +1,28 @@
-#define bitselect(x, y, z) ((x) ^ ((z) & ((y) ^ (x))))
+/*
+ * 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.
+ */
+
+#define __CLC_BODY <clc/relational/bitselect.inc>
+#include <clc/math/gentype.inc>
+#define __CLC_BODY <clc/relational/bitselect.inc>
+#include <clc/integer/gentype.inc>
+
+#undef __CLC_BODY
diff --git a/generic/include/clc/relational/bitselect.inc
b/generic/include/clc/relational/bitselect.inc
new file mode 100644
index 0000000..364d649
--- /dev/null
+++ b/generic/include/clc/relational/bitselect.inc
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE bitselect(__CLC_GENTYPE x,
__CLC_GENTYPE y, __CLC_GENTYPE z);
diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
index a7b2fa2..ac3d870 100644
--- a/generic/lib/SOURCES
+++ b/generic/lib/SOURCES
@@ -80,6 +80,7 @@ math/sincos_helpers.cl
math/tan.cl
relational/all.cl
relational/any.cl
+relational/bitselect.cl
relational/isequal.cl
relational/isfinite.cl
relational/isgreater.cl
diff --git a/generic/lib/relational/bitselect.cl b/generic/lib/relational/
bitselect.cl
new file mode 100644
index 0000000..af4e70c
--- /dev/null
+++ b/generic/lib/relational/bitselect.cl
@@ -0,0 +1,53 @@
+/*
+ * 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"
+
+#define __CLC_BODY <bitselect.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
+
+#define FLOAT_BITSELECT(f_type, i_type, width) \
+ _CLC_OVERLOAD _CLC_DEF f_type##width bitselect(f_type##width x,
f_type##width y, f_type##width z) { \
+ return as_##f_type##width(bitselect(as_##i_type##width(x),
as_##i_type##width(y), as_##i_type##width(z))); \
+}
+
+FLOAT_BITSELECT(float, uint, )
+FLOAT_BITSELECT(float, uint, 2)
+FLOAT_BITSELECT(float, uint, 3)
+FLOAT_BITSELECT(float, uint, 4)
+FLOAT_BITSELECT(float, uint, 8)
+FLOAT_BITSELECT(float, uint, 16)
+
+#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+
+FLOAT_BITSELECT(double, ulong, )
+FLOAT_BITSELECT(double, ulong, 2)
+FLOAT_BITSELECT(double, ulong, 3)
+FLOAT_BITSELECT(double, ulong, 4)
+FLOAT_BITSELECT(double, ulong, 8)
+FLOAT_BITSELECT(double, ulong, 16)
+
+#endif
diff --git a/generic/lib/relational/bitselect.inc
b/generic/lib/relational/bitselect.inc
new file mode 100644
index 0000000..8157331
--- /dev/null
+++ b/generic/lib/relational/bitselect.inc
@@ -0,0 +1,27 @@
+/*
+ * 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_GENTYPE bitselect(__CLC_GENTYPE x,
__CLC_GENTYPE y, __CLC_GENTYPE z) {
+ return ((x) ^ ((z) & ((y) ^ (x))));
+}
+
+

Remove the new blank line at EOF, and you can have:
Reviewed-by: Aaron Watry <awatry@gmail.com>