Fix liboffload_new linking and formatting

Author: callumfare

offload/new-api/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 set(LLVM_TARGET_DEFINITIONS ${CMAKE_CURRENT_SOURCE_DIR}/API/OffloadAPI.td)
 list(APPEND LLVM_TABLEGEN_FLAGS -I ${CMAKE_CURRENT_SOURCE_DIR}/API)
 
@@ -7,25 +6,31 @@ tablegen(OFFLOAD offload_funcs.inc -gen-func-names)
 tablegen(OFFLOAD offload_impl_func_decls.inc -gen-impl-func-decls)
 tablegen(OFFLOAD offload_entry_points.inc -gen-entry-points)
 tablegen(OFFLOAD offload_print.hpp -gen-print-header)
-
+tablegen(OFFLOAD offload_exports -gen-exports)
 
 add_public_tablegen_target(OffloadHeaderGen)
 
 add_llvm_library(offload_new SHARED
                 src/offload_lib.cpp
                 src/offload_impl.cpp
-                DEPENDS OffloadHeaderGen
-                LINK_LIBS omptarget omptarget.rtl.cuda omptarget.rtl.amdgpu)
+                DEPENDS OffloadHeaderGen)
+
+foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)
+    target_link_libraries(offload_new PRIVATE omptarget.rtl.${plugin})
+endforeach()
+
+if(LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+    target_link_libraries(offload_new PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/offload_exports")
+endif()
 
 target_include_directories(offload_new PUBLIC
                             ${CMAKE_CURRENT_BINARY_DIR}
                             ${CMAKE_CURRENT_BINARY_DIR}/../include
                             ${CMAKE_CURRENT_SOURCE_DIR}/../include
                             ${CMAKE_CURRENT_SOURCE_DIR}/../plugins-nextgen/common/include)
 
-# foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)
-#     target_link_libraries(offload_new PRIVATE omptarget.rtl.${plugin})
-# endforeach()
+target_compile_options(offload_new PRIVATE ${offload_compile_flags})
+target_link_options(offload_new PRIVATE ${offload_link_flags})
 
 set_target_properties(offload_new PROPERTIES
                       POSITION_INDEPENDENT_CODE ON

offload/new-api/src/helpers.hpp

@@ -16,7 +16,6 @@
 
 #include <cstring>
 
-
 template <typename T, typename Assign>
 offload_result_t getInfoImpl(size_t ParamValueSize, void *ParamValue,
                              size_t *ParamValueSizeRet, T Value,

offload/new-api/src/offload_impl.cpp

@@ -32,7 +32,10 @@ struct offload_platform_handle_t_ {
   std::vector<offload_device_handle_t_> Devices;
 };
 
-static std::vector<offload_platform_handle_t_> Platforms;
+std::vector<offload_platform_handle_t_> &Platforms() {
+  static std::vector<offload_platform_handle_t_> Platforms;
+  return Platforms;
+}
 
 // Every plugin exports this method to create an instance of the plugin type.
 #define PLUGIN_TARGET(Name) extern "C" GenericPluginTy *createPlugin_##Name();
@@ -42,14 +45,14 @@ void initPlugins() {
   // Attempt to create an instance of each supported plugin.
 #define PLUGIN_TARGET(Name)                                                    \
   do {                                                                         \
-    Platforms.emplace_back(offload_platform_handle_t_{                         \
+    Platforms().emplace_back(offload_platform_handle_t_{                       \
         std::unique_ptr<GenericPluginTy>(createPlugin_##Name()), {}});         \
   } while (false);
 #include "Shared/Targets.def"
 
   // Preemptively initialize all devices in the plugin so we can just return
   // them from deviceGet
-  for (auto &Platform : Platforms) {
+  for (auto &Platform : Platforms()) {
     auto Err = Platform.Plugin->init();
     [[maybe_unused]] std::string InfoMsg = toString(std::move(Err));
     for (auto DevNum = 0; DevNum < Platform.Plugin->number_of_devices();
@@ -71,19 +74,19 @@ offload_result_t offloadPlatformGet_impl(uint32_t NumEntries,
   static std::once_flag InitFlag;
   std::call_once(InitFlag, initPlugins);
 
-  if (NumEntries > Platforms.size()) {
+  if (NumEntries > Platforms().size()) {
     return OFFLOAD_RESULT_ERROR_INVALID_SIZE;
   }
 
   if (phPlatforms) {
     for (uint32_t PlatformIndex = 0; PlatformIndex < NumEntries;
          PlatformIndex++) {
-      phPlatforms[PlatformIndex] = &Platforms[PlatformIndex];
+      phPlatforms[PlatformIndex] = &(Platforms())[PlatformIndex];
     }
   }
 
   if (pNumPlatforms) {
-    *pNumPlatforms = Platforms.size();
+    *pNumPlatforms = Platforms().size();
   }
 
   return OFFLOAD_RESULT_SUCCESS;

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

@@ -132,7 +132,6 @@ class InfoQueueTy {
     uint64_t Level;
   };
 
-
 private:
   std::deque<InfoQueueEntryTy> Queue;
 
@@ -156,9 +155,7 @@ class InfoQueueTy {
       Queue.push_back({Key, Value, Units, L});
   }
 
-  const std::deque<InfoQueueEntryTy> &getQueue() const {
-    return Queue;
-  }
+  const std::deque<InfoQueueEntryTy> &getQueue() const { return Queue; }
 
   /// Print all info entries added to the queue.
   void print() const {

offload/tools/offload-tblgen/FuncsGen.cpp

@@ -1,13 +1,13 @@
-//===- offload-tblgen/APIGen.cpp - Tablegen backend for Offload validation ===//
+//===- offload-tblgen/APIGen.cpp - Tablegen backend for Offload functions -===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 //
-// This is a Tablegen backend that produces validation functions for the Offload
-// API entry point functions.
+// This is a Tablegen backend that handles generation of various small files
+// pertaining to the API functions.
 //
 //===----------------------------------------------------------------------===//
 
@@ -36,6 +36,19 @@ void EmitOffloadFuncNames(RecordKeeper &Records, raw_ostream &OS) {
   OS << "\n#undef OFFLOAD_FUNC\n";
 }
 
+void EmitOffloadExports(RecordKeeper &Records, raw_ostream &OS) {
+  OS << "VERS1.0 {\n";
+  OS << TAB_1 "global:\n";
+
+  for (auto *R : Records.getAllDerivedDefinitions("Function")) {
+    OS << formatv(TAB_2 "{0};\n", FunctionRec(R).getName());
+  }
+  OS << TAB_1 "local:\n";
+  OS << TAB_2 "*;\n";
+  OS << "};\n";
+}
+
+// Emit declarations for every implementation function
 void EmitOffloadImplFuncDecls(RecordKeeper &Records, raw_ostream &OS) {
   for (auto *R : Records.getAllDerivedDefinitions("Function")) {
     FunctionRec F{R};

offload/tools/offload-tblgen/GenCommon.hpp

@@ -55,4 +55,3 @@ MakeParamComment(const llvm::offload::tblgen::ParamRec &Param) {
                        (Param.isOut() ? "[out]" : ""),
                        (Param.isOpt() ? "[optional]" : ""), Param.getDesc());
 }
-

offload/tools/offload-tblgen/Generators.hpp

@@ -16,3 +16,4 @@ void EmitOffloadImplFuncDecls(llvm::RecordKeeper &Records,
                               llvm::raw_ostream &OS);
 void EmitOffloadEntryPoints(llvm::RecordKeeper &Records, llvm::raw_ostream &OS);
 void EmitOffloadPrintHeader(llvm::RecordKeeper &Records, llvm::raw_ostream &OS);
+void EmitOffloadExports(llvm::RecordKeeper &Records, llvm::raw_ostream &OS);

offload/tools/offload-tblgen/offload-tblgen.cpp

@@ -29,7 +29,8 @@ enum ActionType {
   GenFuncNames,
   GenImplFuncDecls,
   GenEntryPoints,
-  GenPrintHeader
+  GenPrintHeader,
+  GenExports
 };
 
 namespace {
@@ -49,7 +50,9 @@ cl::opt<ActionType> Action(
         clEnumValN(GenEntryPoints, "gen-entry-points",
                    "Generate Offload API wrapper function definitions"),
         clEnumValN(GenPrintHeader, "gen-print-header",
-                   "Generate Offload API print header")));
+                   "Generate Offload API print header"),
+        clEnumValN(GenExports, "gen-exports",
+                   "Generate export file for the Offload library")));
 }
 
 static bool OffloadTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
@@ -75,6 +78,9 @@ static bool OffloadTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
   case GenPrintHeader:
     EmitOffloadPrintHeader(Records, OS);
     break;
+  case GenExports:
+    EmitOffloadExports(Records, OS);
+    break;
   }
 
   return false;