Merge pull request #1598 from omarahmed1111/Add-event-tests-that-match-e2e-event-tests

kbenzie · web-flow · commit a2005ddd8fd9 · 2024-06-04T14:15:17.000+01:00
Add more output validation for urEventGetProfilingInfo test
diff --git a/source/adapters/cuda/event.cpp b/source/adapters/cuda/event.cpp
@@ -176,7 +176,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetInfo(ur_event_handle_t hEvent,
   case UR_EVENT_INFO_CONTEXT:
     return ReturnValue(hEvent->getContext());
   default:
-    detail::ur::die("Event info request not implemented");
+    break;
   }
 
   return UR_RESULT_ERROR_INVALID_ENUMERATION;
@@ -207,8 +207,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetProfilingInfo(
   default:
     break;
   }
-  detail::ur::die("Event Profiling info request not implemented");
-  return {};
+  return UR_RESULT_ERROR_INVALID_ENUMERATION;
 }
 
 UR_APIEXPORT ur_result_t UR_APICALL urEventSetCallback(ur_event_handle_t,
diff --git a/source/adapters/opencl/event.cpp b/source/adapters/opencl/event.cpp
@@ -46,7 +46,8 @@ convertURProfilingInfoToCL(const ur_profiling_info_t PropName) {
     return CL_PROFILING_COMMAND_SUBMIT;
   case UR_PROFILING_INFO_COMMAND_START:
     return CL_PROFILING_COMMAND_START;
-  // TODO(ur) add UR_PROFILING_INFO_COMMAND_COMPLETE once spec has been updated
+  case UR_PROFILING_INFO_COMMAND_COMPLETE:
+    return CL_PROFILING_COMMAND_COMPLETE;
   case UR_PROFILING_INFO_COMMAND_END:
     return CL_PROFILING_COMMAND_END;
   default:
diff --git a/test/conformance/event/event_adapter_cuda.match b/test/conformance/event/event_adapter_cuda.match
@@ -1,3 +1,5 @@
+urEventGetProfilingInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_PROFILING_INFO_COMMAND_COMPLETE
+urEventGetProfilingInfoWithTimingComparisonTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
 urEventSetCallbackTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
 urEventSetCallbackTest.ValidateParameters/NVIDIA_CUDA_BACKEND___{{.*}}_
 urEventSetCallbackTest.AllStates/NVIDIA_CUDA_BACKEND___{{.*}}_
diff --git a/test/conformance/event/event_adapter_hip.match b/test/conformance/event/event_adapter_hip.match
@@ -1,3 +1,5 @@
+urEventGetProfilingInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_PROFILING_INFO_COMMAND_COMPLETE
+urEventGetProfilingInfoWithTimingComparisonTest.Success/AMD_HIP_BACKEND___{{.*}}_
 urEventSetCallbackTest.Success/AMD_HIP_BACKEND___{{.*}}_
 urEventSetCallbackTest.ValidateParameters/AMD_HIP_BACKEND___{{.*}}_
 urEventSetCallbackTest.AllStates/AMD_HIP_BACKEND___{{.*}}_
diff --git a/test/conformance/event/event_adapter_level_zero.match b/test/conformance/event/event_adapter_level_zero.match
@@ -1,4 +1,6 @@
 {{OPT}}urEventGetInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_EVENT_INFO_COMMAND_TYPE
 {{OPT}}urEventGetProfilingInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_PROFILING_INFO_COMMAND_QUEUED
 {{OPT}}urEventGetProfilingInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_PROFILING_INFO_COMMAND_SUBMIT
+{{OPT}}urEventGetProfilingInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_PROFILING_INFO_COMMAND_COMPLETE
+{{OPT}}urEventGetProfilingInfoWithTimingComparisonTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 {{OPT}}{{Segmentation fault|Aborted}}
diff --git a/test/conformance/event/event_adapter_native_cpu.match b/test/conformance/event/event_adapter_native_cpu.match
@@ -13,6 +13,8 @@ urEventGetProfilingInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_PROFI
 urEventGetProfilingInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_PROFILING_INFO_COMMAND_SUBMIT
 urEventGetProfilingInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_PROFILING_INFO_COMMAND_START
 urEventGetProfilingInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_PROFILING_INFO_COMMAND_END
+urEventGetProfilingInfoTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU___UR_PROFILING_INFO_COMMAND_COMPLETE
+urEventGetProfilingInfoWithTimingComparisonTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventGetProfilingInfoNegativeTest.InvalidNullHandle/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventGetProfilingInfoNegativeTest.InvalidEnumeration/SYCL_NATIVE_CPU___SYCL_Native_CPU_
 urEventGetProfilingInfoNegativeTest.InvalidValue/SYCL_NATIVE_CPU___SYCL_Native_CPU_
diff --git a/test/conformance/event/urEventGetProfilingInfo.cpp b/test/conformance/event/urEventGetProfilingInfo.cpp
@@ -30,9 +30,58 @@ UUR_TEST_SUITE_P(urEventGetProfilingInfoTest,
                  ::testing::Values(UR_PROFILING_INFO_COMMAND_QUEUED,
                                    UR_PROFILING_INFO_COMMAND_SUBMIT,
                                    UR_PROFILING_INFO_COMMAND_START,
-                                   UR_PROFILING_INFO_COMMAND_END),
+                                   UR_PROFILING_INFO_COMMAND_END,
+                                   UR_PROFILING_INFO_COMMAND_COMPLETE),
                  uur::deviceTestWithParamPrinter<ur_profiling_info_t>);
 
+using urEventGetProfilingInfoWithTimingComparisonTest = uur::event::urEventTest;
+
+TEST_P(urEventGetProfilingInfoWithTimingComparisonTest, Success) {
+    uint8_t size = 8;
+
+    std::vector<uint8_t> queued_data(size);
+    ASSERT_SUCCESS(urEventGetProfilingInfo(event,
+                                           UR_PROFILING_INFO_COMMAND_QUEUED,
+                                           size, queued_data.data(), nullptr));
+    auto queued_timing = reinterpret_cast<size_t *>(queued_data.data());
+    ASSERT_NE(*queued_timing, 0);
+
+    std::vector<uint8_t> submit_data(size);
+    ASSERT_SUCCESS(urEventGetProfilingInfo(event,
+                                           UR_PROFILING_INFO_COMMAND_SUBMIT,
+                                           size, submit_data.data(), nullptr));
+    auto submit_timing = reinterpret_cast<size_t *>(submit_data.data());
+    ASSERT_NE(*submit_timing, 0);
+
+    std::vector<uint8_t> start_data(size);
+    ASSERT_SUCCESS(urEventGetProfilingInfo(event,
+                                           UR_PROFILING_INFO_COMMAND_START,
+                                           size, start_data.data(), nullptr));
+    auto start_timing = reinterpret_cast<size_t *>(start_data.data());
+    ASSERT_NE(*start_timing, 0);
+
+    std::vector<uint8_t> end_data(size);
+    ASSERT_SUCCESS(urEventGetProfilingInfo(event, UR_PROFILING_INFO_COMMAND_END,
+                                           size, end_data.data(), nullptr));
+    auto end_timing = reinterpret_cast<size_t *>(end_data.data());
+    ASSERT_NE(*end_timing, 0);
+
+    std::vector<uint8_t> complete_data(size);
+    ASSERT_SUCCESS(
+        urEventGetProfilingInfo(event, UR_PROFILING_INFO_COMMAND_COMPLETE, size,
+                                complete_data.data(), nullptr));
+    auto complete_timing = reinterpret_cast<size_t *>(complete_data.data());
+    ASSERT_NE(*complete_timing, 0);
+
+    ASSERT_LE(*queued_timing, *submit_timing);
+    ASSERT_LT(*submit_timing, *start_timing);
+    ASSERT_LT(*start_timing, *end_timing);
+    ASSERT_LE(*end_timing, *complete_timing);
+}
+
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(
+    urEventGetProfilingInfoWithTimingComparisonTest);
+
 using urEventGetProfilingInfoNegativeTest = uur::event::urEventTest;
 
 TEST_P(urEventGetProfilingInfoNegativeTest, InvalidNullHandle) {

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetInfo(ur_event_handle_t hEvent,`
`176`	`176`	`case UR_EVENT_INFO_CONTEXT:`
`177`	`177`	`return ReturnValue(hEvent->getContext());`
`178`	`178`	`default:`
`179`		`- detail::ur::die("Event info request not implemented");`
	`179`	`+ break;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`return UR_RESULT_ERROR_INVALID_ENUMERATION;`
`@@ -207,8 +207,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEventGetProfilingInfo(`
`207`	`207`	`default:`
`208`	`208`	`break;`
`209`	`209`	`}`
`210`		`- detail::ur::die("Event Profiling info request not implemented");`
`211`		`- return {};`
	`210`	`+ return UR_RESULT_ERROR_INVALID_ENUMERATION;`
`212`	`211`	`}`
`213`	`212`
`214`	`213`	`UR_APIEXPORT ur_result_t UR_APICALL urEventSetCallback(ur_event_handle_t,`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+urEventGetProfilingInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_PROFILING_INFO_COMMAND_COMPLETE`
	`2`	`+urEventGetProfilingInfoWithTimingComparisonTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_`
`1`	`3`	`urEventSetCallbackTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_`
`2`	`4`	`urEventSetCallbackTest.ValidateParameters/NVIDIA_CUDA_BACKEND___{{.*}}_`
`3`	`5`	`urEventSetCallbackTest.AllStates/NVIDIA_CUDA_BACKEND___{{.*}}_`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+urEventGetProfilingInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_PROFILING_INFO_COMMAND_COMPLETE`
	`2`	`+urEventGetProfilingInfoWithTimingComparisonTest.Success/AMD_HIP_BACKEND___{{.*}}_`
`1`	`3`	`urEventSetCallbackTest.Success/AMD_HIP_BACKEND___{{.*}}_`
`2`	`4`	`urEventSetCallbackTest.ValidateParameters/AMD_HIP_BACKEND___{{.*}}_`
`3`	`5`	`urEventSetCallbackTest.AllStates/AMD_HIP_BACKEND___{{.*}}_`