Skip to content

[Flang][runtime] Fix compilation errors introduced with PR #96652 #97442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 2, 2024
Merged

[Flang][runtime] Fix compilation errors introduced with PR #96652 #97442

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bc31456
Distinguish CPU time and elapsed time
mjklemm Jun 25, 2024
9ec6a00
Rework fallback implementation to use C++11 high-res clock
mjklemm Jun 26, 2024
850589d
Make clang-format happy
mjklemm Jun 26, 2024
7d0dbb0
Add SystemClockCount to the no-cpp-dep.c test
mjklemm Jun 26, 2024
82ca5e2
Fix Windows build
mjklemm Jun 26, 2024
f55b5fa
Test if system_clock() is returning a meaningful result
mjklemm Jun 26, 2024
c9d0959
Reduce precision requirement for the test
mjklemm Jun 27, 2024
a742c2f
Dump std::chrono and use timespec_get instead
mjklemm Jun 27, 2024
940bddf
Remove constantly failing test
mjklemm Jun 27, 2024
a220155
Report proper max for count_max
mjklemm Jun 27, 2024
fc929d0
Refactor code a bit to reduce redundancy
mjklemm Jun 28, 2024
6fa452f
Fix compilation errors introduced with PR #96652
mjklemm Jul 2, 2024
1e6d795
Merge remote-tracking branch 'upstream/main' into fix-system_clock
mjklemm Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flang/runtime/time-intrinsic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static constexpr inline unsigned_count_t GetHUGE(int kind) {
// Function converts a std::timespec_t into the desired count to
// be returned by the timing functions in accordance with the requested
// kind at the call site.
count_t ConvertTimeSpecToCount(int kind, const std::timespec &tspec) {
count_t ConvertTimeSpecToCount(int kind, const struct timespec &tspec) {
const unsigned_count_t huge{GetHUGE(kind)};
unsigned_count_t sec{static_cast<unsigned_count_t>(tspec.tv_sec)};
unsigned_count_t nsec{static_cast<unsigned_count_t>(tspec.tv_nsec)};
Expand All @@ -142,9 +142,9 @@ count_t ConvertTimeSpecToCount(int kind, const std::timespec &tspec) {
// This is the fallback implementation, which should work everywhere.
template <typename Unused = void>
count_t GetSystemClockCount(int kind, fallback_implementation) {
std::timespec tspec;
struct timespec tspec;

if (std::timespec_get(&tspec, TIME_UTC) < 0) {
if (timespec_get(&tspec, TIME_UTC) < 0) {
// Return -HUGE(COUNT) to represent failure.
return -static_cast<count_t>(GetHUGE(kind));
}
Expand Down