[SYCL] Remove logical_or and logical_and from group algorithm tests

sycl/test-e2e/GroupAlgorithm/exclusive_scan_sycl2020.cpp

@@ -1,9 +1,6 @@
 // RUN: %{build} -Wno-error=deprecated-declarations -fsycl-device-code-split=per_kernel -I . -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: preview-mode
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18390
-
 #include "../helpers.hpp"
 #include "support.h"
 #include <algorithm>
@@ -173,14 +170,9 @@ int main() {
   test<class KernelNameBitXorI>(input, sycl::bit_xor<int>(), 0);
   test<class KernelNameBitAndI>(input_small, sycl::bit_and<int>(), ~0);
 
-  test<class LogicalOrInt>(input, sycl::logical_or<int>(), 0);
-  test<class LogicalAndInt>(input, sycl::logical_and<int>(), 1);
-
   std::array<bool, N> bool_input = {};
   test<class LogicalOrBool>(bool_input, sycl::logical_or<bool>(), false);
-  test<class LogicalOrVoid>(bool_input, sycl::logical_or<>(), false);
   test<class LogicalAndBool>(bool_input, sycl::logical_and<bool>(), true);
-  test<class LogicalAndVoid>(bool_input, sycl::logical_and<>(), true);
 
   std::array<int2, N> int2_input = {};
   std::iota(int2_input.begin(), int2_input.end(), 0);

sycl/test-e2e/GroupAlgorithm/inclusive_scan_sycl2020.cpp

@@ -1,9 +1,6 @@
 // RUN: %{build} -Wno-error=deprecated-declarations -fsycl-device-code-split=per_kernel -I . -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: preview-mode
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18390
-
 #include "../helpers.hpp"
 #include "support.h"
 #include <algorithm>
@@ -169,21 +166,10 @@ int main() {
   test<class KernelNameMultipliesI>(input_small, sycl::multiplies<int>(), 1);
   test<class KernelNameBitOrI>(input, sycl::bit_or<int>(), 0);
   test<class KernelNameBitXorI>(input, sycl::bit_xor<int>(), 0);
-  test<class KernelNameBitAndI>(input_small, sycl::bit_and<int>(), ~0);
-
-  test<class LogicalOrInt>(input, sycl::logical_or<int>(), 0);
-  test<class LogicalAndInt>(input, sycl::logical_and<int>(), 1);
 
   std::array<bool, N> bool_input = {};
   test<class LogicalOrBool>(bool_input, sycl::logical_or<bool>(), false);
-  test<class LogicalOrVoid>(bool_input, sycl::logical_or<>(), false);
-  test<class LogicalAndBool>(bool_input, sycl::logical_and<bool>(), true);
-  test<class LogicalAndVoid>(bool_input, sycl::logical_and<>(), true);
-
-  test<class LogicalOrBool>(bool_input, sycl::logical_or<bool>(), false);
-  test<class LogicalOrVoid>(bool_input, sycl::logical_or<>(), false);
   test<class LogicalAndBool>(bool_input, sycl::logical_and<bool>(), true);
-  test<class LogicalAndVoid>(bool_input, sycl::logical_and<>(), true);
 
   std::array<int2, N> int2_input = {};
   std::iota(int2_input.begin(), int2_input.end(), 0);

sycl/test-e2e/GroupAlgorithm/reduce_sycl2020.cpp

@@ -1,9 +1,6 @@
 // RUN: %{build} -fsycl-device-code-split=per_kernel -I . -o %t.out
 // RUN: %{run} %t.out
 
-// XFAIL: preview-mode
-// XFAIL-TRACKER: https://github.com/intel/llvm/issues/18390
-
 #include "support.h"
 
 #include <sycl/sub_group.hpp>
@@ -100,14 +97,9 @@ int main() {
   test<class KernelNameBitXorI>(input, sycl::bit_xor<int>(), 0);
   test<class KernelNameBitAndI>(input, sycl::bit_and<int>(), ~0);
 
-  test<class LogicalOrInt>(input, sycl::logical_or<int>(), 0);
-  test<class LogicalAndInt>(input, sycl::logical_and<int>(), 1);
-
   std::array<bool, N> bool_input = {};
   test<class LogicalOrBool>(bool_input, sycl::logical_or<bool>(), false);
-  test<class LogicalOrVoid>(bool_input, sycl::logical_or<>(), false);
   test<class LogicalAndBool>(bool_input, sycl::logical_and<bool>(), true);
-  test<class LogicalAndVoid>(bool_input, sycl::logical_and<>(), true);
 
   std::array<int2, N> int2_input = {};
   std::iota(int2_input.begin(), int2_input.end(), 0);

sycl/test/group_algorithms/logical_or_and_group_algorithms.cpp

@@ -0,0 +1,77 @@
+// RUN: %clangxx -fsycl -Xclang -verify=expected -Xclang -verify-ignore-unexpected=note -fpreview-breaking-changes -fsyntax-only -fsycl-device-only -ferror-limit=0 %s
+
+#include <sycl/group_algorithm.hpp>
+
+using namespace sycl;
+
+constexpr size_t N = 8;
+range<2> global{16, 32};
+range<2> local{4, 8};
+id<2> groupId{1, 2};
+group<2> g = detail::Builder::createGroup(global, local, groupId);
+int *rawIn = nullptr;
+int *rawOut = nullptr;
+
+void ExclusiveScanOverGroup() {
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  exclusive_scan_over_group(g, 0, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  exclusive_scan_over_group(g, 0, 0, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  exclusive_scan_over_group(g, 0, sycl::logical_or<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  exclusive_scan_over_group(g, 0, 0, sycl::logical_or<int>{});
+}
+
+void JointExclusiveScan() {
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_exclusive_scan(g, rawIn, rawIn + N, rawOut, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_exclusive_scan(g, rawIn, rawIn + N, rawOut, sycl::logical_or<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_exclusive_scan(g, rawIn, rawIn + N, rawOut, 0,
+                       sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_exclusive_scan(g, rawIn, rawIn + N, rawOut, 0, sycl::logical_or<int>{});
+}
+
+void InclusiveScanOverGroup() {
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  inclusive_scan_over_group(g, 0, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  inclusive_scan_over_group(g, 0, sycl::logical_and<int>{}, 0);
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  inclusive_scan_over_group(g, 0, sycl::logical_or<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  inclusive_scan_over_group(g, 0, sycl::logical_or<int>{}, 0);
+}
+
+void JointInclusiveScan() {
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_inclusive_scan(g, rawIn, rawIn + N, rawOut, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_inclusive_scan(g, rawIn, rawIn + N, rawOut, sycl::logical_or<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_inclusive_scan(g, rawIn, rawIn + N, rawOut, sycl::logical_and<int>{},
+                       0);
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match scan accumulation type}}
+  joint_inclusive_scan(g, rawIn, rawIn + N, rawOut, sycl::logical_or<int>{}, 0);
+}
+
+void ReduceOverGroup() {
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match reduction accumulation type}}
+  reduce_over_group(g, 0, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match reduction accumulation type}}
+  reduce_over_group(g, 0, 0, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match reduction accumulation type}}
+  reduce_over_group(g, 0, sycl::logical_or<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match reduction accumulation type}}
+  reduce_over_group(g, 0, 0, sycl::logical_or<int>{});
+}
+
+void JointReduce() {
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match reduction accumulation type}}
+  joint_reduce(g, rawIn, rawIn + N, 0, sycl::logical_and<int>{});
+  // expected-error@sycl/group_algorithm.hpp:* {{Result type of binary_op must match reduction accumulation type}}
+  joint_reduce(g, rawIn, rawIn + N, 0, sycl::logical_or<int>{});
+}