add TaggedExpression #688

matthiasdiener · 2022-10-07T03:49:55Z

TODOs:

add to MemAccess, Sync

Please squash

matthiasdiener · 2022-10-11T02:24:50Z

Is this going in the direction you had in mind @inducer ?

loopy/symbolic.py

inducer · 2022-10-17T19:49:23Z

loopy/statistics.py

+        opmap = self.rec(expr.expr)
+        for op in opmap.count_map:
+            op.tags = expr.tags
+        return opmap


Would overwrite tags of subexpressions that already have tags.

self.rec(expr.expr, expr.tags)

Is 50adbc4 what you had in mind?

Yes, generally.

inducer · 2022-10-18T20:14:29Z

loopy/statistics.py


    map_bitwise_xor = map_bitwise_or
    map_bitwise_and = map_bitwise_or

-    def map_if(self, expr):
+    def map_if(self, expr, *args):


Why switch to *args here?

In 0bbbaec, I changed all occurrences to tags (with a default argument). Does this look reasonable?

inducer · 2022-10-18T20:15:14Z

Unsubscribing... @-mention or request review once it's ready for a look or needs attention.

matthiasdiener · 2022-11-09T23:32:18Z

This is ready for a first look @inducer.

inducer · 2022-11-10T01:47:04Z

loopy/statistics.py

@@ -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):


Why the pervasive tags=None? The default risks losing the tag as you traverse. IMO, there should not be a default.

I changed it in df7ed9b to not use a default argument anymore.

inducer · 2022-11-10T01:47:19Z

loopy/statistics.py

        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):


Why have *args instead of tags here?

These are hopefully all fixed in df7ed9b

loopy/symbolic.py

loopy/statistics.py

Co-authored-by: Andreas Klöckner <[email protected]>

matthiasdiener · 2025-01-13T19:17:54Z

I think this is ready for another review.

inducer

Thanks! This is quite close, only a few minor wrinkles to finish up.

inducer · 2025-02-12T20:24:10Z

loopy/statistics.py

