dev(ustring.h): string literal operator for ustring and ustringhash #3939
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
jessey-git
approved these changes
Aug 4, 2023
AlexMWells
reviewed
Aug 7, 2023
| @@ -815,23 +815,32 @@ class OIIO_UTIL_API ustringhash { | |||
| } | |||
|
|
|||
| /// Construct a ustringhash from a null-terminated C string (char *). | |||
| OIIO_HOSTDEVICE explicit ustringhash(const char* str) | |||
| OIIO_DEVICE_CONSTEXPR explicit ustringhash(const char* str) | |||
There was a problem hiding this comment.
Maybe add a comment on why the CPU side can't be constexpr.
AlexMWells
approved these changes
Aug 7, 2023
* Add string literal operators for ustring and ustringhash so you can
write:
```
"foo"_us
"bar"_ush
```
Note that on Cuda (but not on the host), this ustringhash construction
is constexpr.
* Add a new `ustringhash(const char*, size_t)` constructor, which is also
constexpr on the device side.
* Mark the existing `ustringhash(string_view)` constructor as constexpr
on the device side.
We can mark those things as constexpr on the device side because on
the Cuda side, the implementation only takes the hash (which is
constexpr), and does not actually add a ustring to the table (which
cannot be constexpr). To make such declarations easy, add a new macro
to platform.h, `OIIO_DEVICE_CONSTEXPR` which is constexpr for the
device, merely inline for the host.
Signed-off-by: Larry Gritz <lg@larrygritz.com>
Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz
force-pushed
the
lg-ustringliteral
branch
from
91b9ba0
to
6d724e8
Compare
lgritz
merged commit 629b205
into
AcademySoftwareFoundation:master
22 of 23 checks passed
lgritz
added a commit
to lgritz/OpenImageIO
that referenced
this pull request
Aug 25, 2023
…cademySoftwareFoundation#3939) * Add string literal operators for ustring and ustringhash so you can write: ``` "foo"_us "bar"_ush ``` Note that on Cuda (but not on the host), this ustringhash construction is constexpr. * Add a new `ustringhash(const char*, size_t)` constructor, which is also constexpr on the device side. * Mark the existing `ustringhash(string_view)` constructor as constexpr on the device side. We can mark those things as constexpr on the device side because on the Cuda side, the implementation only takes the hash (which is constexpr), and does not actually add a ustring to the table (which cannot be constexpr). To make such declarations easy, add a new macro to platform.h, `OIIO_DEVICE_CONSTEXPR` which is constexpr for the device, merely inline for the host. --------- Signed-off-by: Larry Gritz <lg@larrygritz.com>
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.
Add string literal operators for ustring and ustringhash so you can write:
"foo"_us "bar"_ushNote that on Cuda (but not on the host), this ustringhash construction is constexpr.Add a new
ustringhash(const char*, size_t)constructor, which is also constexpr on the device side.Mark the existing
ustringhash(string_view)constructor as constexpr on the device side.We can mark those things as constexpr on the device side because on the Cuda side, the implementation only takes the hash (which is constexpr), and does not actually add a ustring to the table (which cannot be constexpr). To make such declarations easy, add a new macro to platform.h,
OIIO_DEVICE_CONSTEXPRwhich is constexpr for the device, merely inline for the host.