Don't run sort on gpu in L0 case

Author: kurapov-peter

omniscidb/QueryEngine/MemoryLayoutBuilder.cpp

@@ -1106,8 +1106,9 @@ std::unique_ptr<QueryMemoryDescriptor> MemoryLayoutBuilder::build(
     Executor* executor,
     const ExecutorDeviceType device_type) {
   bool sort_on_gpu_hint =
-      device_type == ExecutorDeviceType::GPU && allow_multifrag &&
-      !ra_exe_unit_.sort_info.order_entries.empty() &&
+      (device_type == ExecutorDeviceType::GPU && executor->getDataMgr()->getGpuMgr() &&
+       executor->getDataMgr()->getGpuMgr()->getPlatform() != GpuMgrPlatform::L0) &&
+      allow_multifrag && !ra_exe_unit_.sort_info.order_entries.empty() &&
       gpu_can_handle_order_entries(
           ra_exe_unit_, query_infos, ra_exe_unit_.sort_info.order_entries, executor);
   // must_use_baseline_sort is true iff we'd sort on GPU with the old algorithm

omniscidb/Tests/IntelGPUEnablingTest.cpp

@@ -231,11 +231,33 @@ struct ExecuteTestBase {
     }
   }
 
+  static void createGpuSortTestTable() {
+    createTable("gpu_sort_test",
+                {{"x", ctx().int64()},
+                 {"y", ctx().int32()},
+                 {"z", ctx().int16()},
+                 {"t", ctx().int8()}},
+                {2});
+    run_sqlite_query("DROP TABLE IF EXISTS gpu_sort_test;");
+    run_sqlite_query(
+        "CREATE TABLE gpu_sort_test (x bigint, y int, z smallint, t tinyint);");
+    TestHelpers::ValuesGenerator gen("gpu_sort_test");
+    for (size_t i = 0; i < 4; ++i) {
+      insertCsvValues("gpu_sort_test", "2,2,2,2");
+      run_sqlite_query(gen(2, 2, 2, 2));
+    }
+    for (size_t i = 0; i < 6; ++i) {
+      insertCsvValues("gpu_sort_test", "16000,16000,16000,127");
+      run_sqlite_query(gen(16000, 16000, 16000, 127));
+    }
+  }
+
   static void createAndPopulateTestTables() {
     createTestInnerTable();
     createTestTable();
     createSmallTestsTable();
     createTestInnerLoopJoinTable();
+    createGpuSortTestTable();
   }
 };
 
@@ -851,6 +873,7 @@ TEST_F(BasicTest, Sort) {
   c("SELECT COUNT(*) as val from test GROUP BY x ORDER BY val DESC;", g_dt);
   c("SELECT x, COUNT(*) as val from test GROUP BY x ORDER BY val DESC;", g_dt);
   c("SELECT COUNT(*) as val from test GROUP BY x ORDER BY val ASC LIMIT 2;", g_dt);
+  c("SELECT x, COUNT(*) AS val FROM gpu_sort_test GROUP BY x ORDER BY val DESC;", g_dt);
 }
 
 class FallbackTest : public ExecuteTestBase, public ::testing::Test {