Skip to content

Commit ef2a19c

Browse files
vladimirlazvladimirlaz
authored
[SYCL][XPTI] Improve tests formatting (intel#703) (intel#619)
- use @line macro; - print pointers in hexadecimal format.
1 parent 74746a6 commit ef2a19c

File tree

9 files changed

+99
-92
lines changed

9 files changed

+99
-92
lines changed

‎SYCL/XPTI/Inputs/buffer_info_collector.cpp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ XPTI_CALLBACK_API void syclBufferCallback(uint16_t TraceType,
100100
switch (Type) {
101101
case xpti::trace_point_type_t::offload_alloc_construct: {
102102
auto BufConstr = (xpti::offload_buffer_data_t *)UserData;
103-
std::cout << IId << "|Create buffer|" << BufConstr->user_object_handle
104-
<< "|" << Event->reserved.payload->name << "|"
103+
std::cout << IId << "|Create buffer|0x" << std::hex
104+
<< BufConstr->user_object_handle << "|" << std::dec
105105
<< Event->reserved.payload->source_file << ":"
106106
<< Event->reserved.payload->line_no << ":"
107107
<< Event->reserved.payload->column_no << "\n";
@@ -110,28 +110,30 @@ XPTI_CALLBACK_API void syclBufferCallback(uint16_t TraceType,
110110
}
111111
case xpti::trace_point_type_t::offload_alloc_associate: {
112112
auto BufAssoc = (xpti::offload_buffer_association_data_t *)UserData;
113-
std::cout << IId << "|Associate buffer|" << BufAssoc->user_object_handle
114-
<< "|" << BufAssoc->mem_object_handle << std::endl;
113+
std::cout << IId << "|Associate buffer|0x" << std::hex
114+
<< BufAssoc->user_object_handle << "|0x"
115+
<< BufAssoc->mem_object_handle << std::dec << std::endl;
115116
break;
116117
}
117118
case xpti::trace_point_type_t::offload_alloc_release: {
118119
auto BufRelease = (xpti::offload_buffer_association_data_t *)UserData;
119-
std::cout << IId << "|Release buffer|" << BufRelease->user_object_handle
120-
<< "|" << BufRelease->mem_object_handle << std::endl;
120+
std::cout << IId << "|Release buffer|0x" << std::hex
121+
<< BufRelease->user_object_handle << "|0x"
122+
<< BufRelease->mem_object_handle << std::dec << std::endl;
121123
break;
122124
}
123125
case xpti::trace_point_type_t::offload_alloc_destruct: {
124126
auto BufDestr = (xpti::offload_buffer_data_t *)UserData;
125-
std::cout << IId << "|Destruct buffer|" << BufDestr->user_object_handle
126-
<< "\n";
127+
std::cout << IId << "|Destruct buffer|0x" << std::hex
128+
<< BufDestr->user_object_handle << std::dec << std::endl;
127129
break;
128130
}
129131
case xpti::trace_point_type_t::offload_alloc_accessor: {
130132
auto BufAccessor = (xpti::offload_accessor_data_t *)UserData;
131-
std::cout << IId << "|Construct accessor|" << BufAccessor->buffer_handle
132-
<< "|" << BufAccessor->accessor_handle << "|"
133+
std::cout << IId << "|Construct accessor|0x" << std::hex
134+
<< BufAccessor->buffer_handle << "|0x"
135+
<< BufAccessor->accessor_handle << std::dec << "|"
133136
<< BufAccessor->target << "|" << BufAccessor->mode << "|"
134-
<< Event->reserved.payload->name << "|"
135137
<< Event->reserved.payload->source_file << ":"
136138
<< Event->reserved.payload->line_no << ":"
137139
<< Event->reserved.payload->column_no << "\n";

‎SYCL/XPTI/buffer/accessors.cpp

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,47 @@ int main() {
1717
bool MismatchFound = false;
1818
sycl::queue Queue{};
1919

20-
// CHECK:{{[0-9]+}}|Create buffer|[[#BUFFERID:]]|{{.*}}accessors.cpp:21:24|{{.*}}accessors.cpp:21:24
21-
sycl::buffer<int, 1> Buf(4);
20+
// CHECK:{{[0-9]+}}|Create buffer|[[BUFFERID:[0-9,a-f,x]+]]|{{.*}}accessors.cpp:[[# @LINE + 1]]:24
21+
sycl::buffer<int, 1> Buf(3);
2222

2323
sycl::range<1> Range{Buf.size()};
2424

2525
Queue.submit([&](sycl::handler &cgh) {
26-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2015|1024|{{.*}}accessors.cpp:27:15|{{.*}}accessors.cpp:27:15
26+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID1:.+]]|2015|1024|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
2727
auto A1 = Buf.get_access<mode::read, target::constant_buffer>(cgh);
28-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID2:]]|2014|1025|{{.*}}accessors.cpp:29:15|{{.*}}accessors.cpp:29:15
28+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID2:.*]]|2014|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
2929
auto A2 = Buf.get_access<mode::write>(cgh);
30-
// CHECK: {{[0-9]+}}|Construct accessor|0|[[#ACCID3:]]|2016|1026|{{.*}}accessors.cpp:31:61|{{.*}}accessors.cpp:31:61
30+
// CHECK: {{[0-9]+}}|Construct accessor|0x0|[[ACCID3:.*]]|2016|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:61
3131
sycl::accessor<int, 1, mode::read_write, target::local> A3(Range, cgh);
32-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID4:]]|2014|1027|{{.*}}accessors.cpp:33:15|{{.*}}accessors.cpp:33:15
32+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.*]]|2014|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
3333
auto A4 = Buf.get_access<mode::discard_write>(cgh);
34-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID5:]]|2014|1028|{{.*}}accessors.cpp:35:15|{{.*}}accessors.cpp:35:15
34+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.*]]|2014|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
3535
auto A5 = Buf.get_access<mode::discard_read_write, target::device>(cgh);
36-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID6:]]|2014|1029|{{.*}}accessors.cpp:37:15|{{.*}}accessors.cpp:37:15
36+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID6:.*]]|2014|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
3737
auto A6 = Buf.get_access<mode::atomic>(cgh);
38-
cgh.parallel_for<class FillBuffer>(Range, [=](sycl::id<1> WIid) {});
38+
cgh.parallel_for<class FillBuffer>(Range, [=](sycl::id<1> WIid) {
39+
(void)A1;
40+
(void)A2;
41+
(void)A3;
42+
(void)A4;
43+
(void)A5;
44+
(void)A6;
45+
});
3946
});
40-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2018|1024|{{.*}}accessors.cpp:41:15|{{.*}}accessors.cpp:41:15
47+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID7:.*]]|2018|1024|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
4148
{ auto HA = Buf.get_access<mode::read>(); }
42-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2018|1025|{{.*}}accessors.cpp:43:15|{{.*}}accessors.cpp:43:15
49+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID8:.*]]|2018|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
4350
{ auto HA = Buf.get_access<mode::write>(); }
44-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2018|1026|{{.*}}accessors.cpp:45:15|{{.*}}accessors.cpp:45:15
51+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID9:.*]]|2018|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
4552
{ auto HA = Buf.get_access<mode::read_write>(); }
46-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2018|1027|{{.*}}accessors.cpp:47:15|{{.*}}accessors.cpp:47:15
53+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID10:.*]]|2018|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
4754
{ auto HA = Buf.get_access<mode::discard_write>(); }
48-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2018|1028|{{.*}}accessors.cpp:49:15|{{.*}}accessors.cpp:49:15
55+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID11:.*]]|2018|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
4956
{ auto HA = Buf.get_access<mode::discard_read_write>(); }
50-
// CHECK: {{[0-9]+}}|Construct accessor|[[#BUFFERID]]|[[#ACCID1:]]|2018|1029|{{.*}}accessors.cpp:51:15|{{.*}}accessors.cpp:51:15
57+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID12:.*]]|2018|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
5158
{ auto HA = Buf.get_access<mode::atomic>(); }
5259

