ROCm · DominikAdamski · Oct 21, 2025 · Oct 22, 2025 · Oct 23, 2025
diff --git a/flang-rt/include/flang-rt/runtime/lock.h b/flang-rt/include/flang-rt/runtime/lock.h
@@ -23,7 +23,9 @@
 #endif
 
 #if USE_PTHREADS
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #include <pthread.h>
+#endif
 #elif defined(_WIN32)
 #include "flang/Common/windows-include.h"
 #else
@@ -45,6 +47,7 @@ class Lock {
   RT_API_ATTRS void Drop() {}
   RT_API_ATTRS bool TakeIfNoDeadlock() { return true; }
 #elif USE_PTHREADS
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
   Lock() { pthread_mutex_init(&mutex_, nullptr); }
   ~Lock() { pthread_mutex_destroy(&mutex_); }
   void Take() {
@@ -68,6 +71,14 @@ class Lock {
     isBusy_ = false;
     pthread_mutex_unlock(&mutex_);
   }
+#else
+  RT_API_ATTRS void Take(){}
+  RT_API_ATTRS bool TakeIfNoDeadlock() {return true;}
+  RT_API_ATTRS bool Try() {return true;}
+  RT_API_ATTRS void Drop() {}
+  Lock() {}
+  ~Lock() {}
+#endif
 #elif defined(_WIN32)
   Lock() { InitializeCriticalSection(&cs_); }
   ~Lock() { DeleteCriticalSection(&cs_); }
@@ -91,9 +102,11 @@ class Lock {
 #if RT_USE_PSEUDO_FILE_UNIT
   // No state.
 #elif USE_PTHREADS
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
   pthread_mutex_t mutex_{};
   volatile bool isBusy_{false};
   volatile pthread_t holder_;
+#endif
 #elif defined(_WIN32)
   CRITICAL_SECTION cs_;
 #else

diff --git a/flang-rt/include/flang-rt/runtime/tools.h b/flang-rt/include/flang-rt/runtime/tools.h
@@ -42,6 +42,12 @@
 #define RT_USE_PSEUDO_FILE_UNIT 1
 #endif
 
+#if defined(__AMDGPU__) && not defined(__NVPTX__) 
+// Use the pseudo lock and pseudo file unit implementations
+// for the device.
+#define RT_USE_PSEUDO_LOCK 1
+#define RT_USE_PSEUDO_FILE_UNIT 1
+#endif
 namespace Fortran::runtime {
 
 class Terminator;

diff --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
@@ -178,7 +178,7 @@ else ()
 endif ()
 
 if ("${LLVM_RUNTIMES_TARGET}" MATCHES "^amdgcn|^nvptx")
-  set(sources ${gpu_sources})
+  set(sources ${supported_sources} ${gpu_sources})
 elseif(FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "CUDA")
   set(sources ${supported_sources})
 else ()

diff --git a/flang-rt/lib/runtime/assign.cpp b/flang-rt/lib/runtime/assign.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/assign.h"
-#include "flang/Runtime/stop.h"
 #include "flang-rt/runtime/assign-impl.h"
 #include "flang-rt/runtime/derived.h"
 #include "flang-rt/runtime/descriptor.h"

diff --git a/flang-rt/lib/runtime/descriptor.cpp b/flang-rt/lib/runtime/descriptor.cpp
@@ -8,7 +8,9 @@
 
 #include "flang-rt/runtime/descriptor.h"
 #include "ISO_Fortran_util.h"
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #include "memory.h"
+#endif
 #include "flang-rt/runtime/allocator-registry.h"
 #include "flang-rt/runtime/derived.h"
 #include "flang-rt/runtime/stat.h"

diff --git a/flang-rt/lib/runtime/edit-input.cpp b/flang-rt/lib/runtime/edit-input.cpp
@@ -569,7 +569,11 @@ static RT_API_ATTRS void RaiseFPExceptions(
 #ifdef feraisexcept // a macro in some environments; omit std::
 #define RAISE feraiseexcept
 #else
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #define RAISE std::feraiseexcept
+#else
+#define RAISE
+#endif
 #endif
 #endif // !defined(RT_DEVICE_COMPILATION)
 

diff --git a/flang-rt/lib/runtime/environment.cpp b/flang-rt/lib/runtime/environment.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if not defined (__AMDGPU__) && not defined(__NVPTX__)
 #include "flang-rt/runtime/environment.h"
 #include "environment-default-list.h"
 #include "memory.h"
@@ -314,3 +315,4 @@ bool RTNAME(RegisterConfigureEnv)(
 } // extern "C"
 
 } // namespace Fortran::runtime
+#endif
diff --git a/flang-rt/lib/runtime/file.cpp b/flang-rt/lib/runtime/file.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #include "flang-rt/runtime/file.h"
 #include "flang-rt/runtime/memory.h"
 #include "flang-rt/runtime/tools.h"
@@ -486,3 +487,4 @@ RT_API_ATTRS std::int64_t SizeInBytes(const char *path) {
 #endif // defined(RT_DEVICE_COMPILATION)
 
 } // namespace Fortran::runtime::io
+#endif
diff --git a/flang-rt/lib/runtime/io-api-minimal.cpp b/flang-rt/lib/runtime/io-api-minimal.cpp
@@ -23,6 +23,7 @@ namespace Fortran::runtime::io {
 RT_EXT_API_GROUP_BEGIN
 #endif
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 Cookie IODEF(BeginExternalListOutput)(
     ExternalUnit unitNumber, const char *sourceFile, int sourceLine) {
   return BeginExternalListIO<Direction::Output, ExternalListIoStatementState>(
@@ -33,6 +34,7 @@ enum Iostat IODEF(EndIoStatement)(Cookie cookie) {
   IoStatementState &io{*cookie};
   return static_cast<enum Iostat>(io.EndIoStatement());
 }
+#endif
 
 template <int KIND, typename INT = CppTypeFor<TypeCategory::Integer, KIND>>
 inline RT_API_ATTRS bool FormattedScalarIntegerOutput(
@@ -45,6 +47,7 @@ inline RT_API_ATTRS bool FormattedScalarIntegerOutput(
   }
 }
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 bool IODEF(OutputInteger8)(Cookie cookie, std::int8_t n) {
   return FormattedScalarIntegerOutput<1>(*cookie, n, "OutputInteger8");
 }
@@ -60,6 +63,7 @@ bool IODEF(OutputInteger32)(Cookie cookie, std::int32_t n) {
 bool IODEF(OutputInteger64)(Cookie cookie, std::int64_t n) {
   return FormattedScalarIntegerOutput<8>(*cookie, n, "OutputInteger64");
 }
+#endif
 
 #ifdef __SIZEOF_INT128__
 bool IODEF(OutputInteger128)(Cookie cookie, common::int128_t n) {
@@ -79,13 +83,15 @@ inline RT_API_ATTRS bool FormattedScalarRealOutput(
   }
 }
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 bool IODEF(OutputReal32)(Cookie cookie, float x) {
   return FormattedScalarRealOutput<4>(*cookie, x, "OutputReal32");
 }
 
 bool IODEF(OutputReal64)(Cookie cookie, double x) {
   return FormattedScalarRealOutput<8>(*cookie, x, "OutputReal64");
 }
+#endif
 
 template <int KIND,
     typename REAL = typename RealOutputEditing<KIND>::BinaryFloatingPoint>
@@ -110,6 +116,7 @@ inline RT_API_ATTRS bool FormattedScalarComplexOutput(
   return false;
 }
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 bool IODEF(OutputComplex32)(Cookie cookie, float re, float im) {
   return FormattedScalarComplexOutput<4>(*cookie, re, im, "OutputComplex32");
 }
@@ -145,6 +152,7 @@ bool IODEF(OutputLogical)(Cookie cookie, bool truth) {
     return false;
   }
 }
+#endif
 
 } // namespace Fortran::runtime::io
 

diff --git a/flang-rt/lib/runtime/io-api.cpp b/flang-rt/lib/runtime/io-api.cpp
@@ -199,12 +199,14 @@ RT_API_ATTRS Cookie BeginExternalFormattedIO(const char *format,
   }
 }
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 Cookie IODEF(BeginExternalFormattedOutput)(const char *format,
     std::size_t formatLength, const Descriptor *formatDescriptor,
     ExternalUnit unitNumber, const char *sourceFile, int sourceLine) {
   return BeginExternalFormattedIO<Direction::Output>(format, formatLength,
       formatDescriptor, unitNumber, sourceFile, sourceLine);
 }
+#endif
 
 Cookie IODEF(BeginExternalFormattedInput)(const char *format,
     std::size_t formatLength, const Descriptor *formatDescriptor,

diff --git a/flang-rt/lib/runtime/stop.cpp b/flang-rt/lib/runtime/stop.cpp
@@ -13,11 +13,15 @@
 #include "flang-rt/runtime/file.h"
 #include "flang-rt/runtime/io-error.h"
 #include "flang-rt/runtime/terminator.h"
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #include "flang/Runtime/main.h"
+#endif
 #include <cfenv>
 #include <cstdio>
 #include <cstdlib>
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #include <thread>
+#endif
 
 #ifdef HAVE_BACKTRACE
 #include BACKTRACE_HEADER
@@ -26,6 +30,7 @@
 extern "C" {
 
 [[maybe_unused]] static void DescribeIEEESignaledExceptions() {
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #ifdef fetestexcept // a macro in some environments; omit std::
   auto excepts{fetestexcept(FE_ALL_EXCEPT)};
 #else
@@ -60,13 +65,15 @@ extern "C" {
 #endif
     std::fputc('\n', stderr);
   }
+#endif
 }
 
 static void CloseAllExternalUnits(const char *why) {
   Fortran::runtime::io::IoErrorHandler handler{why};
   Fortran::runtime::io::ExternalFileUnit::CloseAll(handler);
 }
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 [[noreturn]] RT_API_ATTRS void RTNAME(StopStatement)(
     int code, bool isErrorStop, bool quiet) {
 #if defined(RT_DEVICE_COMPILATION)
@@ -103,7 +110,9 @@ static void CloseAllExternalUnits(const char *why) {
   std::exit(code);
 #endif
 }
+#endif
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 [[noreturn]] RT_API_ATTRS void RTNAME(StopStatementText)(
     const char *code, std::size_t length, bool isErrorStop, bool quiet) {
 #if defined(RT_DEVICE_COMPILATION)
@@ -136,6 +145,7 @@ static void CloseAllExternalUnits(const char *why) {
   }
 #endif
 }
+#endif
 
 static bool StartPause() {
   if (Fortran::runtime::io::IsATerminal(0)) {
@@ -219,12 +229,14 @@ static RT_NOINLINE_ATTR void PrintBacktrace() {
 #endif
 }
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 [[noreturn]] RT_OPTNONE_ATTR void RTNAME(Abort)() {
 #ifdef HAVE_BACKTRACE
   PrintBacktrace();
 #endif
   std::abort();
 }
+#endif
 
 RT_OPTNONE_ATTR void FORTRAN_PROCEDURE_NAME(backtrace)() { PrintBacktrace(); }
 

diff --git a/flang/include/flang/Runtime/extensions.h b/flang/include/flang/Runtime/extensions.h
@@ -18,10 +18,13 @@
 
 #define FORTRAN_PROCEDURE_NAME(name) name##_
 
-#ifdef _WIN32
+#if defined (_WIN32) || defined(__AMDGPU__) || defined(__NVPTX__)
 // UID and GID don't exist on Windows, these exist to avoid errors.
 typedef std::uint32_t uid_t;
 typedef std::uint32_t gid_t;
+#elif defined(__AMDGPU__) || defined(__NVPTX__)
+typedef std::uint32_t uid_t;
+typedef std::uint32_t gid_t;
 #else
 #include "sys/types.h" //pid_t
 #endif

diff --git a/flang/include/flang/Runtime/main.h b/flang/include/flang/Runtime/main.h
@@ -11,11 +11,15 @@
 
 #include "flang/Runtime/c-or-cpp.h"
 #include "flang/Runtime/entry-names.h"
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 #include <thread>
+#endif
 
 struct EnvironmentDefaultList;
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 std::thread::id RTNAME(GetMainThreadId)();
+#endif
 
 FORTRAN_EXTERN_C_BEGIN
 void RTNAME(ProgramStart)(

diff --git a/libcxx/src/string.cpp b/libcxx/src/string.cpp
@@ -360,9 +360,11 @@ wstring to_wstring(unsigned long val) { return i_to_string<wstring>(val); }
 wstring to_wstring(unsigned long long val) { return i_to_string<wstring>(val); }
 #endif
 
+#if not defined(__AMDGPU__) && not defined(__NVPTX__)
 string to_string(float val) { return as_string(snprintf, initial_string< string>()(), "%f", val); }
 string to_string(double val) { return as_string(snprintf, initial_string< string>()(), "%f", val); }
 string to_string(long double val) { return as_string(snprintf, initial_string< string>()(), "%Lf", val); }
+#endif
 
 #if _LIBCPP_HAS_WIDE_CHARACTERS
 wstring to_wstring(float val) { return as_string(get_swprintf(), initial_string<wstring>()(), L"%f", val); }

diff --git a/offload/plugins-nextgen/common/CMakeLists.txt b/offload/plugins-nextgen/common/CMakeLists.txt
@@ -48,7 +48,6 @@ if(OFFLOAD_ENABLE_EMISSARY_APIS AND LIBOMPTARGET_BUILD_DEVICE_FORTRT)
   target_link_libraries(PluginCommon PRIVATE flang_rt.runtime
   -L${CMAKE_BINARY_DIR}/../../lib  -L${CMAKE_INSTALL_PREFIX}/lib)
 endif()
-
 if (OMPT_TARGET_DEFAULT AND LIBOMPTARGET_OMPT_SUPPORT)
   add_library(PluginOmpt STATIC OMPT/OmptTracing.cpp OMPT/OmptProfiler.cpp)
   target_include_directories(PluginOmpt PUBLIC