[flang] [llvm] [flang][device] Enable Stop functions on device build (PR #133803)
Valentin Clement バレンタイン クレメン via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 31 15:30:12 PDT 2025
https://github.com/clementval updated https://github.com/llvm/llvm-project/pull/133803
>From 8d7ece1f7816bf8995bb019507cf96508ea8ef39 Mon Sep 17 00:00:00 2001
From: Valentin Clement <clementval at gmail.com>
Date: Thu, 27 Feb 2025 11:36:43 -0800
Subject: [PATCH 1/3] [flang][device] Enable Stop functions on device build
---
flang-rt/lib/runtime/CMakeLists.txt | 1 +
flang-rt/lib/runtime/stop.cpp | 36 +++++++++++++++++++++++++++--
flang/include/flang/Runtime/stop.h | 7 +++---
3 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
index 572b4d54552c1..c5e7bdce5b2fd 100644
--- a/flang-rt/lib/runtime/CMakeLists.txt
+++ b/flang-rt/lib/runtime/CMakeLists.txt
@@ -57,6 +57,7 @@ set(supported_sources
pseudo-unit.cpp
ragged.cpp
stat.cpp
+ stop.cpp
sum.cpp
support.cpp
terminator.cpp
diff --git a/flang-rt/lib/runtime/stop.cpp b/flang-rt/lib/runtime/stop.cpp
index 1d70a137377aa..9f87f5f693357 100644
--- a/flang-rt/lib/runtime/stop.cpp
+++ b/flang-rt/lib/runtime/stop.cpp
@@ -65,8 +65,25 @@ static void CloseAllExternalUnits(const char *why) {
Fortran::runtime::io::ExternalFileUnit::CloseAll(handler);
}
-[[noreturn]] void RTNAME(StopStatement)(
+[[noreturn]] RT_API_ATTRS void RTNAME(StopStatement)(
int code, bool isErrorStop, bool quiet) {
+#if defined(RT_DEVICE_COMPILATION)
+ if (Fortran::runtime::executionEnvironment.noStopMessage && code == 0) {
+ quiet = true;
+ }
+ if (!quiet) {
+ if (isErrorStop) {
+ std::printf("Fortran ERROR STOP");
+ } else {
+ std::printf("Fortran STOP");
+ }
+ if (code != EXIT_SUCCESS) {
+ std::printf(": code %d\n", code);
+ }
+ std::printf('\n');
+ }
+ assert();
+#else
CloseAllExternalUnits("STOP statement");
if (Fortran::runtime::executionEnvironment.noStopMessage && code == 0) {
quiet = true;
@@ -80,10 +97,24 @@ static void CloseAllExternalUnits(const char *why) {
DescribeIEEESignaledExceptions();
}
std::exit(code);
+#endif
}
-[[noreturn]] void RTNAME(StopStatementText)(
+[[noreturn]] RT_API_ATTRS void RTNAME(StopStatementText)(
const char *code, std::size_t length, bool isErrorStop, bool quiet) {
+#if defined(RT_DEVICE_COMPILATION)
+ if (!quiet) {
+ if (Fortran::runtime::executionEnvironment.noStopMessage && !isErrorStop) {
+ std::printf("%.*s\n", static_cast<int>(length), code);
+ } else {
+ std::printf("Fortran %s: %.*s\n", isErrorStop ? "ERROR STOP" : "STOP",
+ static_cast<int>(length), code);
+ }
+ }
+ if (isErrorStop) {
+ assert();
+ }
+#else
CloseAllExternalUnits("STOP statement");
if (!quiet) {
if (Fortran::runtime::executionEnvironment.noStopMessage && !isErrorStop) {
@@ -99,6 +130,7 @@ static void CloseAllExternalUnits(const char *why) {
} else {
std::exit(EXIT_SUCCESS);
}
+#endif
}
static bool StartPause() {
diff --git a/flang/include/flang/Runtime/stop.h b/flang/include/flang/Runtime/stop.h
index 24ae2cbe01ec6..02bce65765907 100644
--- a/flang/include/flang/Runtime/stop.h
+++ b/flang/include/flang/Runtime/stop.h
@@ -17,9 +17,10 @@
FORTRAN_EXTERN_C_BEGIN
// Program-initiated image stop
-NORETURN void RTNAME(StopStatement)(int code DEFAULT_VALUE(EXIT_SUCCESS),
- bool isErrorStop DEFAULT_VALUE(false), bool quiet DEFAULT_VALUE(false));
-NORETURN void RTNAME(StopStatementText)(const char *, size_t,
+NORETURN RT_API_ATTRS void RTNAME(StopStatement)(
+ int code DEFAULT_VALUE(EXIT_SUCCESS), bool isErrorStop DEFAULT_VALUE(false),
+ bool quiet DEFAULT_VALUE(false));
+NORETURN RT_API_ATTRS void RTNAME(StopStatementText)(const char *, size_t,
bool isErrorStop DEFAULT_VALUE(false), bool quiet DEFAULT_VALUE(false));
void RTNAME(PauseStatement)(NO_ARGUMENTS);
void RTNAME(PauseStatementInt)(int);
>From 4a071df9092d7cb75452b5951de08d060e02cd70 Mon Sep 17 00:00:00 2001
From: Valentin Clement <clementval at gmail.com>
Date: Mon, 31 Mar 2025 15:28:00 -0700
Subject: [PATCH 2/3] Use same pattern as terminator.cpp
---
flang-rt/lib/runtime/stop.cpp | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/flang-rt/lib/runtime/stop.cpp b/flang-rt/lib/runtime/stop.cpp
index 9f87f5f693357..a141186dc8184 100644
--- a/flang-rt/lib/runtime/stop.cpp
+++ b/flang-rt/lib/runtime/stop.cpp
@@ -82,7 +82,15 @@ static void CloseAllExternalUnits(const char *why) {
}
std::printf('\n');
}
- assert();
+#if defined(__CUDACC__)
+ // NVCC supports __trap().
+ __trap();
+#elif defined(__clang__)
+ // Clang supports __builtin_trap().
+ __builtin_trap();
+#else
+#error "unsupported compiler"
+#endif
#else
CloseAllExternalUnits("STOP statement");
if (Fortran::runtime::executionEnvironment.noStopMessage && code == 0) {
@@ -112,7 +120,15 @@ static void CloseAllExternalUnits(const char *why) {
}
}
if (isErrorStop) {
- assert();
+#if defined(__CUDACC__)
+ // NVCC supports __trap().
+ __trap();
+#elif defined(__clang__)
+ // Clang supports __builtin_trap().
+ __builtin_trap();
+#else
+#error "unsupported compiler"
+#endif
}
#else
CloseAllExternalUnits("STOP statement");
>From ba5df7ca78b425adc660125f520523ad42f40409 Mon Sep 17 00:00:00 2001
From: Valentin Clement <clementval at gmail.com>
Date: Mon, 31 Mar 2025 15:30:00 -0700
Subject: [PATCH 3/3] Use simpler format
---
flang-rt/lib/runtime/stop.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flang-rt/lib/runtime/stop.cpp b/flang-rt/lib/runtime/stop.cpp
index a141186dc8184..c5f3b55064fa5 100644
--- a/flang-rt/lib/runtime/stop.cpp
+++ b/flang-rt/lib/runtime/stop.cpp
@@ -113,10 +113,10 @@ static void CloseAllExternalUnits(const char *why) {
#if defined(RT_DEVICE_COMPILATION)
if (!quiet) {
if (Fortran::runtime::executionEnvironment.noStopMessage && !isErrorStop) {
- std::printf("%.*s\n", static_cast<int>(length), code);
+ std::printf("%s\n", code);
} else {
- std::printf("Fortran %s: %.*s\n", isErrorStop ? "ERROR STOP" : "STOP",
- static_cast<int>(length), code);
+ std::printf("Fortran %s: %s\n", isErrorStop ? "ERROR STOP" : "STOP",
+ code);
}
}
if (isErrorStop) {
More information about the llvm-commits
mailing list