@@ -41,10 +41,10 @@ struct urEnqueueEventsWaitWithBarrierTest
41
41
42
42
void TearDown () override {
43
43
if (src_buffer) {
44
- EXPECT_SUCCESS (urMemRelease (src_buffer));
44
+ ASSERT_SUCCESS (urMemRelease (src_buffer));
45
45
}
46
46
if (dst_buffer) {
47
- EXPECT_SUCCESS (urMemRelease (dst_buffer));
47
+ ASSERT_SUCCESS (urMemRelease (dst_buffer));
48
48
}
49
49
urMultiQueueTestWithParam::TearDown ();
50
50
}
@@ -110,32 +110,32 @@ TEST_P(urEnqueueEventsWaitWithBarrierTest, Success) {
110
110
ur_event_handle_t waitEvent = nullptr ;
111
111
ASSERT_SUCCESS (urEnqueueMemBufferCopy (queue1, src_buffer, dst_buffer, 0 , 0 ,
112
112
size, 0 , nullptr , &event1));
113
- EXPECT_SUCCESS (EnqueueBarrier (queue2, 1 , &event1, &waitEvent));
114
- EXPECT_SUCCESS (urQueueFlush (queue2));
115
- EXPECT_SUCCESS (urQueueFlush (queue1));
116
- EXPECT_SUCCESS (urEventWait (1 , &waitEvent));
113
+ ASSERT_SUCCESS (EnqueueBarrier (queue2, 1 , &event1, &waitEvent));
114
+ ASSERT_SUCCESS (urQueueFlush (queue2));
115
+ ASSERT_SUCCESS (urQueueFlush (queue1));
116
+ ASSERT_SUCCESS (urEventWait (1 , &waitEvent));
117
117
118
118
std::vector<uint32_t > output (count, 1 );
119
- EXPECT_SUCCESS (urEnqueueMemBufferRead (queue1, dst_buffer, true , 0 , size,
119
+ ASSERT_SUCCESS (urEnqueueMemBufferRead (queue1, dst_buffer, true , 0 , size,
120
120
output.data (), 0 , nullptr , nullptr ));
121
121
EXPECT_EQ (input, output);
122
- EXPECT_SUCCESS (urEventRelease (waitEvent));
123
- EXPECT_SUCCESS (urEventRelease (event1));
122
+ ASSERT_SUCCESS (urEventRelease (waitEvent));
123
+ ASSERT_SUCCESS (urEventRelease (event1));
124
124
125
125
ur_event_handle_t event2 = nullptr ;
126
126
input.assign (count, 420 );
127
- EXPECT_SUCCESS (urEnqueueMemBufferWrite (queue2, src_buffer, true , 0 , size,
127
+ ASSERT_SUCCESS (urEnqueueMemBufferWrite (queue2, src_buffer, true , 0 , size,
128
128
input.data (), 0 , nullptr , nullptr ));
129
- EXPECT_SUCCESS (urEnqueueMemBufferCopy (queue2, src_buffer, dst_buffer, 0 , 0 ,
129
+ ASSERT_SUCCESS (urEnqueueMemBufferCopy (queue2, src_buffer, dst_buffer, 0 , 0 ,
130
130
size, 0 , nullptr , &event2));
131
- EXPECT_SUCCESS (EnqueueBarrier (queue1, 1 , &event2, &waitEvent));
132
- EXPECT_SUCCESS (urQueueFlush (queue2));
133
- EXPECT_SUCCESS (urQueueFlush (queue1));
134
- EXPECT_SUCCESS (urEventWait (1 , &waitEvent));
135
- EXPECT_SUCCESS (urEnqueueMemBufferRead (queue2, dst_buffer, true , 0 , size,
131
+ ASSERT_SUCCESS (EnqueueBarrier (queue1, 1 , &event2, &waitEvent));
132
+ ASSERT_SUCCESS (urQueueFlush (queue2));
133
+ ASSERT_SUCCESS (urQueueFlush (queue1));
134
+ ASSERT_SUCCESS (urEventWait (1 , &waitEvent));
135
+ ASSERT_SUCCESS (urEnqueueMemBufferRead (queue2, dst_buffer, true , 0 , size,
136
136
output.data (), 0 , nullptr , nullptr ));
137
- EXPECT_SUCCESS (urEventRelease (waitEvent));
138
- EXPECT_SUCCESS (urEventRelease (event2));
137
+ ASSERT_SUCCESS (urEventRelease (waitEvent));
138
+ ASSERT_SUCCESS (urEventRelease (event2));
139
139
EXPECT_EQ (input, output);
140
140
}
141
141
@@ -181,15 +181,15 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest,
181
181
constexpr uint32_t ONE = 1 ;
182
182
urEnqueueMemBufferWrite (queue, buffer, true , 0 , sizeof (uint32_t ), &ONE, 0 ,
183
183
nullptr , &event);
184
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 1 , &event, nullptr ));
185
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
184
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 1 , &event, nullptr ));
185
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
186
186
nullptr , 0 , nullptr , 0 , nullptr ,
187
187
&event));
188
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 1 , &event, nullptr ));
189
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
188
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 1 , &event, nullptr ));
189
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
190
190
nullptr , 0 , nullptr , 0 , nullptr ,
191
191
&event));
192
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 1 , &event, nullptr ));
192
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 1 , &event, nullptr ));
193
193
addHelper.ValidateBuffer (buffer, sizeof (uint32_t ), 4004 );
194
194
}
195
195
}
@@ -212,15 +212,15 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest,
212
212
constexpr uint32_t ONE = 1 ;
213
213
urEnqueueMemBufferWrite (queue, buffer, true , 0 , sizeof (uint32_t ), &ONE, 0 ,
214
214
nullptr , nullptr );
215
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , &event));
216
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
215
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , &event));
216
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
217
217
nullptr , 0 , nullptr , 1 , &event,
218
218
nullptr ));
219
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , &event));
220
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
219
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , &event));
220
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
221
221
nullptr , 0 , nullptr , 1 , &event,
222
222
nullptr ));
223
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , &event));
223
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , &event));
224
224
addHelper.ValidateBuffer (buffer, sizeof (uint32_t ), 4004 );
225
225
}
226
226
}
@@ -242,17 +242,17 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest, SuccessEventDependencies) {
242
242
constexpr uint32_t ONE = 1 ;
243
243
urEnqueueMemBufferWrite (queue, buffer, true , 0 , sizeof (uint32_t ), &ONE, 0 ,
244
244
nullptr , &event[0 ]);
245
- EXPECT_SUCCESS (
245
+ ASSERT_SUCCESS (
246
246
urEnqueueEventsWaitWithBarrier (queue, 1 , &event[0 ], &event[1 ]));
247
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
247
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
248
248
nullptr , 0 , nullptr , 1 , &event[1 ],
249
249
&event[2 ]));
250
- EXPECT_SUCCESS (
250
+ ASSERT_SUCCESS (
251
251
urEnqueueEventsWaitWithBarrier (queue, 1 , &event[2 ], &event[3 ]));
252
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
252
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
253
253
nullptr , 0 , nullptr , 1 , &event[3 ],
254
254
&event[4 ]));
255
- EXPECT_SUCCESS (
255
+ ASSERT_SUCCESS (
256
256
urEnqueueEventsWaitWithBarrier (queue, 1 , &event[4 ], &event[5 ]));
257
257
addHelper.ValidateBuffer (buffer, sizeof (uint32_t ), 4004 );
258
258
}
@@ -275,15 +275,15 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest,
275
275
constexpr uint32_t ONE = 1 ;
276
276
urEnqueueMemBufferWrite (queue, buffer, true , 0 , sizeof (uint32_t ), &ONE, 0 ,
277
277
nullptr , nullptr );
278
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , nullptr ));
279
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
278
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , nullptr ));
279
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, add_kernel, 1 , &offset, &count,
280
280
nullptr , 0 , nullptr , 0 , nullptr ,
281
281
nullptr ));
282
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , nullptr ));
283
- EXPECT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
282
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , nullptr ));
283
+ ASSERT_SUCCESS (urEnqueueKernelLaunch (queue, mul_kernel, 1 , &offset, &count,
284
284
nullptr , 0 , nullptr , 0 , nullptr ,
285
285
nullptr ));
286
- EXPECT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , nullptr ));
286
+ ASSERT_SUCCESS (urEnqueueEventsWaitWithBarrier (queue, 0 , nullptr , nullptr ));
287
287
addHelper.ValidateBuffer (buffer, sizeof (uint32_t ), 4004 );
288
288
}
289
289
}
0 commit comments