Skip to content

Commit 8d34c7e

Browse files
aelovikov-inteljsji
aelovikov-intel
authored and
jsji
committed
[SYCL][E2E] Update CHECKs to reflect changes to __builtin_COLUMN
Upstream clang has updated/improved its `__builtin_COLUMN` implementation, update tests that rely on it. This needs to be cherry-picked into sycl-web eventually.
1 parent ce16c78 commit 8d34c7e

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎sycl/test-e2e/Basic/report_code_loc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ int main() {
2121
try {
2222
q.memcpy(mdlImag, 0, sizeof(XFLOAT));
2323
} catch (...) {
24-
// CHECK: Exception caught at File: {{.*}}report_code_loc.cpp | Function: main | Line: 22 | Column: 5
24+
// CHECK: Exception caught at File: {{.*}}report_code_loc.cpp | Function: main | Line: 22 | Column: 7
2525
}
2626
}

‎sycl/test-e2e/XPTI/buffer/accessors.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ int main() {
2424
sycl::nd_range<1> NDRange(Buf.size(), Buf.size());
2525

2626
Queue.submit([&](sycl::handler &cgh) {
27-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID1:.+]]|2015|1024|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
27+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID1:.+]]|2015|1024|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
2828
auto A1 = Buf.get_access<mode::read, target::constant_buffer>(cgh);
29-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID2:.*]]|2014|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
29+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID2:.*]]|2014|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
3030
auto A2 = Buf.get_access<mode::write>(cgh);
3131
// CHECK: {{[0-9]+}}|Construct accessor|0x0|[[ACCID3:.*]]|2016|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:34
3232
sycl::local_accessor<int, 1> A3(Range, cgh);
33-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.*]]|2014|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
33+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.*]]|2014|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
3434
auto A4 = Buf.get_access<mode::discard_write>(cgh);
35-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.*]]|2014|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
35+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.*]]|2014|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
3636
auto A5 = Buf.get_access<mode::discard_read_write, target::device>(cgh);
37-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID6:.*]]|2014|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
37+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID6:.*]]|2014|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
3838
auto A6 = Buf.get_access<mode::atomic>(cgh);
3939
cgh.parallel_for<class FillBuffer>(NDRange, [=](sycl::nd_item<1>) {
4040
(void)A1;
@@ -51,11 +51,11 @@ int main() {
5151
{ sycl::host_accessor HA(Buf, sycl::write_only); }
5252
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID9:.*]]|2018|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:25
5353
{ sycl::host_accessor HA(Buf, sycl::read_write); }
54-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID10:.*]]|2018|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
54+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID10:.*]]|2018|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
5555
{ auto HA = Buf.get_access<mode::discard_write>(); }
56-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID11:.*]]|2018|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
56+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID11:.*]]|2018|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
5757
{ auto HA = Buf.get_access<mode::discard_read_write>(); }
58-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID12:.*]]|2018|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:15
58+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID12:.*]]|2018|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
5959
{ auto HA = Buf.get_access<mode::atomic>(); }
6060

6161
return 0;

