merge main into amd-staging

Author: ronlieb

offload/plugins-nextgen/common/include/PluginInterface.h

@@ -319,7 +319,7 @@ struct GenericKernelTy {
                            AsyncInfoWrapperTy &AsyncInfoWrapper) const = 0;
 
   /// Get the kernel name.
-  const char *getName() const { return Name; }
+  const char *getName() const { return Name.c_str(); }
 
   /// Get the kernel image.
   DeviceImageTy &getImage() const {
@@ -482,7 +482,7 @@ struct GenericKernelTy {
                                 bool IsNumThreadsFromUser) const;
 
   /// The kernel name.
-  const char *Name;
+  std::string Name;
 
   /// The execution flags of the kernel.
   OMPTgtExecModeFlags ExecutionMode;

offload/plugins-nextgen/common/src/PluginInterface.cpp

@@ -504,7 +504,7 @@ Error GenericKernelTy::init(GenericDeviceTy &GenericDevice,
     KernelEnvironment = KernelEnvironmentTy{};
     DP("Failed to read kernel environment for '%s' Using default Bare (0) "
        "execution mode\n",
-       Name);
+       getName());
   }
 
   // Create a metadata object for the exec mode global (auto-generated).