update xdsl

opencompl · Feb 6, 2024 · 3a21369 · 3a21369
1 parent 614778d
commit 3a21369
Show file tree

Hide file tree

Showing 31 changed files with 54 additions and 54 deletions.
diff --git a/kernels/conv2d_d1_s1_3x3/1x1x8x8xf64/snitch_stream.csv b/kernels/conv2d_d1_s1_3x3/1x1x8x8xf64/snitch_stream.csv
@@ -1 +1 @@
-1499
+1509
diff --git a/kernels/conv2d_d1_s1_3x3/1x1x8x8xf64/tests.csv b/kernels/conv2d_d1_s1_3x3/1x1x8x8xf64/tests.csv
@@ -1,4 +1,4 @@
 baseline,1559
 linalg,1489
-snitch_stream,1499
+snitch_stream,1509
 snrt,1486
diff --git a/kernels/conv2d_d1_s1_3x3/params.csv b/kernels/conv2d_d1_s1_3x3/params.csv
@@ -1,4 +1,4 @@
 1x1x8x8xf64,baseline,1559
 1x1x8x8xf64,linalg,1489
-1x1x8x8xf64,snitch_stream,1499
+1x1x8x8xf64,snitch_stream,1509
 1x1x8x8xf64,snrt,1486
diff --git a/kernels/ddot/128xf64/scf_xdsl.csv b/kernels/ddot/128xf64/scf_xdsl.csv
@@ -1 +1 @@
-1203
+1215
diff --git a/kernels/ddot/128xf64/tests.csv b/kernels/ddot/128xf64/tests.csv
@@ -2,5 +2,5 @@ baseline,929
 linalg,937
 snitch_stream,570
 snrt,550
-scf_xdsl,1203
+scf_xdsl,1215
 scf,937
diff --git a/kernels/ddot/params.csv b/kernels/ddot/params.csv
@@ -2,5 +2,5 @@
 128xf64,linalg,937
 128xf64,snitch_stream,570
 128xf64,snrt,550
-128xf64,scf_xdsl,1203
+128xf64,scf_xdsl,1215
 128xf64,scf,937
diff --git a/kernels/dsum/8x16xf32/scf_xdsl.csv b/kernels/dsum/8x16xf32/scf_xdsl.csv
@@ -1 +1 @@
-3566
+3543
diff --git a/kernels/dsum/8x16xf32/tests.csv b/kernels/dsum/8x16xf32/tests.csv
@@ -4,4 +4,4 @@ snrt,187
 ssr1d,253
 ssr2d,273
 snitch_stream,194
-scf_xdsl,3566
+scf_xdsl,3543
diff --git a/kernels/dsum/params.csv b/kernels/dsum/params.csv
@@ -4,4 +4,4 @@
 8x16xf32,ssr1d,253
 8x16xf32,ssr2d,273
 8x16xf32,snitch_stream,194
-8x16xf32,scf_xdsl,3566
+8x16xf32,scf_xdsl,3543
diff --git a/kernels/fill/16x16xf64/scf_xdsl.csv b/kernels/fill/16x16xf64/scf_xdsl.csv
@@ -1 +1 @@
-2663
+2665
diff --git a/kernels/fill/16x16xf64/tests.csv b/kernels/fill/16x16xf64/tests.csv
@@ -2,4 +2,4 @@ baseline,370
 linalg,347
 snitch_stream,294
 snrt,299
-scf_xdsl,2663
+scf_xdsl,2665
diff --git a/kernels/fill/params.csv b/kernels/fill/params.csv
@@ -2,4 +2,4 @@
 16x16xf64,linalg,347
 16x16xf64,snitch_stream,294
 16x16xf64,snrt,299
-16x16xf64,scf_xdsl,2663
+16x16xf64,scf_xdsl,2665
diff --git a/kernels/kernels.csv b/kernels/kernels.csv
@@ -1,12 +1,12 @@
 conv2d_d1_s1_3x3,1x1x8x8xf64,baseline,1559
 conv2d_d1_s1_3x3,1x1x8x8xf64,linalg,1489
-conv2d_d1_s1_3x3,1x1x8x8xf64,snitch_stream,1499
+conv2d_d1_s1_3x3,1x1x8x8xf64,snitch_stream,1509
 conv2d_d1_s1_3x3,1x1x8x8xf64,snrt,1486
 ddot,128xf64,baseline,929
 ddot,128xf64,linalg,937
 ddot,128xf64,snitch_stream,570
 ddot,128xf64,snrt,550
