build fixes

CMakeLists.txt

@@ -384,11 +384,12 @@ if (OS_LINUX AND NOT ENABLE_JEMALLOC)
 endif ()
 
 if (USE_OPENCL)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBITONIC_SORT_PREFERRED")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_OPENCL=1")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBITONIC_SORT_PREFERRED")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_OPENCL=1")
 
     if (OS_DARWIN)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework OpenCL")
+        set(OPENCL_LINKER_FLAGS "-framework OpenCL")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OPENCL_LINKER_FLAGS}")
     endif ()
 endif ()
 

programs/server/Server.cpp

@@ -61,7 +61,7 @@
 #include <Common/ThreadFuzzer.h>
 #include "MySQLHandlerFactory.h"
 
-#ifdef BITONIC_SORT_PREFERRED
+#ifdef USE_OPENCL
 #include "Common/BitonicSort.h"
 #endif
 
@@ -225,7 +225,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
     registerDictionaries();
     registerDisks();
 
-    #if defined (BITONIC_SORT_PREFERRED)
+#if defined (USE_OPENCL)
         BitonicSort::getInstance().configure();
 #endif
 

src/Common/tests/CMakeLists.txt

@@ -35,8 +35,10 @@ target_link_libraries (compact_array PRIVATE clickhouse_common_io)
 add_executable (radix_sort radix_sort.cpp)
 target_link_libraries (radix_sort PRIVATE clickhouse_common_io)
 
+if (USE_OPENCL)
     add_executable (bitonic_sort bitonic_sort.cpp)
-target_link_libraries (bitonic_sort PRIVATE clickhouse_common_io "-framework OpenCL")
+    target_link_libraries (bitonic_sort PRIVATE clickhouse_common_io ${OPENCL_LINKER_FLAGS})
+endif ()
 
 add_executable (arena_with_free_lists arena_with_free_lists.cpp)
 target_link_libraries (arena_with_free_lists PRIVATE dbms)

src/Interpreters/sortBlock.cpp

@@ -140,8 +140,9 @@ void sortBlock(Block & block, const SortDescription & description, UInt64 limit)
             /// will be passed to `getPermutation` method with value 42.
             if (description[0].special_sort == SpecialSort::OPENCL_BITONIC)
             {
+#ifdef USE_OPENCL
                 nan_direction_hint = 42;
-#ifndef BITONIC_SORT_PREFERRED
+#else
                 throw DB::Exception("Bitonic sort specified as preferred, but OpenCL not available", DB::ErrorCodes::OPENCL_ERROR);
 #endif
             }

tests/queries/0_stateless/01280_opencl_bitonic_order_by.reference

@@ -0,0 +1,336 @@
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0

tests/queries/0_stateless/01280_opencl_bitonic_order_by.sql

@@ -0,0 +1,10 @@
+-- TODO: set special_sort = 'opencl_bitonic';
+
+select toUInt8(number * 2) as x from numbers(42) order by x desc;
+select toInt8(number * 2) as x from numbers(42) order by x desc;
+select toUInt16(number * 2) as x from numbers(42) order by x desc;
+select toInt16(number * 2) as x from numbers(42) order by x desc;
+select toUInt32(number * 2) as x from numbers(42) order by x desc;
+select toInt32(number * 2) as x from numbers(42) order by x desc;
+select toUInt64(number * 2) as x from numbers(42) order by x desc;
+select toInt64(number * 2) as x from numbers(42) order by x desc;

tests/queries/0_stateless/01280_opencl_bitonic_order_by_uint8.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01280_opencl_bitonic_order_by_uint8.sql

@@ -1 +0,0 @@
-select toUInt8(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01281_opencl_bitonic_order_by_int8.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01281_opencl_bitonic_order_by_int8.sql

@@ -1 +0,0 @@
-select toInt8(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01282_opencl_bitonic_order_by_uint16.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01282_opencl_bitonic_order_by_uint16.sql

@@ -1 +0,0 @@
-select toUInt16(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01283_opencl_bitonic_order_by_int16.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01283_opencl_bitonic_order_by_int16.sql

@@ -1 +0,0 @@
-select toInt16(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01284_opencl_bitonic_order_by_uint32.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01284_opencl_bitonic_order_by_uint32.sql

@@ -1 +0,0 @@
-select toUInt32(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01285_opencl_bitonic_order_by_int32.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01285_opencl_bitonic_order_by_int32.sql

@@ -1 +0,0 @@
-select toInt32(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01286_opencl_bitonic_order_by_uint64.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01286_opencl_bitonic_order_by_uint64.sql

@@ -1 +0,0 @@
-select toUInt64(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'

tests/queries/0_stateless/01287_opencl_bitonic_order_by_int64.reference

@@ -1,42 +0,0 @@
-82
-80
-78
-76
-74
-72
-70
-68
-66
-64
-62
-60
-58
-56
-54
-52
-50
-48
-46
-44
-42
-40
-38
-36
-34
-32
-30
-28
-26
-24
-22
-20
-18
-16
-14
-12
-10
-8
-6
-4
-2
-0

tests/queries/0_stateless/01287_opencl_bitonic_order_by_int64.sql

@@ -1 +0,0 @@
-select toInt64(number * 2) as x from numbers(42) order by x desc settings special_sort = 'opencl_bitonic'