+                count_granularity=local_mem_count_granularity,
+                kernel_name=self.knl.name): self.one})
+
+        elif (isinstance(array, TemporaryVariable) and (


Should this also apply to ArrayArg? / Where do those get counted if not?

Doesn't it already apply to ArrayArg (see 2 lines below)?

inducer · 2025-02-12T20:24:54Z

loopy/statistics.py

+    @property
+    def mtype(self) -> str:
+        from warnings import warn
+        warn("MemAccess.mtype is deprecated and will stop working in 2024. "


Bump deadlines to 2026? (here and elsewhere)

Done in 0b9d8a4

inducer · 2025-02-12T20:25:39Z

loopy/statistics.py

-        return f"Sync({self.kind}, {self.kernel_name})"
+        # Overridden for conciseness
+        return "Sync({}, {}, {})".format(
+            self.sync_kind, repr(self.kernel_name), self.tags)

 # }}}


 # {{{ CounterBase

 class CounterBase(CombineMapper):


Likely missing type arguments.

inducer · 2025-02-12T20:30:41Z

loopy/symbolic.py

+    .. attribute:: tags
+
+        A :class:`frozenset` of subclasses of :class:`pytools.tag.Tag` used to
+        provide metadata on this expression.
+
+    .. attribute:: expr
+
+        An expression to which :attr:`tags` are attached.
+    """
+
+    tags: frozenset[Tag]
+    expr: Expression


Have this use autoattribute, move docstrings after declaration.

Done in 6661eff

loopy/symbolic.py

loopy/statistics.py

inducer · 2025-02-12T20:36:00Z

loopy/statistics.py

+
+
+@dataclass(frozen=True, eq=True)
+class MemAccess:
    """A descriptor for a type of memory access.


Move to autoattribute and in-line docstrings?

Done in 6959904

inducer · 2025-02-12T20:36:34Z

loopy/statistics.py


 # }}}


 # {{{ Op descriptor

-class Op(ImmutableRecord):
+class OpType(Enum):


Move to autoattribute and in-line docstrings?

I'm not sure - does adding in-line docstrings add a lot of information to these values? Also, with autoattribute, sphinx shows the integer values of these constants, which I think isn't very meaningful.

inducer · 2025-02-12T20:37:27Z

loopy/statistics.py

The semantics of tagging in connection with counting need to be explained somewhere in the documentation.

Co-authored-by: Andreas Klöckner <[email protected]>

matthiasdiener changed the title ~~Create WithTag~~ add WithTag Oct 7, 2022

matthiasdiener force-pushed the withtag branch from 7b09146 to fe827e4 Compare October 7, 2022 20:08

matthiasdiener force-pushed the withtag branch from ae1f27a to e41625f Compare October 11, 2022 04:44

matthiasdiener self-assigned this Oct 11, 2022

add WithTag

9233385

matthiasdiener force-pushed the withtag branch from e41625f to 9233385 Compare October 14, 2022 01:59

inducer reviewed Oct 17, 2022

View reviewed changes

matthiasdiener added 3 commits October 17, 2022 21:55

Merge branch 'main' into withtag

679d269

rename to TaggedExpression

45e14e7

better tags propagation

50adbc4

matthiasdiener changed the title ~~add WithTag~~ add TaggedExpression Oct 18, 2022

matthiasdiener added 2 commits October 17, 2022 23:23

add to memaccess

06ab987

Merge branch 'main' into withtag

d50f908

inducer reviewed Oct 18, 2022

View reviewed changes

matthiasdiener added 7 commits October 27, 2022 15:01

Merge branch 'main' into withtag

ee395c1

Merge branch 'main' into withtag

04d0739

spelling fixes

9ae8936

provide default value for tags in map_ functions

0bbbaec

better doc

9529588

attempt to fix doctest

9e24cd6

add Sync

e72dec0

matthiasdiener marked this pull request as ready for review November 9, 2022 23:32

inducer reviewed Nov 10, 2022

View reviewed changes

matthiasdiener added 4 commits November 10, 2022 21:08

Merge branch 'main' into withtag

c7f9ad0

no default tags arguments

df7ed9b

lint fix

857e268

small arg fixes

d5f3f5d

This comment was marked as outdated.

Sign in to view

revert CI changes

dd419b0

matthiasdiener force-pushed the withtag branch from aa4f1d7 to dd419b0 Compare November 12, 2024 16:21

minor

ad08e3e

matthiasdiener marked this pull request as ready for review November 12, 2024 17:11

matthiasdiener added 2 commits November 14, 2024 15:38

Merge branch 'main' into withtag

123a457

Merge branch 'main' into withtag

7b60f42

inducer reviewed Dec 18, 2024

View reviewed changes

loopy/symbolic.py Outdated Show resolved Hide resolved

loopy/symbolic.py Show resolved Hide resolved

loopy/statistics.py Show resolved Hide resolved

matthiasdiener added 2 commits January 10, 2025 11:27

Merge branch 'main' into withtag

da547b6

ruff

c67eea6

matthiasdiener force-pushed the withtag branch from 9b12a27 to c67eea6 Compare January 13, 2025 17:31

matthiasdiener added 4 commits January 13, 2025 11:38

ExpressionT

9dce573

Merge branch 'main' into withtag

17ba240

lint

9f93401

more lint fixes

c3b4a82

matthiasdiener force-pushed the withtag branch from 8dcf1d4 to c3b4a82 Compare January 13, 2025 18:39

matthiasdiener and others added 2 commits January 13, 2025 12:58

remove init_arg_names

04ae5c0

Co-authored-by: Andreas Klöckner <[email protected]>

more typing

4ca4db4

matthiasdiener requested a review from inducer January 13, 2025 19:17

matthiasdiener added 2 commits January 22, 2025 13:29

Merge branch 'main' into withtag

854b4a2

Merge branch 'main' into withtag

59a51c4

inducer reviewed Feb 12, 2025

View reviewed changes

matthiasdiener and others added 7 commits February 20, 2025 17:07

Merge branch 'main' into withtag

3de1f6f

bump deprecation

0b9d8a4

remove extra assert

5fdce7a

Co-authored-by: Andreas Klöckner <[email protected]>

simplify map_tagged_expression

f0fc1b1

Co-authored-by: Andreas Klöckner <[email protected]>

use autoattribute for TaggedExpression

6661eff

move MemAccess to autoattribute

6959904

switch to constantdict

053d206

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add TaggedExpression #688

add TaggedExpression #688

matthiasdiener commented Oct 7, 2022 •

edited

Loading

matthiasdiener commented Oct 11, 2022

inducer Oct 17, 2022

matthiasdiener Oct 18, 2022

inducer Oct 18, 2022

inducer Oct 18, 2022

matthiasdiener Nov 9, 2022 •

edited

Loading

inducer commented Oct 18, 2022

matthiasdiener commented Nov 9, 2022

inducer Nov 10, 2022

matthiasdiener Nov 11, 2022

inducer Nov 10, 2022

matthiasdiener Nov 11, 2022

This comment was marked as outdated.

matthiasdiener commented Jan 13, 2025

inducer left a comment

inducer Feb 12, 2025

matthiasdiener Feb 20, 2025 •

edited

Loading

inducer Feb 12, 2025

matthiasdiener Feb 20, 2025

inducer Feb 12, 2025

inducer Feb 12, 2025

matthiasdiener Feb 20, 2025

inducer Feb 12, 2025

matthiasdiener Feb 20, 2025

inducer Feb 12, 2025

matthiasdiener Feb 20, 2025

inducer Feb 12, 2025

add TaggedExpression #688

Are you sure you want to change the base?

add TaggedExpression #688

Conversation

matthiasdiener commented Oct 7, 2022 • edited Loading

matthiasdiener commented Oct 11, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthiasdiener Nov 9, 2022 • edited Loading

Choose a reason for hiding this comment

inducer commented Oct 18, 2022

matthiasdiener commented Nov 9, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as outdated.

matthiasdiener commented Jan 13, 2025

inducer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthiasdiener Feb 20, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthiasdiener commented Oct 7, 2022 •

edited

Loading

matthiasdiener Nov 9, 2022 •

edited

Loading

matthiasdiener Feb 20, 2025 •

edited

Loading