-ddot,128xf64,scf_xdsl,1203
+ddot,128xf64,scf_xdsl,1215
 ddot,128xf64,scf,937
 dense,8x8xf64,baseline,3239
 dense,8x8xf64,fused,2964
@@ -19,32 +19,32 @@ dsum,8x16xf32,snrt,187
 dsum,8x16xf32,ssr1d,253
 dsum,8x16xf32,ssr2d,273
 dsum,8x16xf32,snitch_stream,194
-dsum,8x16xf32,scf_xdsl,3566
+dsum,8x16xf32,scf_xdsl,3543
 fill,16x16xf64,baseline,370
 fill,16x16xf64,linalg,347
 fill,16x16xf64,snitch_stream,294
 fill,16x16xf64,snrt,299
-fill,16x16xf64,scf_xdsl,2663
+fill,16x16xf64,scf_xdsl,2665
 matmul,8x8xf64,baseline,2562
 matmul,8x8xf64,linalg,2560
-matmul,8x8xf64,snitch_stream,2324
+matmul,8x8xf64,snitch_stream,2333
 matmul,8x8xf64,snrt,2304
-matmul,8x8xf64,scf_xdsl,20834
+matmul,8x8xf64,scf_xdsl,20770
 pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,baseline,1435
 pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,linalg,1201
-pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,snitch_stream,1118
+pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,snitch_stream,1115
 pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,snrt,1094
-pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,scf_xdsl,24694
+pooling_nchw_max_d1_s2_3x3,1x1x16x16xf64,scf_xdsl,24514
 pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,baseline,1948
 pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,linalg,1948
-pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,snitch_stream,2000
+pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,snitch_stream,1997
 pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,snrt,1976
-pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,scf_xdsl,24694
+pooling_nchw_sum_d1_s2_3x3,1x1x16x16xf64,scf_xdsl,24514
 relu,16x16xf64,baseline,1081
 relu,16x16xf64,ssr,846
 relu,16x16xf64,ssr_frep,327
 relu,16x16xf64,snrt,334
 relu,16x16xf64,linalg,1074
 relu,16x16xf64,snitch_stream,322
-relu,16x16xf64,scf_xdsl,5022
+relu,16x16xf64,scf_xdsl,4974
 softmax,16xf64,baseline,32613
diff --git a/kernels/matmul/8x8xf64/scf_xdsl.csv b/kernels/matmul/8x8xf64/scf_xdsl.csv
@@ -1 +1 @@
-20834
+20770
diff --git a/kernels/matmul/8x8xf64/snitch_stream.csv b/kernels/matmul/8x8xf64/snitch_stream.csv
@@ -1 +1 @@
-2324
+2333
diff --git a/kernels/matmul/8x8xf64/tests.csv b/kernels/matmul/8x8xf64/tests.csv
@@ -1,5 +1,5 @@
 baseline,2562
 linalg,2560
-snitch_stream,2324
+snitch_stream,2333
 snrt,2304
-scf_xdsl,20834
+scf_xdsl,20770
diff --git a/kernels/matmul/params.csv b/kernels/matmul/params.csv
@@ -1,5 +1,5 @@
 8x8xf64,baseline,2562
 8x8xf64,linalg,2560
-8x8xf64,snitch_stream,2324
+8x8xf64,snitch_stream,2333
 8x8xf64,snrt,2304
-8x8xf64,scf_xdsl,20834
+8x8xf64,scf_xdsl,20770
diff --git a/kernels/pivoted.csv b/kernels/pivoted.csv
@@ -1,11 +1,11 @@
 kernels,baseline,linalg,scf_xdsl,snitch_stream,snrt,min_llvm_mlir
-conv2d_d1_s1_3x3 1x1x8x8xf64,1559,1489,,1499,1486,1489
-ddot 128xf64,929,937,1203,570,550,929
+conv2d_d1_s1_3x3 1x1x8x8xf64,1559,1489,,1509,1486,1489
+ddot 128xf64,929,937,1215,570,550,929
 dense 8x8xf64,3239,3238,,2734,2709,3238
