[OpenMP] Increment kernel args version, used by runtime for detecting dyn_ptr. (#85363)
A kernel implicit parameter (dyn_ptr) was introduced some time back.
This patch increments the kernel args version for a compiler supporting
dyn_ptr. The version will be used by the runtime to determine whether
the implicit parameter is generated by the compiler. The versioning is
required to support use cases where code generated by an older compiler
is linked with a newer runtime.
If approved, this patch should be backported to release 18.
GitOrigin-RevId: b5d02bbd0d9595501597ddbcf93ac51b160fc8bf
diff --git a/libomptarget/plugins-nextgen/common/include/PluginInterface.h b/libomptarget/plugins-nextgen/common/include/PluginInterface.h
index 118bb7d..b7be7b6 100644
--- a/libomptarget/plugins-nextgen/common/include/PluginInterface.h
+++ b/libomptarget/plugins-nextgen/common/include/PluginInterface.h
@@ -289,7 +289,7 @@
/// Return a device pointer to a new kernel launch environment.
Expected<KernelLaunchEnvironmentTy *>
- getKernelLaunchEnvironment(GenericDeviceTy &GenericDevice,
+ getKernelLaunchEnvironment(GenericDeviceTy &GenericDevice, uint32_t Version,
AsyncInfoWrapperTy &AsyncInfo) const;
/// Indicate whether an execution mode is valid.
diff --git a/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp b/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp
index 414506f..f39f913 100644
--- a/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp
+++ b/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp
@@ -468,11 +468,13 @@
Expected<KernelLaunchEnvironmentTy *>
GenericKernelTy::getKernelLaunchEnvironment(
- GenericDeviceTy &GenericDevice,
+ GenericDeviceTy &GenericDevice, uint32_t Version,
AsyncInfoWrapperTy &AsyncInfoWrapper) const {
// Ctor/Dtor have no arguments, replaying uses the original kernel launch
- // environment.
- if (isCtorOrDtor() || RecordReplay.isReplaying())
+ // environment. Older versions of the compiler do not generate a kernel
+ // launch environment.
+ if (isCtorOrDtor() || RecordReplay.isReplaying() ||
+ Version < OMP_KERNEL_ARG_MIN_VERSION_WITH_DYN_PTR)
return nullptr;
if (!KernelEnvironment.Configuration.ReductionDataSize ||
@@ -544,8 +546,8 @@
llvm::SmallVector<void *, 16> Args;
llvm::SmallVector<void *, 16> Ptrs;
- auto KernelLaunchEnvOrErr =
- getKernelLaunchEnvironment(GenericDevice, AsyncInfoWrapper);
+ auto KernelLaunchEnvOrErr = getKernelLaunchEnvironment(
+ GenericDevice, KernelArgs.Version, AsyncInfoWrapper);
if (!KernelLaunchEnvOrErr)
return KernelLaunchEnvOrErr.takeError();
@@ -586,6 +588,9 @@
uint32_t KLEOffset = !!KernelLaunchEnvironment;
NumArgs += KLEOffset;
+ if (NumArgs == 0)
+ return nullptr;
+
Args.resize(NumArgs);
Ptrs.resize(NumArgs);
diff --git a/libomptarget/src/interface.cpp b/libomptarget/src/interface.cpp
index 8b89bc3..b7f547f 100644
--- a/libomptarget/src/interface.cpp
+++ b/libomptarget/src/interface.cpp
@@ -21,6 +21,8 @@
#include "Utils/ExponentialBackoff.h"
+#include "llvm/Frontend/OpenMP/OMPConstants.h"
+
#include <cassert>
#include <cstdint>
#include <cstdio>
@@ -218,11 +220,19 @@
static KernelArgsTy *upgradeKernelArgs(KernelArgsTy *KernelArgs,
KernelArgsTy &LocalKernelArgs,
int32_t NumTeams, int32_t ThreadLimit) {
- if (KernelArgs->Version > 2)
+ if (KernelArgs->Version > OMP_KERNEL_ARG_VERSION)
DP("Unexpected ABI version: %u\n", KernelArgs->Version);
- if (KernelArgs->Version == 1) {
- LocalKernelArgs.Version = 2;
+ uint32_t UpgradedVersion = KernelArgs->Version;
+ if (KernelArgs->Version < OMP_KERNEL_ARG_VERSION) {
+ // The upgraded version will be based on the kernel launch environment.
+ if (KernelArgs->Version < OMP_KERNEL_ARG_MIN_VERSION_WITH_DYN_PTR)
+ UpgradedVersion = OMP_KERNEL_ARG_MIN_VERSION_WITH_DYN_PTR - 1;
+ else
+ UpgradedVersion = OMP_KERNEL_ARG_VERSION;
+ }
+ if (UpgradedVersion != KernelArgs->Version) {
+ LocalKernelArgs.Version = UpgradedVersion;
LocalKernelArgs.NumArgs = KernelArgs->NumArgs;
LocalKernelArgs.ArgBasePtrs = KernelArgs->ArgBasePtrs;
LocalKernelArgs.ArgPtrs = KernelArgs->ArgPtrs;
diff --git a/libomptarget/src/omptarget.cpp b/libomptarget/src/omptarget.cpp
index 3b3e17f..5bbf3a4 100644
--- a/libomptarget/src/omptarget.cpp
+++ b/libomptarget/src/omptarget.cpp
@@ -30,6 +30,7 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/bit.h"
+#include "llvm/Frontend/OpenMP/OMPConstants.h"
#include "llvm/Object/ObjectFile.h"
#include <cassert>
@@ -1752,7 +1753,7 @@
Device.submitData(TgtPtr, DeviceMemory, DeviceMemorySize, AsyncInfo);
KernelArgsTy KernelArgs = {0};
- KernelArgs.Version = 2;
+ KernelArgs.Version = OMP_KERNEL_ARG_VERSION;
KernelArgs.NumArgs = NumArgs;
KernelArgs.Tripcount = LoopTripCount;
KernelArgs.NumTeams[0] = NumTeams;
