Skip to content

[UR][Offload] Fixes for enqueue UR CTS tests #19926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2025
Merged

[UR][Offload] Fixes for enqueue UR CTS tests #19926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions unified-runtime/source/adapters/offload/device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
case UR_DEVICE_INFO_IMAGE_SRGB:
case UR_DEVICE_INFO_HOST_UNIFIED_MEMORY:
case UR_DEVICE_INFO_LINKER_AVAILABLE:
case UR_DEVICE_INFO_TIMESTAMP_RECORDING_SUPPORT_EXP:
return ReturnValue(false);
case UR_DEVICE_INFO_USM_CROSS_SHARED_SUPPORT:
case UR_DEVICE_INFO_USM_SYSTEM_SHARED_SUPPORT:
Expand Down
12 changes: 12 additions & 0 deletions unified-runtime/source/adapters/offload/enqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueEventsWaitWithBarrier(
return doWait<true>(hQueue, numEventsInWaitList, phEventWaitList, phEvent);
}

// This function only makes sense for level_zero, the flag in properties is
// ignored
UR_APIEXPORT ur_result_t urEnqueueEventsWaitWithBarrierExt(
ur_queue_handle_t hQueue, const ur_exp_enqueue_ext_properties_t *,
uint32_t numEventsInWaitList, const ur_event_handle_t *phEventWaitList,
ur_event_handle_t *phEvent) {
return urEnqueueEventsWaitWithBarrier(hQueue, numEventsInWaitList,
phEventWaitList, phEvent);
}

UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
ur_queue_handle_t hQueue, ur_kernel_handle_t hKernel, uint32_t workDim,
const size_t *pGlobalWorkOffset, const size_t *pGlobalWorkSize,
Expand Down Expand Up @@ -235,6 +245,8 @@ ur_result_t doMemcpy(ur_command_t Command, ur_queue_handle_t hQueue,
OL_RETURN_ON_ERR(waitOnEvents(Queue, phEventWaitList, numEventsInWaitList));

if (blocking) {
// Ensure all work in the queue is complete
OL_RETURN_ON_ERR(olSyncQueue(Queue));
OL_RETURN_ON_ERR(
olMemcpy(nullptr, DestPtr, DestDevice, SrcPtr, SrcDevice, size));
if (phEvent) {
Expand Down
3 changes: 2 additions & 1 deletion unified-runtime/source/adapters/offload/ur_interface_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelProcAddrTable(
pDdiTable->pfnRelease = urKernelRelease;
pDdiTable->pfnRetain = urKernelRetain;
pDdiTable->pfnSetArgLocal = nullptr;
pDdiTable->pfnSetArgMemObj = nullptr;
pDdiTable->pfnSetArgMemObj = urKernelSetArgMemObj;
pDdiTable->pfnSetArgPointer = urKernelSetArgPointer;
pDdiTable->pfnSetArgSampler = nullptr;
pDdiTable->pfnSetArgValue = urKernelSetArgValue;
Expand Down Expand Up @@ -172,6 +172,7 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueProcAddrTable(
pDdiTable->pfnDeviceGlobalVariableWrite = urEnqueueDeviceGlobalVariableWrite;
pDdiTable->pfnEventsWait = urEnqueueEventsWait;
pDdiTable->pfnEventsWaitWithBarrier = urEnqueueEventsWaitWithBarrier;
pDdiTable->pfnEventsWaitWithBarrierExt = urEnqueueEventsWaitWithBarrierExt;
pDdiTable->pfnKernelLaunch = urEnqueueKernelLaunch;
pDdiTable->pfnMemBufferCopy = urEnqueueMemBufferCopy;
pDdiTable->pfnMemBufferCopyRect = nullptr;
Expand Down
1 change: 0 additions & 1 deletion unified-runtime/test/conformance/enqueue/urEnqueueEventsWaitWithBarrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ struct urEnqueueEventsWaitWithBarrierOrderingTest : uur::urProgramTest {

auto entry_points =
uur::KernelsEnvironment::instance->GetEntryPointNames(program_name);
std::cout << entry_points[0];

ASSERT_SUCCESS(urKernelCreate(program, "_ZTS3Add", &add_kernel));
ASSERT_SUCCESS(urKernelCreate(program, "_ZTS3Mul", &mul_kernel));
Expand Down
63 changes: 9 additions & 54 deletions unified-runtime/test/conformance/source/environment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,56 +191,6 @@ KernelsEnvironment::parseKernelOptions(int argc, char **argv,
return options;
}

std::string
KernelsEnvironment::getDefaultTargetName(ur_platform_handle_t platform) {
if (instance->GetDevices().size() == 0) {
error = "no devices available on the platform";
return {};
}

ur_backend_t backend;
if (urPlatformGetInfo(platform, UR_PLATFORM_INFO_BACKEND, sizeof(backend),
&backend, nullptr)) {
error = "failed to get backend from platform.";
return {};
}

switch (backend) {
case UR_BACKEND_OPENCL:
case UR_BACKEND_LEVEL_ZERO:
return "spir64";
case UR_BACKEND_CUDA:
return "nvptx64-nvidia-cuda";
case UR_BACKEND_HIP:
return "amdgcn-amd-amdhsa";
case UR_BACKEND_OFFLOAD: {
// All Offload platforms report this backend, use the platform name to select
// the actual underlying backend.
std::vector<char> PlatformName;
size_t PlatformNameSize = 0;
urPlatformGetInfo(platform, UR_PLATFORM_INFO_NAME, 0, nullptr,
&PlatformNameSize);
PlatformName.resize(PlatformNameSize);
urPlatformGetInfo(platform, UR_PLATFORM_INFO_NAME, PlatformNameSize,
PlatformName.data(), nullptr);
if (std::strcmp(PlatformName.data(), "CUDA") == 0) {
return "nvptx64-nvidia-cuda";
} else if (std::strcmp(PlatformName.data(), "AMDGPU") == 0) {
return "amdgcn-amd-amdhsa";
} else {
error = "Could not detect target for Offload platform";
return {};
}
}
case UR_BACKEND_NATIVE_CPU:
error = "native_cpu doesn't support kernel tests yet";
return {};
default:
error = "unknown target.";
return {};
}
}

std::string
KernelsEnvironment::getKernelSourcePath(const std::string &kernel_name,
const std::string &target_name) {
Expand All @@ -256,12 +206,17 @@ void KernelsEnvironment::LoadSource(
// We don't have a way to build device code for native cpu yet.
UUR_KNOWN_FAILURE_ON_PARAM(platform, uur::NativeCPU{});

std::string target_name = getDefaultTargetName(platform);
if (target_name.empty()) {
FAIL() << error;
if (instance->GetDevices().size() == 0) {
FAIL() << "no devices available on the platform";
}

std::string triple_name;
auto Err = GetPlatformTriple(platform, triple_name);
if (Err) {
FAIL() << "GetPlatformTriple failed with error " << Err << "\n";
}

return LoadSource(kernel_name, target_name, binary_out);
return LoadSource(kernel_name, triple_name, binary_out);
}

void KernelsEnvironment::LoadSource(
Expand Down
1 change: 0 additions & 1 deletion unified-runtime/test/conformance/testing/include/uur/environment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ struct KernelsEnvironment : DevicesEnvironment {
const std::string &kernels_default_dir);
std::string getKernelSourcePath(const std::string &kernel_name,
const std::string &target_name);
std::string getDefaultTargetName(ur_platform_handle_t platform);

KernelOptions kernel_options;
// mapping between kernels (full_path + kernel_name) and their saved source.
Expand Down
4 changes: 3 additions & 1 deletion unified-runtime/test/conformance/testing/include/uur/fixtures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,7 +1472,9 @@ struct KernelLaunchHelper {
ur_backend_t backend;
ASSERT_SUCCESS(urPlatformGetInfo(platform, UR_PLATFORM_INFO_BACKEND,
sizeof(backend), &backend, nullptr));
if (backend == UR_BACKEND_HIP) {
std::string target_name;
ASSERT_SUCCESS(GetPlatformTriple(platform, target_name));
if (target_name == "amdgcn-amd-amdhsa") {
// this emulates the three offset params for buffer accessor on AMD.
size_t val = 0;
ASSERT_SUCCESS(urKernelSetArgValue(kernel, current_arg_index + 1,
Expand Down
2 changes: 2 additions & 0 deletions unified-runtime/test/conformance/testing/include/uur/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ ur_result_t GetTimestampRecordingSupport(ur_device_handle_t device,
bool &support);
ur_result_t GetUSMContextMemcpyExpSupport(ur_device_handle_t device,
bool &support);
ur_result_t GetPlatformTriple(ur_platform_handle_t platform,
std::string &Triple);

ur_device_partition_property_t makePartitionByCountsDesc(uint32_t count);

Expand Down
47 changes: 47 additions & 0 deletions unified-runtime/test/conformance/testing/source/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,53 @@ ur_result_t GetUSMContextMemcpyExpSupport(ur_device_handle_t device,
device, UR_DEVICE_INFO_USM_CONTEXT_MEMCPY_SUPPORT_EXP, support);
}

ur_result_t GetPlatformTriple(ur_platform_handle_t platform,
std::string &triple) {
ur_backend_t backend;
if (auto Err = urPlatformGetInfo(platform, UR_PLATFORM_INFO_BACKEND,
sizeof(backend), &backend, nullptr)) {
return Err;
}

switch (backend) {
case UR_BACKEND_OPENCL:
case UR_BACKEND_LEVEL_ZERO:
triple = "spir64";
break;
case UR_BACKEND_CUDA:
triple = "nvptx64-nvidia-cuda";
break;
case UR_BACKEND_HIP:
triple = "amdgcn-amd-amdhsa";
break;
case UR_BACKEND_OFFLOAD: {
// All Offload platforms report this backend, use the platform name to select
// the actual underlying backend.
std::vector<char> PlatformName;
size_t PlatformNameSize = 0;
urPlatformGetInfo(platform, UR_PLATFORM_INFO_NAME, 0, nullptr,
&PlatformNameSize);
PlatformName.resize(PlatformNameSize);
urPlatformGetInfo(platform, UR_PLATFORM_INFO_NAME, PlatformNameSize,
PlatformName.data(), nullptr);
if (strcmp(PlatformName.data(), "CUDA") == 0) {
triple = "nvptx64-nvidia-cuda";
} else if (strcmp(PlatformName.data(), "AMDGPU") == 0) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't love the use of strcmp but I do recognize that this is moved, not new

triple = "amdgcn-amd-amdhsa";
} else {
return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
}
break;
}
case UR_BACKEND_NATIVE_CPU:
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
default:
return UR_RESULT_ERROR_INVALID_ENUMERATION;
}

return UR_RESULT_SUCCESS;
}

ur_device_partition_property_t makePartitionByCountsDesc(uint32_t count) {
ur_device_partition_property_t desc;
desc.type = UR_DEVICE_PARTITION_BY_COUNTS;
Expand Down
Loading