5360
return 0;
5461
}
55-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#BUFFERID]]
62+
// CHECK:{{[0-9]+}}|Destruct buffer|[[BUFFERID]]
5663
#endif

‎SYCL/XPTI/buffer/host_array.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ int main() {
1818
int Array[4];
1919
{
2020
sycl::range<1> NumOfWorkItems{4};
21-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}host_array.cpp:22:26|{{.*}}host_array.cpp:22:26
21+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:[0-9,a-f,x]+]]|{{.*}}host_array.cpp:[[# @LINE + 1]]:26
2222
sycl::buffer<int, 1> Buffer1(Array, NumOfWorkItems);
2323

24-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
24+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
2525
Queue.submit([&](sycl::handler &cgh) {
2626
// Get write only access to the buffer on a device.
2727
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
@@ -43,6 +43,6 @@ int main() {
4343

4444
return MismatchFound;
4545
}
46-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
47-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
46+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
47+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
4848
#endif

‎SYCL/XPTI/buffer/in_cycle.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ int main() {
5353
// Create a SYCL queue.
5454
sycl::queue Queue{};
5555

56-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}in_cycle.cpp:17:24|{{.*}}in_cycle.cpp:17:24
57-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
58-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
59-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
60-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID2:]]|{{.*}}in_cycle.cpp:17:24|{{.*}}in_cycle.cpp:17:24
61-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID2]]|[[#BEID2:]]
62-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID2]]|[[#BEID2:]]
63-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID2]]
64-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID3:]]|{{.*}}in_cycle.cpp:17:24|{{.*}}in_cycle.cpp:17:24
65-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID3]]|[[#BEID3:]]
66-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID3]]|[[#BEID3:]]
67-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID3]]
56+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:[0-9,a-f,x]*]]|{{.*}}in_cycle.cpp:17:24
57+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
58+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
59+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
60+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID2:[0-9,a-f,x]*]]|{{.*}}in_cycle.cpp:17:24
61+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID2]]|[[BEID2:.*]]
62+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID2]]|[[BEID2]]
63+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID2]]
64+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID3:[0-9,a-f,x]*]]|{{.*}}in_cycle.cpp:17:24
65+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID3]]|[[BEID3:.*]]
66+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID3]]|[[BEID3]]
67+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID3]]
6868
for (int i = 0; i < 3; i++)
6969
MismatchFound &= func(Queue);
7070
return MismatchFound;

