Skip to content

Commit e3cfbfe

Browse files
lslusarczykpbalcer
lslusarczyk
and
pbalcer
authored
[SYCL][E2E] fixed UR FileCheck conditions to match new traces (#15439)
Issue with ugly interleaved Level0 adapter and Level0 Unified Runtime traces, that is oneapi-src/unified-runtime#2002 issue, has been fixed in oneapi-src/unified-runtime#2101. This PR adds necessary changes to e2e tests to make them pass with modified tracing in L0 Adapter. This PR also reverts #15167 which disabled some traces because of the bug which is now fixed, so traces can be restored. --------- Co-authored-by: Piotr Balcer <[email protected]>
1 parent 6a948cd commit e3cfbfe

File tree

65 files changed

+403
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+403
-408
lines changed

‎sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
117117
endfunction()
118118

119119
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
120-
# commit 1f13d2ceb0494d84ce7b32f6b453dbb256fb702a
121-
# Merge: 5276c534 bcf2244d
122-
# Author: aarongreig <[email protected]>
123-
# Date: Wed Oct 2 15:04:33 2024 +0100
124-
# Merge pull request #2056 from Seanst98/sean/usm-normalized-fix
125-
#
126-
# [CUDA][Bindless] Address USM normalized type image creation failure and functionality
127-
set(UNIFIED_RUNTIME_TAG 1f13d2ceb0494d84ce7b32f6b453dbb256fb702a)
120+
# commit 7aba70bc5c6bf82a6e5f7cdd3623eb8f46fcff40
121+
# Merge: 1f13d2ce cf5994a1
122+
# Author: Piotr Balcer <[email protected]>
123+
# Date: Thu Oct 3 10:47:01 2024 +0200
124+
# Merge pull request #2101 from lslusarczyk/fix-interleaved-urtraces
125+
# Fix mixed output of adapter and regular traces
126+
set(UNIFIED_RUNTIME_TAG 7aba70bc5c6bf82a6e5f7cdd3623eb8f46fcff40)
128127

129128
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
130129
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ int main() {
3434
}
3535
}
3636

37-
// CHECK:---> urMemBufferCreate
38-
// CHECK:---> urMemBufferCreate
37+
// CHECK: <--- urMemBufferCreate
38+
// CHECK: <--- urMemBufferCreate
3939
// CHECK-SAME: UR_MEM_FLAG_ALLOC_HOST_POINTER

