Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 8726dbb

Browse files
Fix flaky behaviour of enqueue-arg-order-image.cpp
Since queue::wait() changes introduced host tasks to enqueue-arg-order-image.cpp, the order of calls may vary from run to run. Replace CHECK with CHECK-DAG to allow any ordering of the PI calls that are made by a host task.
1 parent 37dea36 commit 8726dbb

File tree

1 file changed

+36
-30
lines changed

1 file changed

+36
-30
lines changed

SYCL/Plugin/enqueue-arg-order-image.cpp

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ void testcopyH2DImage() {
190190
writeAcc.write(int(Item[0]), Data);
191191
});
192192
});
193+
otherQueue.wait();
193194
std::cout << "about to destruct 1D" << std::endl;
194195
} // ~image 1D
195196

@@ -224,6 +225,7 @@ void testcopyH2DImage() {
224225
writeAcc.write(sycl::int2{Item[0], Item[1]}, Data);
225226
});
226227
});
228+
otherQueue.wait();
227229
std::cout << "about to destruct 2D" << std::endl;
228230
} // ~image 2D
229231

@@ -260,6 +262,7 @@ void testcopyH2DImage() {
260262
writeAcc.write(sycl::int4{Item[0], Item[1], Item[2], 0}, Data);
261263
});
262264
});
265+
otherQueue.wait();
263266
std::cout << "about to destruct 3D" << std::endl;
264267
} // ~image 3D
265268

@@ -319,15 +322,16 @@ int main() {
319322
//CHECK: image_desc w/h/d : 16 / 1 / 1 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4340
320323
//CHECK: ---> piEnqueueMemImageRead(
321324
//CHECK: pi_image_region width/height/depth : 16/1/1
322-
//CHECK: ---> piMemImageCreate(
323-
//CHECK: image_desc w/h/d : 16 / 1 / 1 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4340
324-
//CHECK: ---> piEnqueueMemImageRead(
325-
//CHECK: pi_image_region width/height/depth : 16/1/1
325+
// The order of the following calls may vary since some of them are made by a host task (in a separate thread).
326+
//CHECK-DAG: ---> piMemImageCreate(
327+
//CHECK-DAG: image_desc w/h/d : 16 / 1 / 1 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4340
328+
//CHECK-DAG: ---> piEnqueueMemImageRead(
329+
//CHECK-DAG: pi_image_region width/height/depth : 16/1/1
330+
//CHECK-DAG: ---> piEnqueueMemImageWrite(
331+
//CHECK-DAG: pi_image_region width/height/depth : 16/1/1
332+
//CHECK-DAG: ---> piEnqueueMemImageWrite(
333+
//CHECK-DAG: pi_image_region width/height/depth : 16/1/1
326334
//CHECK: about to destruct 1D
327-
//CHECK: ---> piEnqueueMemImageWrite(
328-
//CHECK: pi_image_region width/height/depth : 16/1/1
329-
//CHECK: ---> piEnqueueMemImageWrite(
330-
//CHECK: pi_image_region width/height/depth : 16/1/1
331335
//CHECK: ---> piEnqueueMemImageRead(
332336
//CHECK: pi_image_region width/height/depth : 16/1/1
333337
//CHECK: -- 2D
@@ -339,17 +343,18 @@ int main() {
339343
//CHECK: image_desc w/h/d : 16 / 5 / 1 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4337
340344
//CHECK: ---> piEnqueueMemImageRead(
341345
//CHECK: pi_image_region width/height/depth : 16/5/1
342-
//CHECK: ---> piMemImageCreate(
343-
//CHECK: image_desc w/h/d : 16 / 5 / 1 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4337
344-
//CHECK: ---> piEnqueueMemImageRead(
345-
//CHECK: pi_image_region width/height/depth : 16/5/1
346+
// The order of the following calls may vary since some of them are made by a host task (in a separate thread).
347+
//CHECK-DAG: ---> piMemImageCreate(
348+
//CHECK-DAG: image_desc w/h/d : 16 / 5 / 1 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4337
349+
//CHECK-DAG: ---> piEnqueueMemImageRead(
350+
//CHECK-DAG: pi_image_region width/height/depth : 16/5/1
351+
//CHECK-DAG: ---> piEnqueueMemImageWrite(
352+
//CHECK-DAG: pi_image_region width/height/depth : 16/5/1
353+
//CHECK-DAG: <unknown> : 256
354+
//CHECK-DAG: ---> piEnqueueMemImageWrite(
355+
//CHECK-DAG: pi_image_region width/height/depth : 16/5/1
356+
//CHECK-DAG: <unknown> : 256
346357
//CHECK: about to destruct 2D
347-
//CHECK: ---> piEnqueueMemImageWrite(
348-
//CHECK: pi_image_region width/height/depth : 16/5/1
349-
// CHECK-NEXT: <unknown> : 256
350-
//CHECK: ---> piEnqueueMemImageWrite(
351-
//CHECK: pi_image_region width/height/depth : 16/5/1
352-
// CHECK-NEXT: <unknown> : 256
353358
//CHECK: ---> piEnqueueMemImageRead(
354359
//CHECK: pi_image_region width/height/depth : 16/5/1
355360
//CHECK: -- 3D
@@ -361,19 +366,20 @@ int main() {
361366
//CHECK: image_desc w/h/d : 16 / 5 / 3 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4338
362367
//CHECK: ---> piEnqueueMemImageRead(
363368
//CHECK: pi_image_region width/height/depth : 16/5/3
364-
//CHECK: ---> piMemImageCreate(
365-
//CHECK: image_desc w/h/d : 16 / 5 / 3 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4338
366-
//CHECK: ---> piEnqueueMemImageRead(
367-
//CHECK: pi_image_region width/height/depth : 16/5/3
369+
// The order of the following calls may vary since some of them are made by a host task (in a separate thread).
370+
//CHECK-DAG: ---> piMemImageCreate(
371+
//CHECK-DAG: image_desc w/h/d : 16 / 5 / 3 -- arrSz/row/slice : 0 / 0 / 0 -- num_mip_lvls/num_smpls/image_type : 0 / 0 / 4338
372+
//CHECK-DAG: ---> piEnqueueMemImageRead(
373+
//CHECK-DAG: pi_image_region width/height/depth : 16/5/3
374+
//CHECK-DAG: ---> piEnqueueMemImageWrite(
375+
//CHECK-DAG: pi_image_region width/height/depth : 16/5/3
376+
//CHECK-DAG: <unknown> : 256
377+
//CHECK-DAG: <unknown> : 1280
378+
//CHECK-DAG: ---> piEnqueueMemImageWrite(
379+
//CHECK-DAG: pi_image_region width/height/depth : 16/5/3
380+
//CHECK-DAG: <unknown> : 256
381+
//CHECK-DAG: <unknown> : 1280
368382
//CHECK: about to destruct 3D
369-
//CHECK: ---> piEnqueueMemImageWrite(
370-
//CHECK: pi_image_region width/height/depth : 16/5/3
371-
// CHECK-NEXT: <unknown> : 256
372-
// CHECK-NEXT: <unknown> : 1280
373-
//CHECK: ---> piEnqueueMemImageWrite(
374-
//CHECK: pi_image_region width/height/depth : 16/5/3
375-
// CHECK-NEXT: <unknown> : 256
376-
// CHECK-NEXT: <unknown> : 1280
377383
//CHECK: ---> piEnqueueMemImageRead(
378384
//CHECK: pi_image_region width/height/depth : 16/5/3
379385
// CHECK-NEXT: <unknown> : 256

0 commit comments

Comments
 (0)