-dsum 8x16xf32,1202,794,3566,194,187,794
-fill 16x16xf64,370,347,2663,294,299,347
-matmul 8x8xf64,2562,2560,20834,2324,2304,2560
-pooling_nchw_max_d1_s2_3x3 1x1x16x16xf64,1435,1201,24694,1118,1094,1201
-pooling_nchw_sum_d1_s2_3x3 1x1x16x16xf64,1948,1948,24694,2000,1976,1948
-relu 16x16xf64,1081,1074,5022,322,334,1074
+dsum 8x16xf32,1202,794,3543,194,187,794
+fill 16x16xf64,370,347,2665,294,299,347
+matmul 8x8xf64,2562,2560,20770,2333,2304,2560
+pooling_nchw_max_d1_s2_3x3 1x1x16x16xf64,1435,1201,24514,1115,1094,1201
+pooling_nchw_sum_d1_s2_3x3 1x1x16x16xf64,1948,1948,24514,1997,1976,1948
+relu 16x16xf64,1081,1074,4974,322,334,1074
 softmax 16xf64,32613,,,,,32613
diff --git a/kernels/pooling_nchw_max_d1_s2_3x3/1x1x16x16xf64/scf_xdsl.csv b/kernels/pooling_nchw_max_d1_s2_3x3/1x1x16x16xf64/scf_xdsl.csv
@@ -1 +1 @@
-24694
+24514
diff --git a/kernels/pooling_nchw_max_d1_s2_3x3/1x1x16x16xf64/snitch_stream.csv b/kernels/pooling_nchw_max_d1_s2_3x3/1x1x16x16xf64/snitch_stream.csv
@@ -1 +1 @@
-1118
+1115
diff --git a/kernels/pooling_nchw_max_d1_s2_3x3/1x1x16x16xf64/tests.csv b/kernels/pooling_nchw_max_d1_s2_3x3/1x1x16x16xf64/tests.csv
@@ -1,5 +1,5 @@
 baseline,1435
 linalg,1201
-snitch_stream,1118
+snitch_stream,1115
 snrt,1094
-scf_xdsl,24694
+scf_xdsl,24514
diff --git a/kernels/pooling_nchw_max_d1_s2_3x3/params.csv b/kernels/pooling_nchw_max_d1_s2_3x3/params.csv
@@ -1,5 +1,5 @@
 1x1x16x16xf64,baseline,1435
 1x1x16x16xf64,linalg,1201
-1x1x16x16xf64,snitch_stream,1118
+1x1x16x16xf64,snitch_stream,1115
 1x1x16x16xf64,snrt,1094
-1x1x16x16xf64,scf_xdsl,24694
+1x1x16x16xf64,scf_xdsl,24514
diff --git a/kernels/pooling_nchw_sum_d1_s2_3x3/1x1x16x16xf64/scf_xdsl.csv b/kernels/pooling_nchw_sum_d1_s2_3x3/1x1x16x16xf64/scf_xdsl.csv
@@ -1 +1 @@
-24694
+24514
diff --git a/kernels/pooling_nchw_sum_d1_s2_3x3/1x1x16x16xf64/snitch_stream.csv b/kernels/pooling_nchw_sum_d1_s2_3x3/1x1x16x16xf64/snitch_stream.csv
@@ -1 +1 @@
-2000
+1997
diff --git a/kernels/pooling_nchw_sum_d1_s2_3x3/1x1x16x16xf64/tests.csv b/kernels/pooling_nchw_sum_d1_s2_3x3/1x1x16x16xf64/tests.csv
@@ -1,5 +1,5 @@
 baseline,1948
 linalg,1948
-snitch_stream,2000
+snitch_stream,1997
 snrt,1976
-scf_xdsl,24694
+scf_xdsl,24514
diff --git a/kernels/pooling_nchw_sum_d1_s2_3x3/params.csv b/kernels/pooling_nchw_sum_d1_s2_3x3/params.csv
@@ -1,5 +1,5 @@
 1x1x16x16xf64,baseline,1948
 1x1x16x16xf64,linalg,1948
-1x1x16x16xf64,snitch_stream,2000
+1x1x16x16xf64,snitch_stream,1997
 1x1x16x16xf64,snrt,1976
-1x1x16x16xf64,scf_xdsl,24694
+1x1x16x16xf64,scf_xdsl,24514
diff --git a/kernels/relu/16x16xf64/scf_xdsl.csv b/kernels/relu/16x16xf64/scf_xdsl.csv
@@ -1 +1 @@
-5022
+4974
diff --git a/kernels/relu/16x16xf64/tests.csv b/kernels/relu/16x16xf64/tests.csv
@@ -4,4 +4,4 @@ ssr_frep,327
 snrt,334
 linalg,1074
 snitch_stream,322
-scf_xdsl,5022
+scf_xdsl,4974
diff --git a/kernels/relu/params.csv b/kernels/relu/params.csv
@@ -4,4 +4,4 @@
 16x16xf64,snrt,334
 16x16xf64,linalg,1074
 16x16xf64,snitch_stream,322
