Repository navigation
Restore Cray !DIR$ directives mangled into comments by the formatter - #2000
Closed
sbryngelson wants to merge 3 commits into
Closed
sbryngelson wants to merge 3 commits into
sbryngelson wants to merge 3 commits into
Conversation
The switch to ffmt (52e8af1) rewrote every "!DIR$ ..." line as a "! DIR$ ..." comment, which CCE ignores: OPTIMIZE (-haggress) in m_igr.fpp and m_time_steppers.fpp, the IGR "unroll 4/6" hints, and the CCE 19 IPA NOINLINE workaround in m_phase_change.fpp (where ffmt also merged the three directives into one comment). ffmt has no option to leave directive lines alone and re-mangles them on every format run. Add a CRAY_DIR Fypp macro that emits "!DIR$ <directive>" under #ifdef _CRAYFTN, following the GPU_ROUTINE cray_inline pattern, and use it for all of these. The directive text is restored from 52e8af1^ (s_TSat dropped from the NOINLINE list, since it no longer exists). The unroll hints, previously unguarded, are now Cray-only. Verified that ffmt --check leaves the files unchanged, and that Fypp output with MFC_COMPILER=Cray contains each !DIR$ line inside an #ifdef _CRAYFTN block (unroll 6 checked with case optimization and igr_order = 5). Not compiled with CCE.
Lines of Code
|
Member
Author
|
Closing this for now to bring the number of open PRs from me down to four, so the ones that stay open get real review attention rather than being lost in a queue of 35. No work is lost and nothing needs re-doing. The branch I intend to reopen these in small batches as the open slots free up. Apologies for the notification noise. Opened and closed with Claude Code. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The switch to ffmt (52e8af1) rewrote every "!DIR$ ..." line as a
"! DIR$ ..." comment, which CCE ignores: OPTIMIZE (-haggress) in
m_igr.fpp and m_time_steppers.fpp, the IGR "unroll 4/6" hints, and the
CCE 19 IPA NOINLINE workaround in m_phase_change.fpp (where ffmt also
merged the three directives into one comment). ffmt has no option to
leave directive lines alone and re-mangles them on every format run.
Add a CRAY_DIR Fypp macro that emits "!DIR$ " under
#ifdef _CRAYFTN, following the GPU_ROUTINE cray_inline pattern, and use
it for all of these. The directive text is restored from 52e8af1^
(s_TSat dropped from the NOINLINE list, since it no longer exists). The
unroll hints, previously unguarded, are now Cray-only.
Verified that ffmt --check leaves the files unchanged, and that Fypp
output with MFC_COMPILER=Cray contains each !DIR$ line inside an
#ifdef _CRAYFTN block (unroll 6 checked with case optimization and
igr_order = 5). Not compiled with CCE.