‎SYCL/XPTI/buffer/multiple_buffers.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ int main() {
1515
bool MismatchFound = false;
1616
sycl::queue Queue{};
1717

18-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}multiple_buffers.cpp:19:24|{{.*}}multiple_buffers.cpp:19:24
19-
sycl::buffer<int, 1> Buffer1(4);
20-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID2:]]|{{.*}}multiple_buffers.cpp:21:24|{{.*}}multiple_buffers.cpp:21:24
21-
sycl::buffer<int, 1> Buffer2(4);
18+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:[0-9,a-f,x]+]]|{{.*}}multiple_buffers.cpp:[[# @LINE + 1]]:26
19+
sycl::buffer<short, 1> Buffer1(4);
20+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID2:[0-9,a-f,x]+]]|{{.*}}multiple_buffers.cpp:[[# @LINE + 1]]:25
21+
sycl::buffer<char, 3> Buffer2({5, 4, 3});
2222

2323
sycl::range<1> NumOfWorkItems{Buffer1.size()};
2424

25-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
26-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID2]]|[[#BEID2:]]
25+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
26+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID2]]|[[BEID2:.*]]
2727
Queue.submit([&](sycl::handler &cgh) {
2828
// Get write only access to the buffer on a device.
2929
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
3030
auto Accessor2 = Buffer2.get_access<sycl::access::mode::write>(cgh);
3131
// Execute kernel.
3232
cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
33-
Accessor1[WIid] = static_cast<int>(WIid.get(0));
34-
Accessor2[WIid] = static_cast<int>(WIid.get(0));
33+
Accessor1[WIid] = static_cast<short>(WIid.get(0));
34+
Accessor2[WIid][0][0] = static_cast<char>(WIid.get(0));
3535
});
3636
});
3737

