Merge commit '2de3274100e0bb2a26cbb1728040cc226b7df6c7' into bolt-2de327

Author: shintaro-iwasaki

libomptarget/include/SourceInfo.h

@@ -0,0 +1,103 @@
+//===------- SourceInfo.h - Target independent OpenMP target RTL -- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// Methods used to describe source information in target regions
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _SOURCE_INFO_H_
+#define _SOURCE_INFO_H_
+
+#include <string>
+
+#ifdef _WIN32
+static const bool OS_WINDOWS = true;
+#else
+static const bool OS_WINDOWS = false;
+#endif
+
+/// Type alias for source location information for variable mappings with
+/// data layout ";name;filename;row;col;;\0" from clang.
+using map_var_info_t = void *;
+
+/// The ident structure that describes a source location from kmp.h. with
+/// source location string data as ";filename;function;line;column;;\0".
+struct ident_t {
+  // Ident_t flags described in kmp.h.
+  int32_t reserved_1;
+  int32_t flags;
+  int32_t reserved_2;
+  int32_t reserved_3;
+  char const *psource;
+};
+
+/// Struct to hold source individual location information.
+class SourceInfo {
+  /// Underlying string copy of the original source information.
+  const std::string sourceStr;
+
+  /// Location fields extracted from the source information string.
+  const std::string name;
+  const std::string filename;
+  const int32_t line;
+  const int32_t column;
+
+  std::string initStr(const void *name) {
+    if (!name)
+      return ";unknown;unknown;0;0;;";
+    else
+      return std::string(reinterpret_cast<const char *>(name));
+  }
+
+  /// Get n-th substring in an expression separated by ;.
+  std::string getSubstring(const int n) const {
+    std::size_t begin = sourceStr.find(';');
+    std::size_t end = sourceStr.find(';', begin + 1);
+    for (int i = 0; i < n; i++) {
+      begin = end;
+      end = sourceStr.find(';', begin + 1);
+    }
+    return sourceStr.substr(begin + 1, end - begin - 1);
+  };
+
+  /// Get the filename from a full path.
+  std::string removePath(const std::string &path) const {
+    std::size_t pos = (OS_WINDOWS) ? path.rfind('\\') : path.rfind('/');
+    return path.substr(pos + 1);
+  };
+
+public:
+  SourceInfo(const ident_t *loc)
+      : sourceStr(initStr(loc->psource)), name(getSubstring(1)),
+        filename(removePath(getSubstring(0))), line(std::stoi(getSubstring(2))),
+        column(std::stoi(getSubstring(3))) {}
+
+  SourceInfo(const map_var_info_t name)
+      : sourceStr(initStr(name)), name(getSubstring(0)),
+        filename(removePath(getSubstring(1))), line(std::stoi(getSubstring(2))),
+        column(std::stoi(getSubstring(3))) {}
+
+  const char *getName() const { return name.c_str(); }
+  const char *getFilename() const { return filename.c_str(); }
+  int32_t getLine() const { return line; }
+  int32_t getColumn() const { return column; }
+  bool isAvailible() const { return (line || column); }
+};
+
+/// Standalone function for getting the variable name of a mapping.
+static inline std::string getNameFromMapping(const map_var_info_t name) {
+  if (!name)
+    return "unknown";
+
+  const std::string name_str(reinterpret_cast<const char *>(name));
+  std::size_t begin = name_str.find(';');
+  std::size_t end = name_str.find(';', begin + 1);
+  return name_str.substr(begin + 1, end - begin - 1);
+}
+
+#endif

libomptarget/include/omptarget.h

@@ -17,6 +17,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#include <SourceInfo.h>
+
 #define OFFLOAD_SUCCESS (0)
 #define OFFLOAD_FAIL (~0)
 
@@ -50,6 +52,8 @@ enum tgt_map_type {
   OMP_TGT_MAPTYPE_CLOSE           = 0x400,
   // runtime error if not already allocated
   OMP_TGT_MAPTYPE_PRESENT         = 0x1000,
+  // descriptor for non-contiguous target-update
+  OMP_TGT_MAPTYPE_NON_CONTIG      = 0x100000000000,
   // member of struct, member given by [16 MSBs] - 1
   OMP_TGT_MAPTYPE_MEMBER_OF       = 0xffff000000000000
 };