-16x16xf64,scf_xdsl,5022
+16x16xf64,scf_xdsl,4974
diff --git a/xdsl b/xdsl
diff --git a/xdsl_commit.txt b/xdsl_commit.txt
@@ -1 +1 @@
-2977f981c1388272cce831f88d04f8d101cb5412
+4178dd5ee132dfdb76849be499c5019f915042a5
+3 −3		.github/workflows/jupyterlite.yml
+1 −0		.github/workflows/update_xdsl_pyodide_build.py
+2 −2		requirements.txt
+37 −15		tests/dialects/test_riscv.py
+3 −3		tests/filecheck/backend/convert_riscv_scf_to_riscv_cf.mlir
+35 −0		tests/filecheck/backend/convert_riscv_scf_to_riscv_cf_with_regalloc.mlir
+46 −31		tests/filecheck/backend/riscv/canonicalize.mlir
+0 −9		tests/filecheck/backend/riscv/convert_riscv_scf_for_to_frep.mlir
+11 −3		tests/filecheck/backend/riscv/riscv_register_allocation.mlir
+14 −0		tests/filecheck/dialects/linalg/linalg_ops.mlir
+23 −23		tests/filecheck/dialects/riscv/riscv_ops.mlir
+4 −2		tests/filecheck/dialects/riscv_cf/canonicalize.mlir
+57 −0		tests/filecheck/dialects/riscv_cf/ops.mlir
+0 −4		tests/filecheck/dialects/riscv_scf/loop_range_folding.mlir
+0 −4		tests/filecheck/dialects/riscv_scf/ops.mlir
+1 −1		tests/filecheck/dialects/riscv_snitch/ops.mlir
+52 −0		tests/filecheck/dialects/scf/canonicalize.mlir
+1 −1		tests/filecheck/dialects/snitch_stream/ops.mlir
+3 −3		tests/filecheck/projects/riscv-backend-paper/conv_target.mlir
+7 −7		tests/filecheck/projects/riscv-backend-paper/ddot_regalloc.mlir
+3 −3		tests/filecheck/projects/riscv-backend-paper/dense_target.mlir
+2 −2		tests/filecheck/projects/riscv-backend-paper/matmul_target.mlir
+2 −2		tests/filecheck/projects/riscv-backend-paper/max_pool_target.mlir
+2 −2		tests/filecheck/projects/riscv-backend-paper/sum_pool_target.mlir
+20 −0		tests/filecheck/transforms/arith-add-immediate-zero.mlir
+16 −0		tests/filecheck/transforms/individual_rewrite.mlir
+21 −0		tests/filecheck/transforms/riscv_get_zero_register.mlir
+2 −0		tests/interactive/test_app.py
+3 −3		tests/test_attribute_definition.py
+5 −5		tests/test_op_builder.py
+45 −0		tests/test_printer.py
+1 −1		tests/utils/test_comparisons.py
+2 −2		xdsl/backend/riscv/lowering/convert_riscv_scf_to_riscv_cf.py
+6 −1		xdsl/backend/riscv/register_allocation.py
+11 −2		xdsl/dialects/arith.py
+49 −37		xdsl/dialects/builtin.py
+23 −2		xdsl/dialects/linalg.py
+70 −48		xdsl/dialects/riscv.py
+29 −19		xdsl/dialects/riscv_cf.py
+20 −6		xdsl/dialects/riscv_scf.py
+13 −1		xdsl/dialects/scf.py
+17 −4		xdsl/interactive/app.py
+1 −1		xdsl/interpreters/riscv.py
+10 −23		xdsl/interpreters/riscv_cf.py
+13 −2		xdsl/printer.py
+12 −0		xdsl/tools/command_line_tool.py
+18 −0		xdsl/transforms/canonicalization_patterns/arith.py
+61 −79		xdsl/transforms/canonicalization_patterns/riscv.py
+5 −18		xdsl/transforms/canonicalization_patterns/riscv_cf.py
+88 −0		xdsl/transforms/canonicalization_patterns/scf.py
+68 −0		xdsl/transforms/individual_rewrite.py
+49 −0		xdsl/transforms/riscv_get_zero_register.py
+2 −0		xdsl/transforms/test_lower_linalg_to_snitch.py
+8 −3		xdsl/utils/comparisons.py
+8 −0		xdsl/xdsl_opt_main.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2977f981c1388272cce831f88d04f8d101cb5412
		4178dd5ee132dfdb76849be499c5019f915042a5