Introduce a properties argument to olLaunchKernel to enable future extensions. This change adds initial extension for cooperative kernel launch. The change restores the functionality from: https://github.com/llvm/llvm-project/pull/184343 which was later reverted in: https://github.com/llvm/llvm-project/pull/197463 #184343 modified the API, and between the last rebase and the final merge, additional tests were added upstream(https://github.com/llvm/llvm-project/pull/193927) that still relied on the previous API version. Diff between this PR and #184343 ``` diff --git a/offload/unittests/OffloadAPI/kernel/olLaunchKernel.cpp b/offload/unittests/OffloadAPI/kernel/olLaunchKernel.cpp index 0251bffefe60..cd527f18db38 100644 --- a/offload/unittests/OffloadAPI/kernel/olLaunchKernel.cpp +++ b/offload/unittests/OffloadAPI/kernel/olLaunchKernel.cpp @@ -241,8 +241,8 @@ TEST_P(olLaunchKernelSingleCounterSyncEventTest, SuccessSyncEvent) { ArgsSingleCounter Args{LoopRange, NumberToAdd, (uint32_t *)InitValuePassed, (uint32_t *)ResNum}; - ASSERT_SUCCESS( - olLaunchKernel(Queue, Device, Kernel, &Args, sizeof(Args), &LaunchArgs)); + ASSERT_SUCCESS(olLaunchKernel(Queue, Device, Kernel, &Args, sizeof(Args), + &LaunchArgs, nullptr)); uint32_t FinalResVal = 0; ASSERT_SUCCESS(olMemcpy(Queue, &FinalResVal, Host, ResNum, Device, Size)); @@ -294,8 +294,8 @@ TEST_P(olLaunchKernelSingleCounterSyncEventTest, SuccessTwoQueues) { ArgsSingleCounter Args{LoopRange, NumberToAdd, (uint32_t *)InitValuePassed, (uint32_t *)ResNum1}; - ASSERT_SUCCESS( - olLaunchKernel(Queue, Device, Kernel, &Args, sizeof(Args), &LaunchArgs)); + ASSERT_SUCCESS(olLaunchKernel(Queue, Device, Kernel, &Args, sizeof(Args), + &LaunchArgs, nullptr)); ol_event_handle_t Event = nullptr; ASSERT_SUCCESS(olCreateEvent(Queue, &Event)); @@ -308,7 +308,7 @@ TEST_P(olLaunchKernelSingleCounterSyncEventTest, SuccessTwoQueues) { // been completed by the time the kernel is executed using the second queue, // the FinalResVal would be incorrect. ASSERT_SUCCESS(olLaunchKernel(Queue2, Device, Kernel, &Args2, sizeof(Args2), - &LaunchArgs)); + &LaunchArgs, nullptr)); ASSERT_SUCCESS(olSyncQueue(Queue2)); uint32_t FinalResVal = 0; ```
110 lines
3.8 KiB
C++
110 lines
3.8 KiB
C++
//===--- Level Zero Target RTL Implementation -----------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// GenericKernel implementation for SPIR-V/Xe machine.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef OPENMP_LIBOMPTARGET_PLUGINS_NEXTGEN_LEVEL_ZERO_L0KERNEL_H
|
|
#define OPENMP_LIBOMPTARGET_PLUGINS_NEXTGEN_LEVEL_ZERO_L0KERNEL_H
|
|
|
|
#include "AsyncQueue.h"
|
|
#include "L0Defs.h"
|
|
#include "L0Trace.h"
|
|
#include "PluginInterface.h"
|
|
|
|
namespace llvm::omp::target::plugin {
|
|
|
|
class L0DeviceTy;
|
|
class L0ProgramTy;
|
|
|
|
/// Forward declaration.
|
|
struct L0LaunchEnvTy;
|
|
|
|
/// Kernel properties.
|
|
struct KernelPropertiesTy {
|
|
uint32_t Width = 0;
|
|
uint32_t SIMDWidth = 0;
|
|
uint32_t MaxThreadGroupSize = 0;
|
|
uint32_t NumKernelArgs = 0;
|
|
std::unique_ptr<uint32_t[]> ArgSizes;
|
|
ze_kernel_indirect_access_flags_t IndirectAccessFlags =
|
|
std::numeric_limits<decltype(IndirectAccessFlags)>::max();
|
|
std::mutex Mtx;
|
|
};
|
|
|
|
struct L0LaunchEnvTy {
|
|
bool IsAsync;
|
|
bool IsCooperative = false;
|
|
AsyncQueueTy *AsyncQueue;
|
|
ze_group_count_t GroupCounts = {0, 0, 0};
|
|
KernelPropertiesTy &KernelPR;
|
|
bool HalfNumThreads = false;
|
|
bool IsTeamsNDRange = false;
|
|
std::unique_lock<std::mutex> Lock;
|
|
|
|
L0LaunchEnvTy(bool IsAsync, bool IsCooperative, AsyncQueueTy *AsyncQueue,
|
|
KernelPropertiesTy &KernelPR)
|
|
: IsAsync(IsAsync), IsCooperative(IsCooperative), AsyncQueue(AsyncQueue),
|
|
KernelPR(KernelPR), Lock(KernelPR.Mtx, std::defer_lock) {}
|
|
};
|
|
|
|
class L0KernelTy : public GenericKernelTy {
|
|
// L0 Kernel Handle.
|
|
ze_kernel_handle_t zeKernel;
|
|
// Kernel Properties.
|
|
mutable KernelPropertiesTy Properties;
|
|
|
|
Error buildKernel(L0ProgramTy &Program);
|
|
Error readKernelProperties(L0ProgramTy &Program);
|
|
|
|
Error setKernelGroups(L0DeviceTy &l0Device, L0LaunchEnvTy &KEnv,
|
|
uint32_t NumThreads[3], uint32_t NumBlocks[3]) const;
|
|
Error setIndirectFlags(L0DeviceTy &l0Device, L0LaunchEnvTy &KEnv) const;
|
|
|
|
public:
|
|
/// Create a L0 kernel with a name and an execution mode.
|
|
L0KernelTy(const char *Name) : GenericKernelTy(Name), zeKernel(nullptr) {}
|
|
~L0KernelTy() = default;
|
|
L0KernelTy(const L0KernelTy &) = delete;
|
|
L0KernelTy(L0KernelTy &&) = delete;
|
|
L0KernelTy &operator=(const L0KernelTy &) = delete;
|
|
L0KernelTy &operator=(const L0KernelTy &&) = delete;
|
|
|
|
KernelPropertiesTy &getProperties() const { return Properties; }
|
|
|
|
/// Initialize the L0 kernel.
|
|
Error initImpl(GenericDeviceTy &GenericDevice, DeviceImageTy &Image) override;
|
|
/// Launch the L0 kernel function.
|
|
Error launchImpl(GenericDeviceTy &GenericDevice, uint32_t NumThreads[3],
|
|
uint32_t NumBlocks[3], uint32_t DynBlockMemSize,
|
|
KernelArgsTy &KernelArgs, KernelLaunchParamsTy LaunchParams,
|
|
AsyncInfoWrapperTy &AsyncInfoWrapper) const override;
|
|
Error deinit() {
|
|
CALL_ZE_RET_ERROR(zeKernelDestroy, zeKernel);
|
|
return Plugin::success();
|
|
}
|
|
|
|
Expected<uint64_t> maxGroupSize(GenericDeviceTy &GenericDevice,
|
|
uint64_t DynamicMemSize) const override {
|
|
return Plugin::error(ErrorCode::UNIMPLEMENTED,
|
|
"maxGroupSize not implemented yet");
|
|
}
|
|
|
|
Expected<uint32_t>
|
|
getMaxCooperativeGroupCount(GenericDeviceTy &GenericDevice,
|
|
const uint32_t NumThreads[3],
|
|
uint32_t DynBlockMemSize) const override;
|
|
|
|
ze_kernel_handle_t getZeKernel() const { return zeKernel; }
|
|
};
|
|
|
|
} // namespace llvm::omp::target::plugin
|
|
|
|
#endif // OPENMP_LIBOMPTARGET_PLUGINS_NEXTGEN_LEVEL_ZERO_L0KERNEL_H
|