@@ -40,18 +40,18 @@ int main() {
4040

4141
// Check the results.
4242
for (size_t I = 0; I < Buffer1.size(); ++I) {
43-
if (HostAccessor1[I] != I || HostAccessor2[I] != I) {
43+
if (HostAccessor1[I] != I || HostAccessor2[I][0][0] != I) {
4444
std::cout << "The result is incorrect for element: " << I
4545
<< " , expected: " << I << " , got: " << HostAccessor1[I]
46-
<< ", " << HostAccessor2[I] << std::endl;
46+
<< ", " << HostAccessor2[I][0][0] << std::endl;
4747
MismatchFound = true;
4848
}
4949
}
5050

5151
return MismatchFound;
5252
}
53-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID2]]|[[#BEID2:]]
54-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID2]]
55-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
56-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
53+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID2]]|[[BEID2]]
54+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID2]]
55+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
56+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
5757
#endif

‎SYCL/XPTI/buffer/multiple_queues.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,31 @@ int main() {
2323
sycl::queue Queue1{Devices[0]};
2424
sycl::queue Queue2{Devices[1]};
2525
sycl::range<1> NumOfWorkItems{4};
26-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}multiple_queues.cpp:27:26|{{.*}}multiple_queues.cpp:27:26
26+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:0x[0-9,a-f,x]+]]|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:26
2727
sycl::buffer<int, 1> Buffer1(Array, NumOfWorkItems);
2828

29-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
3029
Queue1.submit([&](sycl::handler &cgh) {
31-
// Get write only access to the buffer on a device.
30+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:24
3231
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
33-
// Execute kernel.
32+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
3433
cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
3534
Accessor1[WIid] = static_cast<int>(WIid.get(0));
3635
});
3736
});
3837
Queue1.wait();
3938

40-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID2:]]
4139
Queue2.submit([&](sycl::handler &cgh) {
42-
// Get write only access to the buffer on a device.
40+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:24
4341
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
44-
// Execute kernel.
42+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID2:.*]]
4543
cgh.parallel_for<class MulBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
4644
Accessor1[WIid] *= static_cast<int>(WIid.get(0));
4745
});
4846
});
4947
}
50-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
51-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID2:]]
52-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
48+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
49+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID2]]
50+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
5351

5452
// Check the results.
5553
for (size_t I = 0; I < 4; ++I) {

‎SYCL/XPTI/buffer/recursion.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ int main() {
5353
// Create a SYCL queue.
5454
sycl::queue Queue{};
5555

56-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}recursion.cpp:17:24|{{.*}}recursion.cpp:17:24
57-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
58-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID2:]]|{{.*}}recursion.cpp:17:24|{{.*}}recursion.cpp:17:24
59-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID2]]|[[#BEID2:]]
60-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID3:]]|{{.*}}recursion.cpp:17:24|{{.*}}recursion.cpp:17:24
61-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID3]]|[[#BEID3:]]
62-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID3]]|[[#BEID3:]]
63-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID3]]
64-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID2]]|[[#BEID2:]]
65-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID2]]
66-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
67-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
56+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:0x[0-9,a-f,x]+]]|{{.*}}recursion.cpp:17:24
57+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
58+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID2:0x[0-9,a-f,x]+]]|{{.*}}recursion.cpp:17:24
59+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID2]]|[[BEID2:.*]]
60+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID3:0x[0-9,a-f,x]+]]|{{.*}}recursion.cpp:17:24
61+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID3]]|[[BEID3:.*]]
62+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID3]]|[[BEID3]]
63+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID3]]
64+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID2]]|[[BEID2]]
65+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID2]]
66+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
67+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
6868
MismatchFound &= func(Queue, 2);
6969

