Skip to content

Commit 69f4e16

Browse files
authored
[SYCL] reenable ann_arg/ptr e2e test on windows (#11731)
reenable ann_arg/ptr e2e test on windows, tagged with unsupported: gpu issue #11224
1 parent 9bcf257 commit 69f4e16

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

sycl/test-e2e/Annotated_arg_ptr/annotated_arg.cpp

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
// REQUIRES: accelerator
2-
//
31
// RUN: %{build} -o %t.out
42
// RUN: %{run} %t.out
53
//
6-
// https://github.com/intel/llvm/issues/11224
7-
// UNSUPPORTED: windows
84

95
#include "common.hpp"
106

@@ -100,29 +96,27 @@ int main() {
10096
d_ptr[i] = i;
10197

10298
// testing arithmetic overloaded operators
103-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> e = MyStruct(5);
104-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> f = MyStruct(6);
105-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> g = MyStruct(3);
106-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> h = MyStruct(2);
99+
annotated_arg<MyStruct<int>> e = MyStruct(5);
100+
annotated_arg<MyStruct<int>> f = MyStruct(6);
101+
annotated_arg<MyStruct<int>> g = MyStruct(3);
102+
annotated_arg<MyStruct<int>> h = MyStruct(2);
107103

108104
auto *r1 = malloc_shared<MyStruct<int>>(5, Q);
109105
auto *r2 = malloc_shared<MyStruct<int>>(5, Q);
110106
auto *r3 = malloc_shared<MyStruct<int>>(5, Q);
111107

112108
// testing logical overloaded operators
113-
annotated_arg<MyStruct<bool>, decltype(properties{conduit})> m =
114-
MyStruct(true);
115-
annotated_arg<MyStruct<bool>, decltype(properties{conduit})> n =
116-
MyStruct(false);
109+
annotated_arg<MyStruct<bool>> m = MyStruct(true);
110+
annotated_arg<MyStruct<bool>> n = MyStruct(false);
117111

118112
auto *r4 = malloc_shared<MyStruct<bool>>(3, Q);
119113
auto *r5 = malloc_shared<MyStruct<bool>>(3, Q);
120114
auto *r6 = malloc_shared<MyStruct<bool>>(3, Q);
121115

122116
// testing bit shift overloaded operators
123-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> x = MyStruct(1);
124-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> y = MyStruct(2);
125-
annotated_arg<MyStruct<int>, decltype(properties{conduit})> z = MyStruct(4);
117+
annotated_arg<MyStruct<int>> x = MyStruct(1);
118+
annotated_arg<MyStruct<int>> y = MyStruct(2);
119+
annotated_arg<MyStruct<int>> z = MyStruct(4);
126120

127121
auto *r7 = malloc_shared<MyStruct<int>>(2, Q);
128122
auto *r8 = malloc_shared<MyStruct<int>>(2, Q);
@@ -262,7 +256,7 @@ int main() {
262256
assert(is_device_copyable<device_copyable_annotated_arg>::value &&
263257
"annotated_arg<device_copyable_class> is not device copyable.");
264258
using device_copyable_annotated_arg_with_properties =
265-
annotated_arg<device_copyable_class, decltype(properties{conduit})>;
259+
annotated_arg<device_copyable_class>;
266260
assert(is_device_copyable<
267261
device_copyable_annotated_arg_with_properties>::value &&
268262
"annotated_arg<device_copyable_class, properties> is not device "

sycl/test-e2e/Annotated_arg_ptr/annotated_ptr.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
33
//
4-
// https://github.com/intel/llvm/issues/11224
5-
// UNSUPPORTED: windows
64

75
#include "common.hpp"
86

0 commit comments

Comments
 (0)