diff --git a/test/conformance/device/device_adapter_cuda.match b/test/conformance/device/device_adapter_cuda.match index e42f948b73..6f4f94ea3e 100644 --- a/test/conformance/device/device_adapter_cuda.match +++ b/test/conformance/device/device_adapter_cuda.match @@ -1,2 +1 @@ -{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_READ_WRITE_IMAGE_ARGS diff --git a/test/conformance/device/device_adapter_hip.match b/test/conformance/device/device_adapter_hip.match deleted file mode 100644 index 48e00debe4..0000000000 --- a/test/conformance/device/device_adapter_hip.match +++ /dev/null @@ -1 +0,0 @@ -{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime diff --git a/test/conformance/device/device_adapter_level_zero.match b/test/conformance/device/device_adapter_level_zero.match index 87140fb10c..9c272104ad 100644 --- a/test/conformance/device/device_adapter_level_zero.match +++ b/test/conformance/device/device_adapter_level_zero.match @@ -1,2 +1 @@ -{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime {{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE diff --git a/test/conformance/device/device_adapter_level_zero_v2.match b/test/conformance/device/device_adapter_level_zero_v2.match index 87140fb10c..9c272104ad 100644 --- a/test/conformance/device/device_adapter_level_zero_v2.match +++ b/test/conformance/device/device_adapter_level_zero_v2.match @@ -1,2 +1 @@ -{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime {{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE diff --git a/test/conformance/device/device_adapter_native_cpu.match b/test/conformance/device/device_adapter_native_cpu.match index 2764ad4fd1..806a97f1bf 100644 --- a/test/conformance/device/device_adapter_native_cpu.match +++ b/test/conformance/device/device_adapter_native_cpu.match @@ -1,6 +1,5 @@ urDeviceCreateWithNativeHandleTest.InvalidNullHandlePlatform urDeviceCreateWithNativeHandleTest.InvalidNullPointerDevice -{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime urDeviceGetInfoSingleTest.MaxWorkGroupSizeIsNonzero {{OPT}}urDeviceSelectBinaryTest.Success urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_READ_WRITE_IMAGE_ARGS diff --git a/test/conformance/device/urDeviceGetGlobalTimestamps.cpp b/test/conformance/device/urDeviceGetGlobalTimestamps.cpp index 8275275afe..d0b913965d 100644 --- a/test/conformance/device/urDeviceGetGlobalTimestamps.cpp +++ b/test/conformance/device/urDeviceGetGlobalTimestamps.cpp @@ -57,12 +57,6 @@ TEST_F(urDeviceGetGlobalTimestampTest, SuccessNoTimers) { TEST_F(urDeviceGetGlobalTimestampTest, SuccessSynchronizedTime) { for (auto device : devices) { // get the timer resolution of the device - size_t deviceTimerResolutionNanoSecs = 0; - ASSERT_SUCCESS(uur::GetDeviceProfilingTimerResolution( - device, deviceTimerResolutionNanoSecs)); - size_t delayAmountNanoSecs = - delayTimerMultiplier * deviceTimerResolutionNanoSecs; - uint64_t deviceStartTime = 0, deviceEndTime = 0; uint64_t hostStartTime = 0, hostEndTime = 0; uint64_t hostOnlyStartTime = 0, hostOnlyEndTime = 0; @@ -77,8 +71,7 @@ TEST_F(urDeviceGetGlobalTimestampTest, SuccessSynchronizedTime) { ASSERT_GE(hostOnlyStartTime, hostStartTime); // wait for timers to increment - std::this_thread::sleep_for( - std::chrono::nanoseconds(delayAmountNanoSecs)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); ASSERT_SUCCESS( urDeviceGetGlobalTimestamps(device, &deviceEndTime, &hostEndTime));