Revert "[Offload] Don't check in generated files (llvm#141982)"

This reverts commit b78bc35.

Author: ronlieb

offload/CMakeLists.txt

@@ -427,7 +427,23 @@ set(LIBOMPTARGET_LLVM_LIBRARY_DIR "${LLVM_LIBRARY_DIR}" CACHE STRING
 set(LIBOMPTARGET_LLVM_LIBRARY_INTDIR "${LIBOMPTARGET_INTDIR}" CACHE STRING
   "Path to folder where intermediate libraries will be output")
 
-add_subdirectory(tools/offload-tblgen)
+if(SANITIZER_AMDGPU)
+  add_definitions(-DSANITIZER_AMDGPU=1)
+  # Check for COMGr package , ASan requires COMGr with minimum version 2.4
+  find_package(amd_comgr QUIET 2.4.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
+endif()
+
+# An Emissary API is a subset of Host APIs that are executed from Offload devices
+# using the offload RPC mechanism such as FORTRAN IO runtime and MPI.
+option(OFFLOAD_ENABLE_EMISSARY_APIS "Enable build of GPU Emissary APIs" ON)
+if(OFFLOAD_ENABLE_EMISSARY_APIS)
+  # Header install location
+  add_definitions(-DOFFLOAD_ENABLE_EMISSARY_APIS)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/DeviceRTL/include/EmissaryIds.h
+    DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH})
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/DeviceRTL/include/EmissaryMPI.h
+    DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH})
+endif()
 
 # Build offloading plugins and device RTLs if they are available.
 add_subdirectory(plugins-nextgen)
@@ -438,7 +454,9 @@ add_subdirectory(DeviceRTL)
 # Build target agnostic offloading library.
 add_subdirectory(libomptarget)
 
-add_subdirectory(liboffload)
+# FIXME: Re-enable once OMPT design allows
+# add_subdirectory(tools/offload-tblgen)
+# add_subdirectory(liboffload)
 
 # Add tests.
 add_subdirectory(test)

offload/include/Shared/OffloadErrcodes.inc

@@ -0,0 +1,51 @@
+//===- Auto-generated file, part of the LLVM/Offload project --------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef OFFLOAD_ERRC
+#error Please define the macro OFFLOAD_ERRCODE(Name, Desc, Value)
+#endif
+
+// Error codes are shared between PluginInterface and liboffload.
+// To add new error codes, add them to offload/liboffload/API/Common.td and run
+// the GenerateOffload target.
+
+OFFLOAD_ERRC(SUCCESS, "success", 0)
+OFFLOAD_ERRC(UNKNOWN, "unknown or internal error", 1)
+OFFLOAD_ERRC(HOST_IO, "I/O error on host", 2)
+OFFLOAD_ERRC(INVALID_BINARY, "a provided binary image is malformed", 3)
+OFFLOAD_ERRC(INVALID_NULL_POINTER,
+             "a pointer argument is null when it should not be", 4)
+OFFLOAD_ERRC(INVALID_ARGUMENT, "an argument is invalid", 5)
+OFFLOAD_ERRC(NOT_FOUND, "requested object was not found in the binary image", 6)
+OFFLOAD_ERRC(OUT_OF_RESOURCES, "out of resources", 7)
+OFFLOAD_ERRC(
+    INVALID_SIZE,
+    "invalid size or dimensions (e.g., must not be zero, or is out of bounds)",
+    8)
+OFFLOAD_ERRC(INVALID_ENUMERATION, "enumerator argument is not valid", 9)
+OFFLOAD_ERRC(HOST_TOOL_NOT_FOUND,
+             "a required binary (linker, etc.) was not found on the host", 10)
+OFFLOAD_ERRC(INVALID_VALUE, "invalid value", 11)
+OFFLOAD_ERRC(UNIMPLEMENTED,
+             "generic error code for features currently unimplemented by the "
+             "device/backend",
+             12)
+OFFLOAD_ERRC(
+    UNSUPPORTED,
+    "generic error code for features unsupported by the device/backend", 13)
+OFFLOAD_ERRC(ASSEMBLE_FAILURE,
+             "assembler failure while processing binary image", 14)
+OFFLOAD_ERRC(LINK_FAILURE, "linker failure while processing binary image", 15)
+OFFLOAD_ERRC(BACKEND_FAILURE,
+             "the plugin backend is in an invalid or unsupported state", 16)
+OFFLOAD_ERRC(INVALID_NULL_HANDLE,
+             "a handle argument is null when it should not be", 17)
+OFFLOAD_ERRC(INVALID_PLATFORM, "invalid platform", 18)
+OFFLOAD_ERRC(INVALID_DEVICE, "invalid device", 19)
+OFFLOAD_ERRC(INVALID_QUEUE, "invalid queue", 20)
+OFFLOAD_ERRC(INVALID_EVENT, "invalid event", 21)

offload/plugins-nextgen/common/include/OffloadError.h renamed to offload/include/Shared/OffloadError.h