‎sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main() {
2020
Q.submit([&](handler &Cgh) {
2121
// Now that we have a read-write host allocation, check that the native
2222
// buffer is created with the UR_MEM_FLAG_USE_HOST_POINTER flag.
23-
// CHECK: urMemBufferCreate
23+
// CHECK: <--- urMemBufferCreate
2424
// CHECK-SAME: UR_MEM_FLAG_USE_HOST_POINTER
2525
auto BufAcc = Buf.get_access<access::mode::read>(Cgh);
2626
Cgh.single_task<Foo>([=]() { int A = BufAcc[0]; });

‎sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ int main() {
1616
for (auto &e : sycl::host_accessor{b})
1717
e = idx++ % size;
1818

19-
// CHECK: urMemBufferPartition
19+
// CHECK: <--- urMemBufferPartition
2020
// CHECK: .origin = 256, .size = 64
2121
q.submit([&](sycl::handler &cgh) {
2222
sycl::accessor acc{sub1, cgh};
2323
cgh.parallel_for(size, [=](auto id) { acc[id] += 1; });
2424
});
25-
// CHECK: urMemBufferPartition
25+
// CHECK: <--- urMemBufferPartition
2626
// CHECK: .origin = 256, .size = 128
2727
q.submit([&](sycl::handler &cgh) {
2828
sycl::accessor acc{sub2, cgh};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int main() {
5656
return 0;
5757
}
5858

59-
// CHECK:---> urEnqueueEventsWaitWithBarrier
60-
// CHECK:---> urEnqueueEventsWaitWithBarrier
61-
// CHECK:---> urEnqueueEventsWaitWithBarrier
62-
// CHECK:---> urEnqueueEventsWaitWithBarrier
59+
// CHECK: <--- urEnqueueEventsWaitWithBarrier
60+
// CHECK: <--- urEnqueueEventsWaitWithBarrier
61+
// CHECK: <--- urEnqueueEventsWaitWithBarrier
62+
// CHECK: <--- urEnqueueEventsWaitWithBarrier

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ int main() {
2929
// Buffer destruction triggers execution graph cleanup, check that both
3030
// events (one for launching the kernel and one for memory transfer to host)
3131
// are released.
32-
// CHECK: urEventRelease
33-
// CHECK: urEventRelease
32+
// CHECK: <--- urEventRelease
33+
// CHECK: <--- urEventRelease
3434
assert(Val == Gold);
3535
// CHECK: End of main scope
3636
std::cout << "End of main scope" << std::endl;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ int main() {
129129
}
130130

131131
// CHECK: start testFill_Buffer1D
132-
// CHECK: urEnqueueMemBufferFill
132+
// CHECK: <--- urEnqueueMemBufferFill
133133
// CHECK: start testFill_Buffer1D -- OFFSET
134-
// CHECK: urEnqueueMemBufferFill
134+
// CHECK: <--- urEnqueueMemBufferFill
135135

136136
// CHECK: start testFill_Buffer2D
137-
// CHECK: urEnqueueMemBufferFill
137+
// CHECK: <--- urEnqueueMemBufferFill
138138
// CHECK: start testFill_Buffer2D -- OFFSET
139-
// CHECK: urEnqueueKernelLaunch
139+
// CHECK: <--- urEnqueueKernelLaunch
140140

141141
// CHECK: start testFill_Buffer3D
142-
// CHECK: urEnqueueMemBufferFill
142+
// CHECK: <--- urEnqueueMemBufferFill
143143
// CHECK: start testFill_Buffer3D -- OFFSET
144-
// CHECK: urEnqueueKernelLaunch
144+
// CHECK: <--- urEnqueueKernelLaunch
145145

146146
// CHECK: start testFill_ZeroDim
147-
// CHECK: urEnqueueMemBufferFill
147+
// CHECK: <--- urEnqueueMemBufferFill

‎sycl/test-e2e/Basic/host-task-dependency.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@ int main() {
178178
}
179179

180180
// launch of Gen kernel
181-
// CHECK:---> urKernelCreate
181+
// CHECK: <--- urKernelCreate
182182
// CHECK: NameGen
183-
// CHECK:---> urEnqueueKernelLaunch
183+
// CHECK: <--- urEnqueueKernelLaunch
184184
// prepare for host task
185-
// CHECK:---> urEnqueueMemBuffer{{Map|Read}}
185+
// CHECK: <--- urEnqueueMemBuffer{{Map|Read}}
186186
// launch of Copier kernel
187-
// CHECK:---> urKernelCreate
187+
// CHECK: <--- urKernelCreate
188188
// CHECK: Copier
189-
// CHECK:---> urEnqueueKernelLaunch
189+
// CHECK: <--- urEnqueueKernelLaunch
190190

191191
// CHECK:Third buffer [ 0] = 0
192192
// CHECK:Third buffer [ 1] = 1

‎sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -150,26 +150,26 @@ int main() {
150150

151151
sycl::kernel_bundle<sycl::bundle_state::object> KernelBundleObject1 =
152152
sycl::compile(KernelBundleInput1, KernelBundleInput1.get_devices());
153-
// CHECK:---> urProgramCreate
153+
// CHECK:<--- urProgramCreate
154154
// CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE1:[0-9a-fA-Fx]+]])
155155
// CHECK-SAME: -> UR_RESULT_SUCCESS;
156156
//
157-
// CHECK:---> urProgramCompile
157+
// CHECK:<--- urProgramCompile
158158
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE1]]
159159

160160
sycl::kernel_bundle<sycl::bundle_state::object> KernelBundleObject2 =
161161
sycl::compile(KernelBundleInput2, KernelBundleInput2.get_devices());
162-
// CHECK:---> urProgramCreate
162+
// CHECK:<--- urProgramCreate
163163
// CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE2:[0-9a-fA-Fx]+]])
164164
// CHECK-SAME: -> UR_RESULT_SUCCESS;
165165
//
166-
// CHECK:---> urProgramCompile(
166+
// CHECK:<--- urProgramCompile(
167167
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE2]]
168168

169169
sycl::kernel_bundle<sycl::bundle_state::executable> KernelBundleExecutable =
170170
sycl::link({KernelBundleObject1, KernelBundleObject2},
171171
KernelBundleObject1.get_devices());
172-
// CHECK:---> urProgramLink{{.*}} -> UR_RESULT_SUCCESS;
172+
// CHECK:<--- urProgramLink{{.*}} -> UR_RESULT_SUCCESS;
173173
// UR tracing doesn't allow checking for all input programs so far.
174174

175175
assert(KernelBundleExecutable.has_kernel(Kernel1ID));
@@ -179,14 +179,14 @@ int main() {
179179
KernelBundleExecutable2 =
180180
sycl::build(KernelBundleInput1, KernelBundleInput1.get_devices());
181181

182-
// CHECK:---> urProgramCreate
182+
// CHECK:<--- urProgramCreate
183183
// CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE3:[0-9a-fA-Fx]+]])
184184
// CHECK-SAME: -> UR_RESULT_SUCCESS;
185185
//
186-
// CHECK:---> urProgramBuild(
186+
// CHECK:<--- urProgramBuild(
187187
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE3]]
188188
//
189-
// CHECK:---> urProgramRetain(
189+
// CHECK:<--- urProgramRetain(
190190
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE3]]
191191
// CHECK-SAME:-> UR_RESULT_SUCCESS;
192192

@@ -204,31 +204,31 @@ int main() {
204204
sycl::kernel_bundle KernelBundleExecutable =
205205
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev},
206206
{Kernel3ID});
207-
// CHECK:---> urProgramCreate
207+
// CHECK:<--- urProgramCreate
208208
// CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE4:[0-9a-fA-Fx]+]])
209209
// CHECK-SAME: -> UR_RESULT_SUCCESS;
210210
//
211-
// CHECK:---> urProgramBuild(
211+
// CHECK:<--- urProgramBuild(
212212
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE4]]
213213
//
214-
// CHECK:---> urProgramRetain(
214+
// CHECK:<--- urProgramRetain(
215215
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE4]]
216216
// CHECK-SAME:-> UR_RESULT_SUCCESS;
217217
//
218-
// CHECK:---> urKernelCreate(
218+
// CHECK:<--- urKernelCreate(
219219
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE4]]
220220
// CHECK-SAME: .pKernelName = {{[0-9a-fA-Fx]+}} (_ZTS11Kernel3Name)
221221
// CHECK-SAME: .phKernel = {{[0-9a-fA-Fx]+}} ([[KERNEL_HANDLE:[0-9a-fA-Fx]+]])
222222
// CHECK-SAME: -> UR_RESULT_SUCCESS;
223223
//
224-
// CHECK:---> urKernelRetain(
224+
// CHECK:<--- urKernelRetain(
225225
// CHECK-SAME: .hKernel = [[KERNEL_HANDLE]]
226226
// CHECK-SAME:-> UR_RESULT_SUCCESS;
227227
//
228-
// CHECK:---> urEnqueueKernelLaunch(
228+
// CHECK:<--- urEnqueueKernelLaunch(
229229
// CHECK-SAME: .hKernel = [[KERNEL_HANDLE]]
230230
//
231-
// CHECK:---> urKernelRelease(
231+
// CHECK:<--- urKernelRelease(
232232
// CHECK-SAME: .hKernel = [[KERNEL_HANDLE]]
233233
// CHECK-SAME:-> UR_RESULT_SUCCESS;
234234

