Loki: Always inline stmt functions from C-headers #105
Conversation
This file contains 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
mlange05
force-pushed
the
naml-loki-stmt-func-inline
branch
from
57a665d to
418e0c0
Compare
|
Integration note: This requires a very recent Loki commit, which has not been tagged yet: |
MichaelSt98
approved these changes
Dec 19, 2024
reuterbal
approved these changes
Dec 19, 2024
Comment on lines
-33
to
-38
| # OFP frontend cannot deal with statement functions, so we toggle them here | ||
| set( CLOUDSC_DEFINE_STMT_FUNC "" ) | ||
| if(NOT "${LOKI_FRONTEND}" STREQUAL "ofp") | ||
| set( CLOUDSC_DEFINE_STMT_FUNC CLOUDSC_STMT_FUNC ) | ||
| endif() | ||
|
|
|
Oh, the Loki upgrade in #100 has incurred a conflict, this branch needs a rebase now |
This removes a lot of the handholding needed for the C-specific transpile variant, where the utility functions where previously inlined from re-written elemental functions. Instead we now configure the Loki `InlineTransformation` to inline those, and force the CLOUDSC kernel to be preprocessed, so that we may find the comdeck functions. Note, I've left the source for the re-written elemental functions in the common directory for reference. If that becomes annoying, these can now be removed.
mlange05
force-pushed
the
naml-loki-stmt-func-inline
branch
from
418e0c0 to
a0983f2
Compare
No they are not used anymore. Their equivalents in CUF-land are tho, so I left them in. I'll remove the original now, we can remove the CUD ones once the pipeline is adjusted there (sorry, did this one quickly). |
mlange05
force-pushed
the
naml-loki-stmt-func-inline
branch
from
43431a7 to
fa1391b
Compare
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.
This PR removes the use of the re-written one-line elemental functions that where used to facilitate inlining of the historical "commdeck" functions. This was a hard requirement for all flavours of C-transpilation. However, Loki can now also inline raw statement functions, if they have been internalised to the kernel via preprocessing. In this PR we now switch this on in the Loki config and remove the special treatment from the CMake config.
Note, I've also piggy-backed an update to the latest Loki version and the removal or a rogue import, that can cause problems.
Another note, I've also left the module-based elemental functions in the source, for reference, and because there are CUF-specific versions in the same place. I've only cleaned up the raw C-transpilation, but not yet any of CUF modes.