‎sycl/test-e2e/XPTI/buffer/multiple_queues.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int main() {
3131
sycl::buffer<int, 1> Buffer1(Array, NumOfWorkItems);
3232

3333
Queue1.submit([&](sycl::handler &cgh) {
34-
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:24
34+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:32
3535
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
3636
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
3737
cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
@@ -41,7 +41,7 @@ int main() {
4141
Queue1.wait();
4242

4343
Queue2.submit([&](sycl::handler &cgh) {
44-
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:24
44+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:32
4545
auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
4646
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID2:.*]]
4747
cgh.parallel_for<class MulBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {

‎sycl/test-e2e/XPTI/buffer/sub_buffer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int main() {
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:[[# @LINE + 1]]:24
27+
// CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:34
2828
auto Accessor1 = SubBuffer.get_access<sycl::access::mode::write>(cgh);
2929
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
3030
// CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID2:.*]]

‎sycl/test-e2e/XPTI/image/accessors.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ int main() {
2424
sycl::unsampled_image<1> UImg(sycl::image_format::r32b32g32a32_uint, 3);
2525

2626
Q.submit([&](sycl::handler &CGH) {
27-
// CHECK:{{[0-9]+}}|Construct unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1|1024|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
27+
// CHECK:{{[0-9]+}}|Construct unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1|1024|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
2828
auto A1 = UImg.get_access<sycl::uint4, mode::read,
2929
sycl::image_target::host_task>(CGH);
3030
});
3131

3232
Q.submit([&](sycl::handler &CGH) {
33-
// CHECK:{{[0-9]+}}|Construct unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1|1025|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
33+
// CHECK:{{[0-9]+}}|Construct unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1|1025|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
3434
auto A1 = UImg.get_access<sycl::uint4, mode::write,
3535
sycl::image_target::host_task>(CGH);
3636
});
3737

38-
// CHECK:{{[0-9]+}}|Construct host unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1024|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
38+
// CHECK:{{[0-9]+}}|Construct host unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1024|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
3939
{ auto HA = UImg.get_host_access<sycl::int4, mode::read>(); }
40-
// CHECK:{{[0-9]+}}|Construct host unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1025|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
40+
// CHECK:{{[0-9]+}}|Construct host unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1025|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
4141
{ auto HA = UImg.get_host_access<sycl::float4, mode::write>(); }
42-
// CHECK:{{[0-9]+}}|Construct host unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1026|{{.*}}vec{{.*}}|8|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
42+
// CHECK:{{[0-9]+}}|Construct host unsampled image accessor|[[UIMGID]]|0x{{[0-9,a-f]+}}|1026|{{.*}}vec{{.*}}|8|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
4343
{ auto HA = UImg.get_host_access<sycl::half4, mode::read_write>(); }
4444
}
4545
// CHECK:{{[0-9]+}}|Destruct image|[[UIMGID]]
@@ -58,14 +58,14 @@ int main() {
5858
SampledImgElemCount);
5959

6060
Q.submit([&](sycl::handler &CGH) {
61-
// CHECK:{{[0-9]+}}|Construct sampled image accessor|[[SIMGID]]|0x{{[0-9,a-f]+}}|1|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 2]]:11
61+
// CHECK:{{[0-9]+}}|Construct sampled image accessor|[[SIMGID]]|0x{{[0-9,a-f]+}}|1|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 2]]:16
6262
auto A1 =
6363
SImg.get_access<sycl::uint4, sycl::image_target::host_task>(CGH);
6464
});
6565

66-
// CHECK:{{[0-9]+}}|Construct host sampled image accessor|[[SIMGID]]|0x{{[0-9,a-f]+}}|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
66+
// CHECK:{{[0-9]+}}|Construct host sampled image accessor|[[SIMGID]]|0x{{[0-9,a-f]+}}|{{.*}}vec{{.*}}|16|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
6767
{ auto HA = SImg.get_host_access<sycl::int4>(); }
68-
// CHECK:{{[0-9]+}}|Construct host sampled image accessor|[[SIMGID]]|0x{{[0-9,a-f]+}}|{{.*}}vec{{.*}}|8|{{.*}}accessors.cpp:[[# @LINE + 1]]:17
68+
// CHECK:{{[0-9]+}}|Construct host sampled image accessor|[[SIMGID]]|0x{{[0-9,a-f]+}}|{{.*}}vec{{.*}}|8|{{.*}}accessors.cpp:[[# @LINE + 1]]:22
6969
{ auto HA = SImg.get_host_access<sycl::half4>(); }
7070
}
7171
// CHECK:{{[0-9]+}}|Destruct image|[[SIMGID]]

‎sycl/test-e2e/XPTI/kernel/basic.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main() {
5757
auto PtrShared = sycl::malloc_shared<int>(8, Queue);
5858
Queue
5959
.submit([&](sycl::handler &cgh) {
60-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID1:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:19
60+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID1:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:23
6161
auto A1 = Buf.get_access<mode::read_write>(cgh);
6262
// CHECK: {{[0-9]+}}|Construct accessor|0x0|[[ACCID2:.*]]|2016|1026|{{.*}}.cpp:[[# @LINE + 1]]:38
6363
sycl::local_accessor<int, 1> A2(Range, cgh);
@@ -78,31 +78,31 @@ int main() {
7878
})
7979
.wait();
8080

81-
// CHECK: Wait begin|{{.*}}.cpp:[[# @LINE + 2]]:3
82-
// CHECK: Wait end|{{.*}}.cpp:[[# @LINE + 1]]:3
81+
// CHECK: Wait begin|{{.*}}.cpp:[[# @LINE + 2]]:9
82+
// CHECK: Wait end|{{.*}}.cpp:[[# @LINE + 1]]:9
8383
Queue.wait();
8484

8585
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID3:.*]]|2018|1024|{{.*}}.cpp:[[# @LINE + 1]]:25
8686
{ sycl::host_accessor HA(Buf, sycl::read_only); }
8787

8888
Queue.submit([&](sycl::handler &cgh) {
89-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:16
89+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:20
9090
auto Acc = Buf.get_access<mode::read_write>(cgh);
9191
Functor1 F(Val, Acc);
92-
// CHECK-OPT: Node create|{{.*}}Functor1|{{.*}}.cpp:[[# @LINE - 4 ]]:3|{1, 1, 1}, {0, 0, 0}, {0, 0, 0}, 3
93-
// CHECK-NOOPT: Node create|{{.*}}Functor1|{{.*}}.cpp:[[# @LINE - 5 ]]:3|{1, 1, 1}, {0, 0, 0}, {0, 0, 0}, 5
92+
// CHECK-OPT: Node create|{{.*}}Functor1|{{.*}}.cpp:[[# @LINE - 4 ]]:9|{1, 1, 1}, {0, 0, 0}, {0, 0, 0}, 3
93+
// CHECK-NOOPT: Node create|{{.*}}Functor1|{{.*}}.cpp:[[# @LINE - 5 ]]:9|{1, 1, 1}, {0, 0, 0}, {0, 0, 0}, 5
9494
cgh.single_task(F);
9595
// CHECK-OPT: arg0 : {1, {{[0-9,a-f,x]+}}, 2, 0}
9696
// CHECK-OPT: arg1 : {0, [[ACCID4]], 4062, 1}
9797
// CHECK-OPT: arg2 : {1, [[ACCID4]], 8, 2}
9898
});
9999

100100
Queue.submit([&](sycl::handler &cgh) {
101-
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:16
101+
// CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.+]]|2014|1026|{{.*}}.cpp:[[# @LINE + 1]]:20
102102
auto Acc = Buf.get_access<mode::read_write>(cgh);
103103
Functor2 F(Val, Acc);
104-
// CHECK-OPT: Node create|{{.*}}Functor2|{{.*}}.cpp:[[# @LINE - 4 ]]:3|{5, 1, 1}, {0, 0, 0}, {0, 0, 0}, 3
105-
// CHECK-NOOPT: Node create|{{.*}}Functor2|{{.*}}.cpp:[[# @LINE - 5 ]]:3|{5, 1, 1}, {0, 0, 0}, {0, 0, 0}, 5
104+
// CHECK-OPT: Node create|{{.*}}Functor2|{{.*}}.cpp:[[# @LINE - 4 ]]:9|{5, 1, 1}, {0, 0, 0}, {0, 0, 0}, 3
105+
// CHECK-NOOPT: Node create|{{.*}}Functor2|{{.*}}.cpp:[[# @LINE - 5 ]]:9|{5, 1, 1}, {0, 0, 0}, {0, 0, 0}, 5
106106
cgh.parallel_for(Range, F);
107107
// CHECK-OPT: arg0 : {1, {{[0-9,a-f,x]+}}, 2, 0}
108108
// CHECK-OPT: arg1 : {0, [[ACCID5]], 4062, 1}

‎sycl/test-e2e/XPTI/kernel/content.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ int main() {
3232
auto sumR = reduction(sumBuf, cgh, plus<>());
3333
// Reduction kernel is used, strategy and hence number of kernel arguments
3434
// is hw-dependent.
35-
// CHECK-OPT:Node create|{{.*}}reduction{{.*}}test1{{.*}}|{{.*}}.cpp:[[# @LINE - 6 ]]:3|{{{.*}}, 1, 1}, {{{.*}}, 1, 1}, {0, 0, 0}, {{1.*}}
36-
// CHECK-NOOPT:Node create|{{.*}}reduction{{.*}}test1{{.*}}|{{.*}}.cpp:[[# @LINE - 7 ]]:3|{{{.*}}, 1, 1}, {{{.*}}, 1, 1}, {0, 0, 0}, {{2.*}}
35+
// CHECK-OPT:Node create|{{.*}}reduction{{.*}}test1{{.*}}|{{.*}}.cpp:[[# @LINE - 6 ]]:11|{{{.*}}, 1, 1}, {{{.*}}, 1, 1}, {0, 0, 0}, {{1.*}}
36+
// CHECK-NOOPT:Node create|{{.*}}reduction{{.*}}test1{{.*}}|{{.*}}.cpp:[[# @LINE - 7 ]]:11|{{{.*}}, 1, 1}, {{{.*}}, 1, 1}, {0, 0, 0}, {{2.*}}
3737
cgh.parallel_for<class test1>(
3838
range<1>{1024}, sumR,
3939
[=](id<1> idx, auto &sum) { sum += inputValues[idx]; });
@@ -48,8 +48,8 @@ int main() {
4848
myQueue.submit([&](handler &cgh) {
4949
auto in = in_buf.template get_access<access::mode::read>(cgh);
5050
auto out = out_buf.template get_access<access::mode::read_write>(cgh);
51-
// CHECK-OPT:Node create|{{.*}}test2{{.*}}|{{.*}}.cpp:[[# @LINE - 3 ]]:5|{128, 4, 2}, {32, 2, 1}, {16, 1, 0}, 2
52-
// CHECK-NOOPT:Node create|{{.*}}test2{{.*}}|{{.*}}.cpp:[[# @LINE - 4 ]]:5|{128, 4, 2}, {32, 2, 1}, {16, 1, 0}, 8
51+
// CHECK-OPT:Node create|{{.*}}test2{{.*}}|{{.*}}.cpp:[[# @LINE - 3 ]]:13|{128, 4, 2}, {32, 2, 1}, {16, 1, 0}, 2
52+
// CHECK-NOOPT:Node create|{{.*}}test2{{.*}}|{{.*}}.cpp:[[# @LINE - 4 ]]:13|{128, 4, 2}, {32, 2, 1}, {16, 1, 0}, 8
5353
cgh.parallel_for<class test2>(
5454
nd_range<3>({128, 4, 2}, {32, 2, 1}, {16, 1, 0}), [=](nd_item<3> it) {
5555
auto sg = it.get_sub_group();

0 commit comments

Comments
 (0)