‎sycl/test-e2e/Basic/queue/release.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ int main() {
1414
return 0;
1515
}
1616

17-
// CHECK: ---> urEnqueueKernelLaunch(
17+
// CHECK: <--- urEnqueueKernelLaunch(
1818
// FIXME the order of these 2 varies between plugins due to a Level Zero
1919
// specific queue workaround.
20-
// CHECK-DAG: ---> urEventRelease(
21-
// CHECK-DAG: ---> urQueueRelease(
22-
// CHECK: ---> urContextRelease(
23-
// CHECK: ---> urKernelRelease(
24-
// CHECK: ---> urProgramRelease(
25-
// CHECK: ---> urDeviceRelease(
20+
// CHECK-DAG: <--- urEventRelease(
21+
// CHECK-DAG: <--- urQueueRelease(
22+
// CHECK: <--- urContextRelease(
23+
// CHECK: <--- urKernelRelease(
24+
// CHECK: <--- urProgramRelease(
25+
// CHECK: <--- urDeviceRelease(

‎sycl/test-e2e/Basic/stream/release_resources_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ int main() {
1616
{
1717
queue Queue;
1818

19-
// CHECK:---> urMemRelease
19+
// CHECK: <--- urMemRelease
2020
Queue.submit([&](handler &CGH) {
2121
stream Out(1024, 80, CGH);
2222
CGH.parallel_for<class test_cleanup1>(

0 commit comments

Comments
 (0)