@@ -18,7 +18,7 @@ namespace error {
 
 enum class ErrorCode {
 #define OFFLOAD_ERRC(Name, _, Value) Name = Value,
-#include "OffloadErrcodes.inc"
+#include "Shared/OffloadErrcodes.inc"
 #undef OFFLOAD_ERRC
 };
 

offload/liboffload/API/CMakeLists.txt

@@ -1,46 +1,29 @@
-# We want to clang-format the generated files if possible, since OffloadAPI.h is
-# the main public header for liboffload. Generate them in a temporary location,
-# then clang-format and copy them to the proper location. If clang-format is
-# missing just copy them.
-# Ideally we'd just clang-format them in place and avoid the copy but cmake
-# gets confused about the same path being a byproduct of two custom commands.
+# The OffloadGenerate target is used to regenerate the generated files in the
+# include directory. These files are checked in with the rest of the source,
+# therefore it is only needed when making changes to the API.
 
-set(LLVM_TARGET_DEFINITIONS ${CMAKE_CURRENT_SOURCE_DIR}/OffloadAPI.td)
-set(files_to_copy "")
+find_program(CLANG_FORMAT clang-format PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
+if (CLANG_FORMAT)
+    set(LLVM_TARGET_DEFINITIONS ${CMAKE_CURRENT_SOURCE_DIR}/OffloadAPI.td)
 
-macro(offload_tablegen file)
-    tablegen(OFFLOAD generated/${file}.gen ${ARGN})
-    list(APPEND files_to_copy ${file})
-endmacro()
+    tablegen(OFFLOAD OffloadAPI.h -gen-api)
+    tablegen(OFFLOAD OffloadEntryPoints.inc -gen-entry-points)
+    tablegen(OFFLOAD OffloadFuncs.inc -gen-func-names)
+    tablegen(OFFLOAD OffloadImplFuncDecls.inc -gen-impl-func-decls)
+    tablegen(OFFLOAD OffloadPrint.hpp -gen-print-header)
+    tablegen(OFFLOAD OffloadErrcodes.inc -gen-errcodes)
 
-offload_tablegen(OffloadAPI.h -gen-api)
-offload_tablegen(OffloadEntryPoints.inc -gen-entry-points)
-offload_tablegen(OffloadFuncs.inc -gen-func-names)
-offload_tablegen(OffloadImplFuncDecls.inc -gen-impl-func-decls)
-offload_tablegen(OffloadPrint.hpp -gen-print-header)
-
-add_public_tablegen_target(OffloadGenerate)
-
-add_custom_target(OffloadAPI DEPENDS OffloadGenerate)
-find_program(clang_format clang-format PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
-if (clang_format)
-    foreach(file IN LISTS files_to_copy)
-      add_custom_command(
-          OUTPUT ${file}
-          COMMAND ${clang_format} -i generated/${file}.gen
-          COMMAND ${CMAKE_COMMAND} -E copy_if_different generated/${file}.gen ${CMAKE_CURRENT_BINARY_DIR}/${file}
-          DEPENDS generated/${file}.gen
-      )
-      add_custom_target(OffloadAPI.${file} DEPENDS ${file})
-      add_dependencies(OffloadAPI OffloadAPI.${file})
-    endforeach()
+    set(FILES_TO_COPY "OffloadAPI.h;OffloadEntryPoints.inc;OffloadFuncs.inc;OffloadImplFuncDecls.inc;OffloadPrint.hpp")
+    set(GEN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../include/generated)
+    add_public_tablegen_target(OffloadGenerate)
+    add_custom_command(TARGET OffloadGenerate POST_BUILD COMMAND ${CLANG_FORMAT}
+        -i ${TABLEGEN_OUTPUT})
+    add_custom_command(TARGET OffloadGenerate POST_BUILD COMMAND ${CMAKE_COMMAND}
+        -E copy_if_different ${FILES_TO_COPY} ${GEN_DIR})
+    add_custom_command(TARGET OffloadGenerate POST_BUILD COMMAND ${CMAKE_COMMAND}
+        -E copy_if_different OffloadErrcodes.inc "${LIBOMPTARGET_INCLUDE_DIR}/Shared/OffloadErrcodes.inc")
 else()
-    message(WARNING "clang-format not found, the generated Offload API headers will not be formatted")
-    foreach(file IN LISTS files_to_copy)
-        add_custom_command(
-            OUTPUT ${file}
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different generated/${file}.gen ${CMAKE_CURRENT_BINARY_DIR}/${file}
-            DEPENDS generated/${file}.gen
-        )
-    endforeach()
+    message(WARNING "clang-format was not found, so the OffloadGenerate target\
+        will not be available. Offload will still build, but you will not be\
+        able to make changes to the API.")
 endif()

offload/liboffload/CMakeLists.txt

@@ -8,10 +8,6 @@ add_llvm_library(
   LINK_COMPONENTS
   FrontendOpenMP
   Support
-
-  DEPENDS
-  OffloadAPI
-  PluginErrcodes
   )
 
 foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)
@@ -23,13 +19,11 @@ if(LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
 endif()
 
 target_include_directories(LLVMOffload PUBLIC
-                            ${CMAKE_CURRENT_BINARY_DIR}/API
                             ${CMAKE_CURRENT_BINARY_DIR}/../include
                             ${CMAKE_CURRENT_SOURCE_DIR}/include
+                            ${CMAKE_CURRENT_SOURCE_DIR}/include/generated
                             ${CMAKE_CURRENT_SOURCE_DIR}/../include
-                            ${CMAKE_CURRENT_SOURCE_DIR}/../plugins-nextgen/common/include
-                            ${CMAKE_CURRENT_BINARY_DIR}/../plugins-nextgen/common/include
-                            )
+                            ${CMAKE_CURRENT_SOURCE_DIR}/../plugins-nextgen/common/include)
 
 target_compile_options(LLVMOffload PRIVATE ${offload_compile_flags})
 target_link_options(LLVMOffload PRIVATE ${offload_link_flags})
@@ -45,5 +39,5 @@ set_target_properties(LLVMOffload PROPERTIES
                       BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/..")
 install(TARGETS LLVMOffload LIBRARY COMPONENT LLVMOffload DESTINATION "${OFFLOAD_INSTALL_LIBDIR}")
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/API/OffloadAPI.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/offload)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/API/OffloadPrint.hpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include/offload)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/generated/OffloadAPI.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/offload)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/generated/OffloadPrint.hpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include/offload)