testing: (linalg-snitch) change order of incrementally added passes (#…

…2966)
xdslproject · Aug 1, 2024 · edeae99 · edeae99
1 parent c9f8894
commit edeae99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/tests/transforms/test_test_lower_linalg_to_snitch.py b/tests/transforms/test_test_lower_linalg_to_snitch.py
@@ -16,32 +16,30 @@
         (
             0,
             (
-                memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
                 memref_stream_interleave.MemrefStreamInterleavePass(),
-                memref_streamify.MemrefStreamifyPass(),
                 convert_riscv_scf_for_to_frep.ConvertRiscvScfForToFrepPass(),
+                memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
+                memref_streamify.MemrefStreamifyPass(),
             ),
         ),
         (
             1,
             (
-                memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
                 memref_stream_interleave.MemrefStreamInterleavePass(),
-                memref_streamify.MemrefStreamifyPass(),
+                convert_riscv_scf_for_to_frep.ConvertRiscvScfForToFrepPass(),
+                memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
             ),
         ),
         (
             2,
             (
-                memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
                 memref_stream_interleave.MemrefStreamInterleavePass(),
+                convert_riscv_scf_for_to_frep.ConvertRiscvScfForToFrepPass(),
             ),
         ),
         (
             3,
-            (
-                memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
-            ),
+            (memref_stream_interleave.MemrefStreamInterleavePass(),),
         ),
         (4, ()),
     ],

diff --git a/xdsl/transforms/test_lower_linalg_to_snitch.py b/xdsl/transforms/test_lower_linalg_to_snitch.py
@@ -86,10 +86,14 @@
 )
 
 LINALG_SNITCH_OPTIMIZATION_PASSES: tuple[ModulePass, ...] = (
-    memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
+    # + Unroll and Jam (O4)
     memref_stream_interleave.MemrefStreamInterleavePass(),
-    memref_streamify.MemrefStreamifyPass(),
+    # + FRep (O3)
     convert_riscv_scf_for_to_frep.ConvertRiscvScfForToFrepPass(),
+    # + Scalar Replacement (O2)
+    memref_stream_unnest_out_parameters.MemrefStreamUnnestOutParametersPass(),
+    # + Streams (O1)
+    memref_streamify.MemrefStreamifyPass(),
 )
 
 MAX_OPT_LEVEL = len(LINALG_SNITCH_OPTIMIZATION_PASSES)