Re-enable L0 tests

Author: kurapov-peter

omniscidb/QueryEngine/Compiler/genx.cpp

@@ -214,7 +214,9 @@ void agg_sum_float_skip_val_shared(GENERIC_ADDR_SPACE int32_t* agg,
                                    const float skip_val) {
   if (hdk_float_as_int32_t(val) != hdk_float_as_int32_t(skip_val)) {
     int32_t old = atomic_xchg_int_32(agg, hdk_float_as_int32_t(0.f));
-    agg_sum_float_shared(agg, old == hdk_float_as_int32_t(skip_val) ? val : (val + old));
+    agg_sum_float_shared(
+        agg,
+        old == hdk_float_as_int32_t(skip_val) ? val : (val + hdk_int32_t_as_float(old)));
   }
 }
 
@@ -281,6 +283,24 @@ const GENERIC_ADDR_SPACE int64_t* init_shared_mem(
   return shared_groups_buffer;
 }
 
+int64_t agg_count_double_skip_val_shared(GENERIC_ADDR_SPACE int64_t* agg,
+                                         const double val,
+                                         const double skip_val) {
+  if (hdk_double_as_int64_t(val) != hdk_double_as_int64_t(skip_val)) {
+    return agg_count_double_shared(agg, val);
+  }
+  return *agg;
+}
+
+uint32_t agg_count_float_skip_val_shared(GENERIC_ADDR_SPACE uint32_t* agg,
+                                         const float val,
+                                         const float skip_val) {
+  if (hdk_float_as_int32_t(val) != hdk_float_as_int32_t(skip_val)) {
+    return agg_count_float_shared(agg, val);
+  }
+  return *agg;
+}
+
 void agg_count_distinct_bitmap_gpu(GENERIC_ADDR_SPACE int64_t* agg,
                                    const int64_t val,
                                    const int64_t min_val,

omniscidb/QueryEngine/Compiler/genx.ll

@@ -87,18 +87,6 @@ define i64 @agg_count_skip_val_shared(i64 addrspace(4)* %agg, i64 noundef %val,
     ret i64 0
 }
 
-define i64 @agg_count_double_skip_val_shared(i64 addrspace(4)* %agg, double noundef %val, double noundef %skip_val) {
-    %no_skip = fcmp one double %val, %skip_val
-    br i1 %no_skip, label %.noskip, label %.skip
-.noskip:
-    %val_cst = bitcast double %val to i64
-    %res = call i64 @agg_count_shared(i64 addrspace(4)* %agg, i64 %val_cst)
-    ret i64 %res
-.skip:
-    %orig = load i64, i64 addrspace(4)* %agg
-    ret i64 %orig
-}
-
 ;; TODO: may cause a CPU fallback on codegen
 define i64 @agg_sum_shared(i64 addrspace(4)* %agg, i64 noundef %val) {
     %old = atomicrmw add i64 addrspace(4)* %agg, i64 %val monotonic

omniscidb/Tests/IntelGPUEnablingTest.cpp

@@ -530,17 +530,15 @@ TEST_F(GroupByAggTest, GroupByCount) {
 }
 
 TEST_F(GroupByAggTest, GroupBySum) {
-  GTEST_SKIP();
   c("SELECT SUM(x) FROM small_tests GROUP BY z;", g_dt);
   c("SELECT SUM(x + y) FROM small_tests GROUP BY z;", g_dt);
 }
 
 TEST_F(GroupByAggTest, AggHaving) {
-  GTEST_SKIP();
   c("SELECT COUNT(*) FROM test WHERE x < y GROUP BY x HAVING 0=1;", g_dt);
   c("SELECT COUNT(*) FROM test WHERE x < y GROUP BY x HAVING 1=1;", g_dt);
   c("SELECT x, COUNT(*) AS n FROM test GROUP BY x, ufd ORDER BY x, n;", g_dt);
-  c("SELECT MIN(x), MAX(x) FROM test WHERE real_str LIKE '%nope%';", g_dt);
+  // c("SELECT MIN(x), MAX(x) FROM test WHERE real_str LIKE '%nope%';", g_dt);
   c("SELECT COUNT(*) FROM test WHERE (x > 7 AND y / (x - 7) < 44);", g_dt);
   c("SELECT x, AVG(ff) AS val FROM test GROUP BY x ORDER BY val;", g_dt);
   c("SELECT x, MAX(fn) as val FROM test WHERE fn IS NOT NULL GROUP BY x ORDER BY val;",
@@ -566,11 +564,10 @@ TEST_F(GroupByTest, WithFilter) {
 }
 
 TEST_F(GroupByTest, WithOrdering) {
-  GTEST_SKIP();
   c("SELECT x, dd, COUNT(*) FROM test GROUP BY x, dd ORDER BY x, dd;", g_dt);
-  c("SELECT 'literal_string' AS key0 FROM test GROUP BY key0;", g_dt);
-  c("SELECT str, MIN(y) FROM test WHERE y IS NOT NULL GROUP BY str ORDER BY str DESC;",
-    g_dt);
+  // c("SELECT 'literal_string' AS key0 FROM test GROUP BY key0;", g_dt);
+  // c("SELECT str, MIN(y) FROM test WHERE y IS NOT NULL GROUP BY str ORDER BY str DESC;",
+  // g_dt);
   c("SELECT x, AVG(u), COUNT(*) AS n FROM test GROUP BY x ORDER BY n DESC;", g_dt);
   c("SELECT f, ss FROM test GROUP BY f, ss ORDER BY f DESC;", g_dt);
   c("SELECT fx, COUNT(*) n FROM test GROUP BY fx ORDER BY n DESC, fx IS NULL DESC;",
@@ -684,7 +681,6 @@ TEST_F(BasicTest, Time) {
 }
 
 TEST_F(BasicTest, Time2) {
-  GTEST_SKIP();
   ASSERT_EQ(
       static_cast<int64_t>(g_num_rows + g_num_rows / 2),
       v<int64_t>(run_simple_agg(
@@ -920,7 +916,7 @@ TEST_F(BasicTest, SumAndAverage) {
   c("SELECT AVG(w) FROM test;", g_dt);
   c("SELECT AVG(z) FROM test;", g_dt);
   c("SELECT SUM(CAST(x AS FLOAT)) FROM test GROUP BY y;", g_dt);
-  // c("SELECT AVG(CAST(x AS FLOAT)) FROM test GROUP BY y;", g_dt);
+  c("SELECT AVG(CAST(x AS FLOAT)) FROM test GROUP BY y;", g_dt);
   c("SELECT count(*) FROM test GROUP BY x;", g_dt);
   c("SELECT count(ff) FROM test GROUP BY x;", g_dt);
   c("SELECT x, AVG(ff) AS val FROM test GROUP BY x;", g_dt);