Skip to content

Commit 10956de

Browse files
maaswanimaaswani
authored
Fixed monotonic test bugs; coverity samples issues (#73)
1 parent f23ec0e commit 10956de

File tree

8 files changed

+104
-141
lines changed

8 files changed

+104
-141
lines changed

‎sdk/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.5
1+
0.3.6

‎sdk/samples/dlworkloads/main.cpp‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -213,52 +213,33 @@ int main()
213213
break;
214214
}
215215
case pti_view_kind::PTI_VIEW_DEVICE_GPU_KERNEL: {
216+
pti_view_record_kernel* rec = reinterpret_cast<pti_view_record_kernel*>(ptr);
216217
std::cout << "---------------------------------------------------"
217218
"-----------------------------"
218219
<< '\n';
219220
std::cout << "Found Kernel Record" << '\n';
220-
samples_utils::dump_record(
221-
reinterpret_cast<pti_view_record_kernel *>(ptr));
222-
std::cout << "---------------------------------------------------"
223-
"-----------------------------"
224-
<< '\n';
225-
if (((reinterpret_cast<pti_view_record_kernel *>(ptr)
226-
->_sycl_task_begin_timestamp) <=
227-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
228-
->_sycl_enqk_begin_timestamp)) &&
229-
230-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
231-
->_sycl_enqk_begin_timestamp) <=
232-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
233-
->_append_timestamp)) &&
234-
235-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
236-
->_append_timestamp) <=
237-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
238-
->_submit_timestamp)) &&
239-
240-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
241-
->_submit_timestamp) <=
242-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
243-
->_start_timestamp)) &&
244-
245-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
246-
->_start_timestamp) <=
247-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
248-
->_end_timestamp))) {
221+
samples_utils::dump_record(rec);
222+
if (samples_utils::isMonotonic(
223+
{
224+
rec->_sycl_task_begin_timestamp ,
225+
rec->_sycl_enqk_begin_timestamp ,
226+
rec->_append_timestamp ,
227+
rec->_submit_timestamp ,
228+
rec->_start_timestamp ,
229+
rec->_end_timestamp
230+
}
231+
)) {
249232
std::cout << "------------> All Monotonic" << std::endl;
250233
} else {
251234
std::cerr
252235
<< "------------> Something wrong: NOT All monotonic"
253236
<< std::endl;
254237
};
255-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)
256-
->_sycl_task_begin_timestamp == 0)
238+
if (rec->_sycl_task_begin_timestamp == 0)
257239
std::cerr << "------------> Something wrong: Sycl Task "
258240
"Begin Time is 0"
259241
<< std::endl;
260-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)
261-
->_sycl_enqk_begin_timestamp == 0)
242+
if (rec->_sycl_enqk_begin_timestamp == 0)
262243
std::cerr << "------------> Something wrong: Sycl Enq "
263244
"Launch Kernel Time is 0"
264245
<< std::endl;

