[P4Testgen] Move p4tools.def to common/ir.def, introduce a hashing function for state and symbolic variables. #4667
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
fruffy
force-pushed
the
fruffy/testgen_boost_pruning
branch
2 times, most recently
from
79f11bd
to
9cee939
Compare
asl
reviewed
Jun 4, 2024
vlstill
reviewed
Jun 5, 2024
backends/p4tools/p4tools.def
Outdated
Comment on lines
129
to
52
| uint64_t hash() const { | ||
| return hash(0, ref); | ||
| } | ||
|
|
||
| uint64_t hash(uint64_t seed, const IR::Expression *expression) const { | ||
| // expression is a Member. | ||
| if (const auto *member = expression->to<IR::Member>()) { | ||
| return hash(seed, member); | ||
| } | ||
| // expression is a PathExpression. | ||
| if (const auto *pathExpression = expression->to<IR::PathExpression>()) { | ||
| return hash(seed, pathExpression); | ||
| } | ||
| // expression is a ArrayIndex. | ||
| if (const auto *arrayIndex = expression->to<IR::ArrayIndex>()) { | ||
| return hash(seed, arrayIndex); | ||
| } | ||
| BUG("Either %1% of type %2% is not a valid StateVariable", expression, | ||
| expression->node_type_name()); | ||
| } | ||
|
|
||
| uint64_t hash(uint64_t seed, const IR::Member *member) const { | ||
| return hash(Util::hash_combine(seed, std::hash<cstring>()(member->member)), member->expr); | ||
| } | ||
|
|
||
| uint64_t hash(uint64_t seed, const IR::PathExpression *pathExpression) const { | ||
| return Util::hash_combine(seed, std::hash<cstring>()(pathExpression->path->name)); | ||
| } | ||
|
|
||
| uint64_t hash(uint64_t seed, const IR::ArrayIndex *arrayIndex) const { | ||
| const auto *arrayIndexVal = arrayIndex->right->to<IR::Constant>(); | ||
| BUG_CHECK( | ||
| arrayIndexVal != nullptr, | ||
| "Value %1% is not a constant. Only constants are supported as part of a state variable.", | ||
| arrayIndex->right); | ||
| return hash(Util::hash_combine(seed, std::hash<big_int>()(arrayIndexVal->value)), | ||
| arrayIndex->left); | ||
| } | ||
|
|
There was a problem hiding this comment.
I wonder if it would be better to implement the hash outside the IR classes. Having the multiple public overloads there on the public interface seems messy to me.
There was a problem hiding this comment.
My problem with that approach is that it can be tedious to find the implementation. But in this case it makes sense, I just need to implement a new class.
There was a problem hiding this comment.
But in this case it makes sense, I just need to implement a new class.
Any updates on this?
There was a problem hiding this comment.
This PR is still blocked until #4768 is resolved.
fruffy
force-pushed
the
fruffy/testgen_boost_pruning
branch
from
9cee939
to
252c182
Compare
fruffy
force-pushed
the
fruffy/testgen_boost_pruning
branch
from
252c182
to
3f487da
Compare
fruffy
changed the title
fruffy
force-pushed
the
fruffy/testgen_boost_pruning
branch
3 times, most recently
from
f2691ff
to
08e01d0
Compare
fruffy
force-pushed
the
fruffy/testgen_boost_pruning
branch
from
08e01d0
to
ff5b0e9
Compare
Signed-off-by: fruffy <[email protected]>
fruffy
force-pushed
the
fruffy/testgen_boost_pruning
branch
from
ff5b0e9
to
667d482
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.
Remove one more piece of boost in the compiler.
This time we replace some boost containers with Abseil flat maps and sets. For that to work we needed to introduce hashers and comparison function for some of the special P4Tools variables. We also need custom comparators and hashers because we only want to compare the labels and names of the variables, not the types. The hashers use
hash_combinefrom our hash utilities.Also fix a small code in the Python PTF scripts that led to spurious failures (trying to remove a log file that was already removed).