7070
return MismatchFound;

‎SYCL/XPTI/buffer/sub_buffer.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ int main() {
1717

1818
{
1919
sycl::range<1> NumOfWorkItems{128};
20-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}sub_buffer.cpp:21:26|{{.*}}sub_buffer.cpp:21:26
20+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:0x[0-9,a-f,x]+]]|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:26
2121
sycl::buffer<int, 1> Buffer1(NumOfWorkItems);
22-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}sub_buffer.cpp:23:26|{{.*}}sub_buffer.cpp:23:26
22+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:0x[0-9,a-f,x]+]]|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:26
2323
sycl::buffer<int, 1> SubBuffer{Buffer1, sycl::range<1>{32},
2424
sycl::range<1>{32}};
2525

2626
Queue.submit([&](sycl::handler &cgh) {
27-
// CHECK: {{[0-9]+}}|Construct accessor|[[#USERID1]]|[[#ACCID1:]]|2014|1025|{{.*}}sub_buffer.cpp:28:24|{{.*}}sub_buffer.cpp:28:24
27+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:24
2828
auto Accessor1 = SubBuffer.get_access<sycl::access::mode::write>(cgh);
29-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
30-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID2:]]
29+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
30+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID2:.*]]
3131
cgh.parallel_for<class FillBuffer>(
3232
sycl::range<1>{32}, [=](sycl::id<1> WIid) {
3333
Accessor1[WIid] = static_cast<int>(WIid.get(0));
3434
});
3535
});
36-
// CHECK: {{[0-9]+}}|Construct accessor|[[#USERID1]]|[[#ACCID2:]]|2018|1024|{{.*}}sub_buffer.cpp:37:22|{{.*}}sub_buffer.cpp:37:22
36+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2018|1024|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:22
3737
auto Accessor1 = Buffer1.get_access<sycl::access::mode::read>();
3838
for (size_t I = 32; I < 64; ++I) {
3939
if (Accessor1[I] != I - 32) {
@@ -47,7 +47,7 @@ int main() {
4747

4848
return MismatchFound;
4949
}
50-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
51-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID2:]]
52-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
50+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
51+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID2]]
52+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
5353
#endif

‎SYCL/XPTI/buffer/use_host_ptr.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ int main() {
1818
int Array[4];
1919
{
2020
sycl::range<1> NumOfWorkItems{4};
21-
// CHECK:{{[0-9]+}}|Create buffer|[[#USERID1:]]|{{.*}}use_host_ptr.cpp:22:26|{{.*}}use_host_ptr.cpp:22:26
21+
// CHECK:{{[0-9]+}}|Create buffer|[[USERID1:0x[0-9,a-f,x]+]]|{{.*}}use_host_ptr.cpp:[[# @LINE + 1]]:26
2222
sycl::buffer<int, 1> Buffer1(Array, NumOfWorkItems,
2323
{sycl::property::buffer::use_host_ptr()});
2424

25-
// CHECK:{{[0-9]+}}|Associate buffer|[[#USERID1]]|[[#BEID1:]]
25+
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
2626
Queue.submit([&](sycl::handler &cgh) {
2727
// Get write only access to the buffer on a device.
2828
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
@@ -44,6 +44,6 @@ int main() {
4444

4545
return MismatchFound;
4646
}
47-
// CHECK:{{[0-9]+}}|Release buffer|[[#USERID1]]|[[#BEID1:]]
48-
// CHECK:{{[0-9]+}}|Destruct buffer|[[#USERID1]]
47+
// CHECK:{{[0-9]+}}|Release buffer|[[USERID1]]|[[BEID1]]
48+
// CHECK:{{[0-9]+}}|Destruct buffer|[[USERID1]]
4949
#endif

0 commit comments

Comments
 (0)