‎sdk/samples/dpc_gemm/main.cc‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -213,53 +213,37 @@ int main(int argc, char *argv[]) {
213213
break;
214214
}
215215
case pti_view_kind::PTI_VIEW_DEVICE_GPU_KERNEL: {
216+
pti_view_record_kernel* rec = reinterpret_cast<pti_view_record_kernel*>(ptr);
216217
std::cout << "---------------------------------------------------"
217218
"-----------------------------"
218219
<< '\n';
219220
std::cout << "Found Kernel Record" << '\n';
220-
samples_utils::dump_record(
221-
reinterpret_cast<pti_view_record_kernel *>(ptr));
221+
samples_utils::dump_record(rec);
222222
std::cout << "---------------------------------------------------"
223223
"-----------------------------"
224224
<< '\n';
225-
if (((reinterpret_cast<pti_view_record_kernel *>(ptr)
226-
->_sycl_task_begin_timestamp) <=
227-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
228-
->_sycl_enqk_begin_timestamp)) &&
229-
230-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
231-
->_sycl_enqk_begin_timestamp) <=
232-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
233-
->_append_timestamp)) &&
234-
235-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
236-
->_append_timestamp) <=
237-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
238-
->_submit_timestamp)) &&
239-
240-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
241-
->_submit_timestamp) <=
242-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
243-
->_start_timestamp)) &&
244-
245-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
246-
->_start_timestamp) <=
247-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
248-
->_end_timestamp))) {
225+
if (samples_utils::isMonotonic(
226+
{
227+
rec->_sycl_task_begin_timestamp ,
228+
rec->_sycl_enqk_begin_timestamp ,
229+
rec->_append_timestamp ,
230+
rec->_submit_timestamp ,
231+
rec->_start_timestamp ,
232+
rec->_end_timestamp
233+
}
234+
)) {
249235
std::cout << "------------> All Monotonic" << std::endl;
250236
} else {
251237
std::cerr
252238
<< "------------> Something wrong: NOT All monotonic"
253239
<< std::endl;
254240
}
255-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)
256-
->_sycl_task_begin_timestamp == 0) {
241+
if (rec->_sycl_task_begin_timestamp == 0) {
257242
std::cerr << "------------> Something wrong: Sycl Task "
258243
"Begin Time is 0"
259244
<< std::endl;
260245
}
261-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)
262-
->_sycl_enqk_begin_timestamp == 0) {
246+
if (rec->_sycl_enqk_begin_timestamp == 0) {
263247
std::cerr << "------------> Something wrong: Sycl Enq "
264248
"Launch Kernel Time is 0"
265249
<< std::endl;

‎sdk/samples/iso3dfd_dpcpp/src/iso3dfd.cpp‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -263,36 +263,33 @@ int main(int argc, char* argv[]) {
263263
break;
264264
}
265265
case pti_view_kind::PTI_VIEW_DEVICE_GPU_KERNEL: {
266+
pti_view_record_kernel* rec = reinterpret_cast<pti_view_record_kernel*>(ptr);
266267
std::cout << "---------------------------------------------------"
267268
"-----------------------------"
268269
<< '\n';
269270
std::cout << "Found Kernel Record" << '\n';
270-
samples_utils::dump_record(reinterpret_cast<pti_view_record_kernel *>(ptr));
271+
samples_utils::dump_record(rec);
271272
std::cout << "---------------------------------------------------"
272273
"-----------------------------"
273274
<< '\n';
274-
if (((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_sycl_task_begin_timestamp) <=
275-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_sycl_enqk_begin_timestamp)) &&
276-
277-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_sycl_enqk_begin_timestamp) <=
278-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_append_timestamp)) &&
279-
280-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_append_timestamp) <=
281-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_submit_timestamp)) &&
282-
283-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_submit_timestamp) <=
284-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_start_timestamp)) &&
285-
286-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_start_timestamp) <=
287-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_end_timestamp))) {
275+
if (samples_utils::isMonotonic(
276+
{
277+
rec->_sycl_task_begin_timestamp ,
278+
rec->_sycl_enqk_begin_timestamp ,
279+
rec->_append_timestamp ,
280+
rec->_submit_timestamp ,
281+
rec->_start_timestamp ,
282+
rec->_end_timestamp
283+
}
284+
)) {
288285
std::cout << "------------> All Monotonic" << std::endl;
289286
} else {
290287
std::cout << "------------> Something wrong: NOT All monotonic" << std::endl;
291288
}
292-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)->_sycl_task_begin_timestamp == 0) {
289+
if (rec->_sycl_task_begin_timestamp == 0) {
293290
std::cout << "------------> Something wrong: Sycl Task Begin Time is 0" << std::endl;
294291
}
295-
if ( reinterpret_cast<pti_view_record_kernel *>(ptr)->_sycl_enqk_begin_timestamp == 0) {
292+
if ( rec->_sycl_enqk_begin_timestamp == 0) {
296293
std::cout << "------------> Something wrong: Sycl Enq Launch Kernel Time is 0" << std::endl;
297294
}
298295
break;

‎sdk/samples/onemkl_gemm/onemkl_gemm.cpp‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -215,38 +215,35 @@ int main() {
215215
break;
216216
}
217217
case pti_view_kind::PTI_VIEW_DEVICE_GPU_KERNEL: {
218+
pti_view_record_kernel* rec = reinterpret_cast<pti_view_record_kernel*>(ptr);
218219
std::cout << "---------------------------------------------------"
219220
"-----------------------------"
220221
<< '\n';
221222
std::cout << "Found Kernel Record" << '\n';
222-
samples_utils::dump_record(reinterpret_cast<pti_view_record_kernel *>(ptr));
223+
samples_utils::dump_record(rec);
223224

224225
std::cout << "---------------------------------------------------"
225226
"-----------------------------"
226227
<< '\n';
227-
if (((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_sycl_task_begin_timestamp) <=
228-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_sycl_enqk_begin_timestamp)) &&
229-
230-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_sycl_enqk_begin_timestamp) <=
231-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_append_timestamp)) &&
232-
233-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_append_timestamp) <=
234-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_submit_timestamp)) &&
235-
236-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_submit_timestamp) <=
237-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_start_timestamp)) &&
238-
239-
((reinterpret_cast<pti_view_record_kernel *>(ptr) ->_start_timestamp) <=
240-
(reinterpret_cast<pti_view_record_kernel *>(ptr) ->_end_timestamp))) {
228+
if (samples_utils::isMonotonic(
229+
{
230+
rec->_sycl_task_begin_timestamp ,
231+
rec->_sycl_enqk_begin_timestamp ,
232+
rec->_append_timestamp ,
233+
rec->_submit_timestamp ,
234+
rec->_start_timestamp ,
235+
rec->_end_timestamp
236+
}
237+
)) {
241238
std::cout << "------------> All Monotonic" << std::endl;
242239
} else {
243240
std::cout
244241
<< "------------> Something wrong: NOT All monotonic"
245242
<< std::endl;
246243
};
247-
if ( reinterpret_cast<pti_view_record_kernel *>(ptr)->_sycl_task_begin_timestamp == 0)
244+
if ( rec->_sycl_task_begin_timestamp == 0)
248245
std::cout << "------------> Something wrong: Sycl Task Begin Time is 0" << std::endl;
249-
if ( reinterpret_cast<pti_view_record_kernel *>(ptr)->_sycl_enqk_begin_timestamp == 0)
246+
if ( rec->_sycl_enqk_begin_timestamp == 0)
250247
std::cout << "------------> Something wrong: Sycl Enq Launch Kernel Time is 0" << std::endl;
251248

252249
break;

‎sdk/samples/samples_utilities/samples_utils.h‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,23 @@
1212

1313
namespace samples_utils {
1414

15+
//
16+
// Returns: True - if a_list passed in is a monotonically increasing sequence.
17+
// False - if not.
18+
// Assumption: Operator <= is well defined for this type already.
19+
//
20+
template<typename T>
21+
inline bool isMonotonic(std::initializer_list<T> a_list) {
22+
bool current_state=true;
23+
T previous=a_list.begin()[0];
24+
for (auto item: a_list) {
25+
current_state = current_state && (previous <= item);
26+
if (!current_state) return false;
27+
previous=item;
28+
}
29+
return true;
30+
}
31+
1532
std::string stringify_uuid(uint8_t* uuid, std::string additional_string) {
1633
std::stringstream sstream;
1734
sstream << additional_string;
@@ -26,7 +43,7 @@ std::string stringify_uuid(uint8_t* uuid, std::string additional_string) {
2643
}
2744

2845
void print_uuid(uint8_t* uuid, std::string additional_string) {
29-
std::cout << stringify_uuid(uuid,additional_string) << std::endl;
46+
std::cout << stringify_uuid(uuid,std::move(additional_string)) << std::endl;
3047
}
3148

3249
void dump_record(pti_view_record_kernel* record) {

‎sdk/samples/vector_sq_add/vector_sq_add.cpp‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -154,54 +154,38 @@ int main(int argc, char *argv[]) {
154154
break;
155155
}
156156
case pti_view_kind::PTI_VIEW_DEVICE_GPU_KERNEL: {
157+
pti_view_record_kernel* rec = reinterpret_cast<pti_view_record_kernel*>(ptr);
157158
std::cout << "---------------------------------------------------"
158159
"-----------------------------"
159160
<< '\n';
160161
std::cout << "Found Kernel Record" << '\n';
161-
samples_utils::dump_record(
162-
reinterpret_cast<pti_view_record_kernel *>(ptr));
162+
samples_utils::dump_record(rec);
163163

164164
std::cout << "---------------------------------------------------"
165165
"-----------------------------"
166166
<< '\n';
167-
if (((reinterpret_cast<pti_view_record_kernel *>(ptr)
168-
->_sycl_task_begin_timestamp) <=
169-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
170-
->_sycl_enqk_begin_timestamp)) &&
171-
172-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
173-
->_sycl_enqk_begin_timestamp) <=
174-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
175-
->_append_timestamp)) &&
176-
177-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
178-
->_append_timestamp) <=
179-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
180-
->_submit_timestamp)) &&
181-
182-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
183-
->_submit_timestamp) <=
184-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
185-
->_start_timestamp)) &&
186-
187-
((reinterpret_cast<pti_view_record_kernel *>(ptr)
188-
->_start_timestamp) <=
189-
(reinterpret_cast<pti_view_record_kernel *>(ptr)
190-
->_end_timestamp))) {
167+
if (samples_utils::isMonotonic(
168+
{
169+
rec->_sycl_task_begin_timestamp ,
170+
rec->_sycl_enqk_begin_timestamp ,
171+
rec->_append_timestamp ,
172+
rec->_submit_timestamp ,
173+
rec->_start_timestamp ,
174+
rec->_end_timestamp
175+
}
176+
)) {
191177
std::cout << "------------> All Monotonic" << std::endl;
192178
} else {
193179
std::cerr
194180
<< "------------> Something wrong: NOT All monotonic"
195181
<< std::endl;
196182
};
197-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)
198-
->_sycl_task_begin_timestamp == 0) {
183+
if (rec->_sycl_task_begin_timestamp == 0) {
199184
std::cerr << "------------> Something wrong: Sycl Task "
200185
"Begin Time is 0"
201186
<< std::endl;
202187
}
203-
if (reinterpret_cast<pti_view_record_kernel *>(ptr)
204-
->_sycl_enqk_begin_timestamp == 0) {
188+
if (rec->_sycl_enqk_begin_timestamp == 0) {
205189
std::cerr << "------------> Something wrong: Sycl Enq "
206190
"Launch Kernel Time is 0"
207191
<< std::endl;

0 commit comments

Comments
 (0)