@@ -121,6 +125,13 @@ struct __tgt_async_info {
   void *Queue = nullptr;
 };
 
+/// This struct is a record of non-contiguous information
+struct __tgt_target_non_contig {
+  uint64_t Offset;
+  uint64_t Count;
+  uint64_t Stride;
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -161,13 +172,16 @@ void __tgt_target_data_begin_nowait(int64_t device_id, int32_t arg_num,
                                     int32_t depNum, void *depList,
                                     int32_t noAliasDepNum,
                                     void *noAliasDepList);
-void __tgt_target_data_begin_mapper(int64_t device_id, int32_t arg_num,
-                                    void **args_base, void **args,
-                                    int64_t *arg_sizes, int64_t *arg_types,
+void __tgt_target_data_begin_mapper(ident_t *loc, int64_t device_id,
+                                    int32_t arg_num, void **args_base,
+                                    void **args, int64_t *arg_sizes,
+                                    int64_t *arg_types,
+                                    map_var_info_t *arg_names,
                                     void **arg_mappers);
 void __tgt_target_data_begin_nowait_mapper(
-    int64_t device_id, int32_t arg_num, void **args_base, void **args,
-    int64_t *arg_sizes, int64_t *arg_types, void **arg_mappers, int32_t depNum,
+    ident_t *loc, int64_t device_id, int32_t arg_num, void **args_base,
+    void **args, int64_t *arg_sizes, int64_t *arg_types,
+    map_var_info_t *arg_names, void **arg_mappers, int32_t depNum,
     void *depList, int32_t noAliasDepNum, void *noAliasDepList);
 
 // passes data from the target, release target memory and destroys the
@@ -180,16 +194,16 @@ void __tgt_target_data_end_nowait(int64_t device_id, int32_t arg_num,
                                   int64_t *arg_sizes, int64_t *arg_types,
                                   int32_t depNum, void *depList,
                                   int32_t noAliasDepNum, void *noAliasDepList);
-void __tgt_target_data_end_mapper(int64_t device_id, int32_t arg_num,
-                                  void **args_base, void **args,
-                                  int64_t *arg_sizes, int64_t *arg_types,
+void __tgt_target_data_end_mapper(ident_t *loc, int64_t device_id,
+                                  int32_t arg_num, void **args_base,
+                                  void **args, int64_t *arg_sizes,
+                                  int64_t *arg_types, map_var_info_t *arg_names,
                                   void **arg_mappers);
-void __tgt_target_data_end_nowait_mapper(int64_t device_id, int32_t arg_num,
-                                         void **args_base, void **args,
-                                         int64_t *arg_sizes, int64_t *arg_types,
-                                         void **arg_mappers, int32_t depNum,
-                                         void *depList, int32_t noAliasDepNum,
-                                         void *noAliasDepList);
+void __tgt_target_data_end_nowait_mapper(
+    ident_t *loc, int64_t device_id, int32_t arg_num, void **args_base,
+    void **args, int64_t *arg_sizes, int64_t *arg_types,
+    map_var_info_t *arg_names, void **arg_mappers, int32_t depNum,
+    void *depList, int32_t noAliasDepNum, void *noAliasDepList);
 
 /// passes data to/from the target
 void __tgt_target_data_update(int64_t device_id, int32_t arg_num,
@@ -201,13 +215,16 @@ void __tgt_target_data_update_nowait(int64_t device_id, int32_t arg_num,
                                      int32_t depNum, void *depList,
                                      int32_t noAliasDepNum,
                                      void *noAliasDepList);
-void __tgt_target_data_update_mapper(int64_t device_id, int32_t arg_num,
-                                     void **args_base, void **args,
-                                     int64_t *arg_sizes, int64_t *arg_types,
+void __tgt_target_data_update_mapper(ident_t *loc, int64_t device_id,
+                                     int32_t arg_num, void **args_base,
+                                     void **args, int64_t *arg_sizes,
+                                     int64_t *arg_types,
+                                     map_var_info_t *arg_names,
                                      void **arg_mappers);
 void __tgt_target_data_update_nowait_mapper(
-    int64_t device_id, int32_t arg_num, void **args_base, void **args,
-    int64_t *arg_sizes, int64_t *arg_types, void **arg_mappers, int32_t depNum,
+    ident_t *loc, int64_t device_id, int32_t arg_num, void **args_base,
+    void **args, int64_t *arg_sizes, int64_t *arg_types,
+    map_var_info_t *arg_names, void **arg_mappers, int32_t depNum,
     void *depList, int32_t noAliasDepNum, void *noAliasDepList);
 
 // Performs the same actions as data_begin in case arg_num is non-zero
@@ -223,15 +240,16 @@ int __tgt_target_nowait(int64_t device_id, void *host_ptr, int32_t arg_num,
                         void **args_base, void **args, int64_t *arg_sizes,
                         int64_t *arg_types, int32_t depNum, void *depList,
                         int32_t noAliasDepNum, void *noAliasDepList);
-int __tgt_target_mapper(int64_t device_id, void *host_ptr, int32_t arg_num,
-                        void **args_base, void **args, int64_t *arg_sizes,
-                        int64_t *arg_types, void **arg_mappers);
-int __tgt_target_nowait_mapper(int64_t device_id, void *host_ptr,
+int __tgt_target_mapper(ident_t *loc, int64_t device_id, void *host_ptr,
+                        int32_t arg_num, void **args_base, void **args,
+                        int64_t *arg_sizes, int64_t *arg_types,
+                        map_var_info_t *arg_names, void **arg_mappers);
+int __tgt_target_nowait_mapper(ident_t *loc, int64_t device_id, void *host_ptr,
                                int32_t arg_num, void **args_base, void **args,
                                int64_t *arg_sizes, int64_t *arg_types,
-                               void **arg_mappers, int32_t depNum,
-                               void *depList, int32_t noAliasDepNum,
-                               void *noAliasDepList);
+                               map_var_info_t *arg_names, void **arg_mappers,
+                               int32_t depNum, void *depList,
+                               int32_t noAliasDepNum, void *noAliasDepList);
 
 int __tgt_target_teams(int64_t device_id, void *host_ptr, int32_t arg_num,
                        void **args_base, void **args, int64_t *arg_sizes,
@@ -243,18 +261,20 @@ int __tgt_target_teams_nowait(int64_t device_id, void *host_ptr,
                               int32_t num_teams, int32_t thread_limit,
                               int32_t depNum, void *depList,
                               int32_t noAliasDepNum, void *noAliasDepList);
-int __tgt_target_teams_mapper(int64_t device_id, void *host_ptr,
+int __tgt_target_teams_mapper(ident_t *loc, int64_t device_id, void *host_ptr,
                               int32_t arg_num, void **args_base, void **args,
                               int64_t *arg_sizes, int64_t *arg_types,
-                              void **arg_mappers, int32_t num_teams,
-                              int32_t thread_limit);
+                              map_var_info_t *arg_names, void **arg_mappers,
+                              int32_t num_teams, int32_t thread_limit);
 int __tgt_target_teams_nowait_mapper(
-    int64_t device_id, void *host_ptr, int32_t arg_num, void **args_base,
-    void **args, int64_t *arg_sizes, int64_t *arg_types, void **arg_mappers,
-    int32_t num_teams, int32_t thread_limit, int32_t depNum, void *depList,
-    int32_t noAliasDepNum, void *noAliasDepList);
+    ident_t *loc, int64_t device_id, void *host_ptr, int32_t arg_num,
+    void **args_base, void **args, int64_t *arg_sizes, int64_t *arg_types,
+    map_var_info_t *arg_names, void **arg_mappers, int32_t num_teams,
+    int32_t thread_limit, int32_t depNum, void *depList, int32_t noAliasDepNum,
+    void *noAliasDepList);
 
-void __kmpc_push_target_tripcount(int64_t device_id, uint64_t loop_tripcount);
+void __kmpc_push_target_tripcount(ident_t *loc, int64_t device_id,
+                                  uint64_t loop_tripcount);
 
 #ifdef __cplusplus
 }