Use switch statements in ReferenceCell #14680
Merged
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
We can enable constexpr and disable the check on older compilers.
Patches like ebd03d4 indicate that there's a measurable performance advantage to not using a sequence of if statements.
marcfehling
approved these changes
Jan 15, 2023
|
|
||
| Assert(false, ExcNotImplemented()); | ||
| return 0; | ||
| return numbers::invalid_unsigned_int; |
| } | ||
| case ReferenceCells::Triangle: | ||
| { | ||
| static constexpr ndarray<unsigned int, 3, 2> subcells = { |
masterleinad
approved these changes
Jan 16, 2023
bangerth
approved these changes
Jan 16, 2023
There was a problem hiding this comment.
Interesting. I'm not sure it's a clear win, but it isn't a loss either, so I'm happy to go with it.
In some future C++ standard (I forgot whether it was C++17 or 20 or 23), we will be able to write
switch (*this)
as long as there is a constexpr operator==. But for the moment, switch (this->kind) will do just fine.
|
It passes all tests, so let's go with it! |
peterrum
reviewed
Jan 16, 2023
|
|
||
| Assert(false, ExcNotImplemented()); | ||
| return 0; | ||
| return numbers::invalid_unsigned_int; |
There was a problem hiding this comment.
This was intentionally. See #14283.
There was a problem hiding this comment.
You're right - lets change that back.
|
The problems came from the constructor having an assertion in it - everything should work now that we guard that assertion with our |
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.
See also #13922.
This works with GCC 5.4 - we'll see if it works with other older compilers/MSVC/etc. In particular, we can work around
DEAL_II_CXX14_CONSTEXPR_BUGby only running the assertion if the compiler supports assertions in constexpr functions.