Skip to content

Commit d671551

Browse files
HPS-1HPS-1
committed
[SYCL] Add missing template keyword
Signed-off-by: Hu, Peisen <[email protected]>
1 parent 8436827 commit d671551

File tree

5 files changed

+31
-19
lines changed

5 files changed

+31
-19
lines changed

‎sycl/test-e2e/VirtualFunctions/2/1/1/missing-overrides.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,16 @@ void applyOp(int *DataPtr, Base *ObjPtr) {
6969
template <typename T1, typename T2> struct KernelFunctor {
7070
T1 mStorageAcc;
7171
T2 mDataAcc;
72-
KernelFunctor(T1 StorageAcc, T2 DataAcc)
73-
: mStorageAcc(StorageAcc), mDataAcc(DataAcc) {}
72+
unsigned mTestCase;
73+
KernelFunctor(T1 &StorageAcc, T2 &DataAcc, unsigned TestCase)
74+
: mStorageAcc(StorageAcc), mDataAcc(DataAcc), mTestCase(TestCase) {}
7475

7576
void operator()() const {
76-
auto *Ptr = mStorageAcc[0].construct</* ret type = */ Base>(TestCase);
77-
applyOp(mDataAcc.get_multi_ptr<sycl::access::decorated::no>().get(), Ptr);
77+
auto *Ptr =
78+
mStorageAcc[0].template construct</* ret type = */ Base>(mTestCase);
79+
applyOp(
80+
mDataAcc.template get_multi_ptr<sycl::access::decorated::no>().get(),
81+
Ptr);
7882
}
7983
auto get(oneapi::properties_tag) const {
8084
return oneapi::properties{oneapi::assume_indirect_calls};
@@ -103,7 +107,7 @@ int main() try {
103107
q.submit([&](sycl::handler &CGH) {
104108
sycl::accessor StorageAcc(DeviceStorage, CGH, sycl::write_only);
105109
sycl::accessor DataAcc(DataStorage, CGH, sycl::write_only);
106-
CGH.single_task(KernelFunctor(StorageAcc, DataAcc));
110+
CGH.single_task(KernelFunctor(StorageAcc, DataAcc, TestCase));
107111
});
108112

109113
Base *Ptr = HostStorage.construct</* ret type = */ Base>(TestCase);

‎sycl/test-e2e/VirtualFunctions/2/1/1/more-complex-hierarchy.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ void applyOp(int *Data, AbstractOp *Obj) { Obj->applyOp(Data); }
4848
template <typename T1, typename T2> struct KernelFunctor {
4949
T1 mStorageAcc;
5050
T2 mDataAcc;
51-
KernelFunctor(T1 &StorageAcc, T2 &DataAcc)
52-
: mStorageAcc(StorageAcc), mDataAcc(DataAcc) {}
51+
unsigned mTestCase;
52+
KernelFunctor(T1 &StorageAcc, T2 &DataAcc, unsigned TestCase)
53+
: mStorageAcc(StorageAcc), mDataAcc(DataAcc), mTestCase(TestCase) {}
5354

5455
void operator()() const {
55-
auto *Ptr = mStorageAcc[0].construct</* ret type = */ AbstractOp>(TestCase);
56-
applyOp(mDataAcc.get_multi_ptr<sycl::access::decorated::no>().get(), Ptr);
56+
auto *Ptr = mStorageAcc[0].template construct</* ret type = */ AbstractOp>(
57+
mTestCase);
58+
applyOp(
59+
mDataAcc.template get_multi_ptr<sycl::access::decorated::no>().get(),
60+
Ptr);
5761
}
5862
auto get(oneapi::properties_tag) const {
5963
return oneapi::properties{oneapi::assume_indirect_calls};
@@ -82,7 +86,7 @@ int main() try {
8286
q.submit([&](sycl::handler &CGH) {
8387
sycl::accessor StorageAcc(DeviceStorage, CGH, sycl::write_only);
8488
sycl::accessor DataAcc(DataStorage, CGH, sycl::write_only);
85-
CGH.single_task(KernelFunctor(StorageAcc, DataAcc));
89+
CGH.single_task(KernelFunctor(StorageAcc, DataAcc, TestCase));
8690
});
8791

8892
auto *Ptr = HostStorage.construct</* ret type = */ AbstractOp>(TestCase);

‎sycl/test-e2e/VirtualFunctions/2/1/1/simple-hierarchy.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@ class IncrementBy8 : public BaseIncrement {
3333
template <typename T1, typename T2> struct KernelFunctor {
3434
T1 mStorageAcc;
3535
T2 mDataAcc;
36-
KernelFunctor(T1 StorageAcc, T2 DataAcc)
37-
: mStorageAcc(StorageAcc), mDataAcc(DataAcc) {}
36+
unsigned mTestCase;
37+
KernelFunctor(T1 &StorageAcc, T2 &DataAcc, unsigned TestCase)
38+
: mStorageAcc(StorageAcc), mDataAcc(DataAcc), mTestCase(TestCase) {}
3839
void operator()() const {
3940
auto *Ptr =
40-
mStorageAcc[0].construct</* ret type = */ BaseIncrement>(TestCase);
41-
Ptr->increment(mDataAcc.get_multi_ptr<sycl::access::decorated::no>().get());
41+
mStorageAcc[0].template construct</* ret type = */ BaseIncrement>(
42+
mTestCase);
43+
Ptr->increment(
44+
mDataAcc.template get_multi_ptr<sycl::access::decorated::no>().get());
4245
}
4346
auto get(oneapi::properties_tag) const {
4447
return oneapi::properties{oneapi::assume_indirect_calls};
@@ -67,7 +70,7 @@ int main() try {
6770
q.submit([&](sycl::handler &CGH) {
6871
sycl::accessor StorageAcc(DeviceStorage, CGH, sycl::write_only);
6972
sycl::accessor DataAcc(DataStorage, CGH, sycl::write_only);
70-
CGH.single_task(KernelFunctor(StorageAcc, DataAcc));
73+
CGH.single_task(KernelFunctor(StorageAcc, DataAcc, TestCase));
7174
});
7275

7376
auto *Ptr = HostStorage.construct</* ret type = */ BaseIncrement>(TestCase);

‎sycl/test-e2e/VirtualFunctions/2/2/single-construct-single-use.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ class IncrementBy16 : public BaseIncrement {
6060
template <typename T1, typename T2> struct KernelFunctor {
6161
T1 mStorageAcc;
6262
T2 mDataAcc;
63-
KernelFunctor(T1 StorageAcc, T2 DataAcc)
63+
KernelFunctor(T1 &StorageAcc, T2 &DataAcc)
6464
: mStorageAcc(StorageAcc), mDataAcc(DataAcc) {}
6565
void operator()() const {
66-
auto *Ptr = mStorageAcc[0].getAs<BaseIncrement>();
67-
Ptr->increment(mDataAcc.get_multi_ptr<sycl::access::decorated::no>().get());
66+
auto *Ptr = mStorageAcc[0].template getAs<BaseIncrement>();
67+
Ptr->increment(
68+
mDataAcc.template get_multi_ptr<sycl::access::decorated::no>().get());
6869
}
6970
auto get(oneapi::properties_tag) const {
7071
return oneapi::properties{

‎sycl/test-e2e/VirtualFunctions/misc/math.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ template <typename T1, typename T2> struct KernelFunctor {
4747
: mDataAcc(DataAcc), mDeviceStorage(DeviceStorage) {}
4848

4949
void operator()() const {
50-
auto *Ptr = mDeviceStorage->getAs<BaseOp>();
50+
auto *Ptr = mDeviceStorage->template getAs<BaseOp>();
5151
mDataAcc[0] = Ptr->apply(mDataAcc[0]);
5252
}
5353
auto get(oneapi::properties_tag) const {

0 commit comments

Comments
 (0)