Regex cleanup internal reclass and reclass_device classes #11045
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
davidwendt
added
2 - In Progress
Codecov Report
@@ Coverage Diff @@
## branch-22.08 #11045 +/- ##
===============================================
Coverage ? 86.34%
===============================================
Files ? 144
Lines ? 22729
Branches ? 0
===============================================
Hits ? 19625
Misses ? 3104
Partials ? 0 Continue to review full report at Codecov.
|
davidwendt
added
3 - Ready for Review
hyperbolic2346
requested changes
Jun 16, 2022
hyperbolic2346
approved these changes
Jun 16, 2022
mythrocks
reviewed
Jun 23, 2022
Comment on lines
+281
to
+297
| // transform pairs of literals to ranges | ||
| std::vector<reclass_range> ranges(literals.size() / 2); | ||
| auto const counter = thrust::make_counting_iterator(0); | ||
| std::transform(counter, counter + ranges.size(), ranges.begin(), [&literals](auto idx) { | ||
| return reclass_range{literals[idx * 2], literals[idx * 2 + 1]}; | ||
| }); | ||
| // sort the ranges to help with detecting overlapping entries | ||
| std::sort(ranges.begin(), ranges.end(), [](auto l, auto r) { | ||
| return l.first == r.first ? l.last < r.last : l.first < r.first; | ||
| }); | ||
| // combine overlapping entries: [a-f][c-g] => [a-g] | ||
| if (ranges.size() > 1) { | ||
| for (auto itr = ranges.begin() + 1; itr < ranges.end(); ++itr) { | ||
| auto const prev = *(itr - 1); | ||
| if (itr->first <= prev.last + 1) { | ||
| // if these 2 ranges intersect, expand the current one | ||
| *itr = reclass_range{prev.first, std::max(prev.last, itr->last)}; |
There was a problem hiding this comment.
This is impressive. So much more readable.
mythrocks
reviewed
Jun 23, 2022
cpp/src/strings/regex/regexec.cu
Outdated
| @@ -104,14 +109,14 @@ std::unique_ptr<reprog_device, std::function<void(reprog_device*)>> reprog_devic | |||
| auto d_end = d_ptr + (classes_count * sizeof(reclass_device)); | |||
| // place each class and append the variable length data | |||
| for (int32_t idx = 0; idx < classes_count; ++idx) { | |||
| reclass& h_class = h_prog.class_at(idx); | |||
| auto h_class = h_prog.class_at(idx); | |||
There was a problem hiding this comment.
To prevent the copying of literals (as the previous code did), should this not be auto const& h_class = ...;? Or is that affordable?
There was a problem hiding this comment.
You are correct. Good catch.
mythrocks
approved these changes
Jun 23, 2022
|
@gpucibot merge |
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 cleans up the awkward range literals for supporting the
CCLASSandNCCLASSregex instructions. The range values were always paired (first,last) but arranged consecutively in a flat vector so[idx] and [idx+1]were range pairsidxwas even. This PR introduces areclass_rangeclass that holds the pairs so we can use normal algorithms to manipulate them.There is some overlap with code changes in PR #10975
Reference #3582