[flang-rt] All flang-rt changes needed for AFAR drop 6.0 (llvm#1326)

Author: ronlieb

flang-rt/include/flang-rt/runtime/terminator.h

@@ -68,7 +68,8 @@ class Terminator {
   template <typename... Args>
   RT_API_ATTRS void PrintCrashArgs(const char *message, Args... args) const {
 #if defined(RT_DEVICE_COMPILATION)
-    std::printf(message, args...);
+    // commenting out temporarily to avoid "error: cannot compile this non-scalar arg in GPU vargs function yet"
+    // std::printf(message, args...);
 #else
     std::fprintf(stderr, message, args...);
 #endif

flang-rt/lib/runtime/copy.cpp

@@ -9,6 +9,7 @@
 #include "copy.h"
 #include "stack.h"
 #include "flang-rt/runtime/descriptor.h"
+#include "flang-rt/runtime/tools.h"
 #include "flang-rt/runtime/terminator.h"
 #include "flang-rt/runtime/type-info.h"
 #include "flang/Runtime/allocatable.h"
@@ -101,7 +102,7 @@ RT_API_ATTRS void CopyElement(const Descriptor &to, const SubscriptValue toAt[],
     char *toPtr{to.Element<char>(toAt)};
     char *fromPtr{from.Element<char>(fromAt)};
     RUNTIME_CHECK(terminator, to.ElementBytes() == from.ElementBytes());
-    std::memcpy(toPtr, fromPtr, to.ElementBytes());
+    Fortran::runtime::memcpy(toPtr, fromPtr, to.ElementBytes());
     return;
   }
 
@@ -148,7 +149,7 @@ RT_API_ATTRS void CopyElement(const Descriptor &to, const SubscriptValue toAt[],
     // Moreover, if we came here from an Component::Genre::Data component,
     // all the per-element copies are redundant, because the parent
     // has already been copied as a whole.
-    std::memcpy(toPtr, fromPtr, curTo.ElementBytes());
+    Fortran::runtime::memcpy(toPtr, fromPtr, curTo.ElementBytes());
     --elements;
     if (elements != 0) {
       currentCopy.IncrementSubscripts(terminator);

flang-rt/lib/runtime/io-api-minimal.cpp

@@ -19,7 +19,9 @@
 #include "flang/Runtime/io-api.h"
 
 namespace Fortran::runtime::io {
+#ifdef RT_OFFLOAD_IO
 RT_EXT_API_GROUP_BEGIN
+#endif
 
 Cookie IODEF(BeginExternalListOutput)(
     ExternalUnit unitNumber, const char *sourceFile, int sourceLine) {
@@ -161,4 +163,6 @@ void std::__libcpp_verbose_abort(char const *format, ...) noexcept(
 }
 #endif
 
+#ifdef RT_OFFLOAD_IO
 RT_EXT_API_GROUP_END
+#endif

flang-rt/lib/runtime/io-api.cpp

@@ -31,7 +31,9 @@
 #include <memory>
 
 namespace Fortran::runtime::io {
+#ifdef RT_OFFLOAD_IO
 RT_EXT_API_GROUP_BEGIN
+#endif
 
 RT_API_ATTRS const char *InquiryKeywordHashDecode(
     char *buffer, std::size_t n, InquiryKeywordHash hash) {
@@ -1315,5 +1317,7 @@ enum Iostat IODEF(CheckUnitNumberInRange128)(common::int128_t unit,
 }
 #endif
 
+#ifdef RT_OFFLOAD_IO
 RT_EXT_API_GROUP_END
+#endif
 } // namespace Fortran::runtime::io

flang-rt/lib/runtime/terminator.cpp

@@ -45,7 +45,8 @@ RT_API_ATTRS void Terminator::CrashHeader() const {
 #if defined(RT_DEVICE_COMPILATION)
   std::printf("\nfatal Fortran runtime error");
   if (sourceFileName_) {
-    std::printf("(%s", sourceFileName_);
+    // commenting out temporarily to avoid ICE seen with amd-staging
+    // std::printf("(%s", sourceFileName_);
     if (sourceLine_) {
       std::printf(":%d", sourceLine_);
     }

flang/include/flang/Runtime/freestanding-tools.h

@@ -110,12 +110,12 @@ using std::fill_n;
 
 #if STD_MEMSET_USE_BUILTIN
 static inline RT_API_ATTRS void memset(
-    void *dest, uint8_t value, std::size_t count) {
+    void *dest, unsigned char value, std::size_t count) {
   __builtin_memset(dest, value, count);
 }
 #elif STD_MEMSET_UNSUPPORTED
 static inline RT_API_ATTRS void memset(
-    void *dest, uint8_t value, std::size_t count) {
+    void *dest, unsigned char value, std::size_t count) {
   char *to{reinterpret_cast<char *>(dest)};
   while (count--) {
     *to++ = value;