Skip to content

Commit

Permalink
Fix urDeviceGetGlobalTimestampTest and urContextCreateWithNativeHandl…
Browse files Browse the repository at this point in the history
…e tests
  • Loading branch information
fabiomestre committed Aug 31, 2023
1 parent a8e4955 commit fa2b2aa
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 4 deletions.
3 changes: 2 additions & 1 deletion scripts/core/device.yml
Original file line number Diff line number Diff line change
Expand Up @@ -787,14 +787,15 @@ returns:
- "If the adapter has no underlying equivalent handle."
--- #--------------------------------------------------------------------------
type: function
desc: "Returns synchronized Host and Device global timestamps."
desc: "Returns a reasonably synchronized Host and Device global timestamps."
class: $xDevice
name: GetGlobalTimestamps
decl: static
ordinal: "0"
analogue:
- "**clGetDeviceAndHostTimer**"
details:
- "The accuracy of the results is implementation defined."
- "The application may call this function from simultaneous threads for the same context."
- "The implementation of this function should be thread-safe."
params:
Expand Down
11 changes: 9 additions & 2 deletions test/conformance/context/urContextCreateWithNativeHandle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,15 @@ TEST_P(urContextCreateWithNativeHandleTest, Success) {
// and perform some query on it to verify that it works.
ur_context_handle_t ctx = nullptr;
ur_context_native_properties_t props{};
ASSERT_SUCCESS(urContextCreateWithNativeHandle(native_context, 1, &device,
&props, &ctx));

ur_result_t result = urContextCreateWithNativeHandle(native_context, 1,
&device, &props, &ctx);

if (result == UR_RESULT_ERROR_INVALID_OPERATION) {
GTEST_SKIP();
}

ASSERT_SUCCESS(result);
ASSERT_NE(ctx, nullptr);

uint32_t n_devices = 0;
Expand Down
8 changes: 7 additions & 1 deletion test/conformance/device/urDeviceGetGlobalTimestamps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <thread>
#include <type_traits>
#include <uur/fixtures.h>
#include <uur/utils.h>

// WARNING - This is the precision that is used in the OpenCL-CTS.
// - We might need to modify this value per-adapter.
Expand Down Expand Up @@ -102,7 +103,12 @@ TEST_F(urDeviceGetGlobalTimestampTest, SuccessSynchronizedTime) {
const uint64_t allowedDiff = static_cast<uint64_t>(
std::min(deviceTimeDiff, hostTimeDiff) * allowedTimerError);

ASSERT_LE(observedDiff, allowedDiff);
// CUDA and HIP implementations are not accurate enough.
ur_platform_backend_t backend = uur::GetPlatformBackend(platform);
if (backend != UR_PLATFORM_BACKEND_CUDA &&
backend != UR_PLATFORM_BACKEND_HIP) {
ASSERT_LE(observedDiff, allowedDiff);
}
}
}

Expand Down
8 changes: 8 additions & 0 deletions test/conformance/testing/include/uur/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ ur_result_t GetObjectReferenceCount(T object, uint32_t &out_ref_count) {
return UR_RESULT_ERROR_INVALID_VALUE;
}

inline ur_platform_backend_t
GetPlatformBackend(ur_platform_handle_t hPlatform) {
ur_platform_backend_t backend;
GetPlatformInfo<ur_platform_backend_t>(hPlatform, UR_PLATFORM_INFO_BACKEND,
backend);
return backend;
}

inline std::string GetPlatformName(ur_platform_handle_t hPlatform) {
std::string platform_name;
GetPlatformInfo<std::string>(hPlatform, UR_PLATFORM_INFO_NAME,
Expand Down

0 comments on commit fa2b2aa

Please sign in to comment.