add TaggedExpression #688
add TaggedExpression #688
Conversation
matthiasdiener
force-pushed
the
withtag
branch
from
7b09146
to
fe827e4
Compare
|
Is this going in the direction you had in mind @inducer ? |
matthiasdiener
force-pushed
the
withtag
branch
from
ae1f27a
to
e41625f
Compare
matthiasdiener
force-pushed
the
withtag
branch
from
e41625f
to
9233385
Compare
loopy/symbolic.py
Outdated
| @@ -712,6 +733,31 @@ def copy(self, *, name=None, tags=None): | |||
| mapper_method = intern("map_tagged_variable") | |||
|
|
|||
|
|
|||
| class WithTag(LoopyExpressionBase): | |||
There was a problem hiding this comment.
| class WithTag(LoopyExpressionBase): | |
| class TaggedExpression(LoopyExpressionBase): |
There was a problem hiding this comment.
Done in 45e14e7
loopy/statistics.py
Outdated
| opmap = self.rec(expr.expr) | ||
| for op in opmap.count_map: | ||
| op.tags = expr.tags | ||
| return opmap |
There was a problem hiding this comment.
Would overwrite tags of subexpressions that already have tags.
self.rec(expr.expr, expr.tags)
There was a problem hiding this comment.
Is 50adbc4 what you had in mind?
loopy/statistics.py
Outdated
|
|
||
| map_bitwise_xor = map_bitwise_or | ||
| map_bitwise_and = map_bitwise_or | ||
|
|
||
| def map_if(self, expr): | ||
| def map_if(self, expr, *args): |
There was a problem hiding this comment.
In 0bbbaec, I changed all occurrences to tags (with a default argument). Does this look reasonable?
|
Unsubscribing... @-mention or request review once it's ready for a look or needs attention. |
|
This is ready for a first look @inducer. |
loopy/statistics.py
Outdated
| @@ -916,14 +931,17 @@ def __init__(self, knl, callables_table, kernel_rec, | |||
| def combine(self, values): | |||
| return sum(values) | |||
|
|
|||
| def map_constant(self, expr): | |||
| def map_constant(self, expr, tags=None): | |||
There was a problem hiding this comment.
Why the pervasive tags=None? The default risks losing the tag as you traverse. IMO, there should not be a default.
There was a problem hiding this comment.
I changed it in df7ed9b to not use a default argument anymore.
loopy/statistics.py
Outdated
| else: | ||
| return self.new_zero_poly_map() | ||
|
|
||
| map_product = map_sum | ||
|
|
||
| def map_comparison(self, expr): | ||
| return self.rec(expr.left)+self.rec(expr.right) | ||
| def map_comparison(self, expr, *args): |
There was a problem hiding this comment.
Why have *args instead of tags here?
There was a problem hiding this comment.
These are hopefully all fixed in df7ed9b
loopy/statistics.py
Outdated
| """ | ||
|
|
||
| def __init__(self, mtype=None, dtype=None, lid_strides=None, gid_strides=None, | ||
| direction=None, variable=None, | ||
| *, variable_tags=None, | ||
| count_granularity=None, kernel_name=None): | ||
| count_granularity=None, kernel_name=None, tags=None): |
There was a problem hiding this comment.
Would it make sense to default this to an empty frozenset instead? (Here and elsewhere?)
There was a problem hiding this comment.
I'm not sure - the other (non-scalar) fields in these classes also have None as the default value (e.g. variable_tags, lid_strides, ...)
TODOs:
MemAccess,Sync