core: don't insert space between block arguments and colons (#5745)

Author: superlopuh

docs/Toy/examples/codegen.toy

@@ -15,7 +15,7 @@ def main() {
 
 # CHECK:       builtin.module {
 # CHECK-NEXT:    "toy.func"() ({
-# CHECK-NEXT:    ^bb0(%{{.*}} : tensor<*xf64>, %{{.*}} : tensor<*xf64>):
+# CHECK-NEXT:    ^bb0(%{{.*}}: tensor<*xf64>, %{{.*}}: tensor<*xf64>):
 # CHECK-NEXT:      %{{.*}} = "toy.transpose"(%{{.*}}) : (tensor<*xf64>) -> tensor<*xf64>
 # CHECK-NEXT:      %{{.*}} = "toy.transpose"(%{{.*}}) : (tensor<*xf64>) -> tensor<*xf64>
 # CHECK-NEXT:      %{{.*}} = "toy.mul"(%{{.*}}, %{{.*}}) : (tensor<*xf64>, tensor<*xf64>) -> tensor<*xf64>

docs/Toy/examples/tests/inline.mlir

@@ -4,7 +4,7 @@ builtin.module {
 // CHECK: builtin.module {
 
   "toy.func"() ({
-  ^bb0(%0 : tensor<*xf64>, %1 : tensor<*xf64>):
+  ^bb0(%0: tensor<*xf64>, %1: tensor<*xf64>):
     %2 = "toy.transpose"(%0) : (tensor<*xf64>) -> tensor<*xf64>
     %3 = "toy.transpose"(%1) : (tensor<*xf64>) -> tensor<*xf64>
     %4 = "toy.mul"(%2, %3) : (tensor<*xf64>, tensor<*xf64>) -> tensor<*xf64>

docs/marimo/eqsat.py

@@ -126,7 +126,7 @@ def test_no_eclass():
 @app.cell(hide_code=True)
 def _():
     input_module_string = """
-    func.func @impl(%a : i32) -> i32 {
+    func.func @impl(%a: i32) -> i32 {
       %two   = arith.constant 2  : i32
       %mul   = arith.muli %a, %two : i32
       %div   = arith.divui %mul, %two : i32

docs/marimo/ir_gen.py

@@ -117,7 +117,7 @@ def _(mo):
     Here is the expected MLIR output for the expression `x + x`:
     ```
     builtin.module {
-      func.func @main(%x : f64) -> f64 {
+      func.func @main(%x: f64) -> f64 {
         %add = arith.addf %x, %x : f64
         func.return %add : f64
       }

docs/marimo/mlir_ir.py

@@ -59,7 +59,7 @@ def _(mo):
 @app.cell(hide_code=True)
 def _():
     swap_text = """\
-    func.func @swap(%a : i32, %b : i32) -> (i32, i32) {
+    func.func @swap(%a: i32, %b: i32) -> (i32, i32) {
       func.return %b, %a : i32, i32
     }"""
     return (swap_text,)
@@ -199,7 +199,7 @@ def _(mo):
 @app.cell(hide_code=True)
 def _():
     fma_text = """\
-    func.func @multiply_and_add(%a : i32, %b : i32, %c : i32) -> (i32) {
+    func.func @multiply_and_add(%a: i32, %b: i32, %c: i32) -> (i32) {
       // Change this to return a * b + c instead
       func.return %a : i32
     }"""
@@ -227,7 +227,7 @@ def _(exercise_text, fma_text_area, mo):
 @app.cell(hide_code=True)
 def _(mo, xmo):
     fma_impl = """\
-    func.func @multiply_and_add(%a : i32, %b : i32, %c : i32) -> (i32) {
+    func.func @multiply_and_add(%a: i32, %b: i32, %c: i32) -> (i32) {
       %ab = arith.muli %a, %b : i32
       %res = arith.addi %ab, %c : i32
       func.return %res : i32
@@ -258,7 +258,7 @@ def _(mo):
 @app.cell(hide_code=True)
 def _():
     select_text = """\
-    func.func @select(%cond : i32, %a : i32, %b : i32) -> i32 {
+    func.func @select(%cond: i32, %a: i32, %b: i32) -> i32 {
       %res = scf.if %cond -> (i32) {
         scf.yield %a : i32
       } else {
@@ -300,7 +300,7 @@ def _(abs_function_text, mo):
 @app.cell(hide_code=True)
 def _():
     abs_function_text = """\
-    func.func @abs(%a : i32) -> i32 {
+    func.func @abs(%a: i32) -> i32 {
         %false = arith.constant 0 : i1
         %res = scf.if %false -> (i32) {
             scf.yield %a : i32
@@ -359,7 +359,7 @@ def _(abs_info_text, abs_input_text, abs_text_area, mo):
 @app.cell(hide_code=True)
 def _(mo, xmo):
     abs_impl = """\
-    func.func @abs(%a : i32) -> i32 {
+    func.func @abs(%a: i32) -> i32 {
         %zero = arith.constant 0 : i32
         %slt = arith.cmpi slt, %a, %zero : i32
         %res = scf.if %slt -> (i32) {

docs/marimo/pattern_rewrites.py

@@ -63,7 +63,7 @@ def _(mo):
 @app.cell(hide_code=True)
 def _(Parser, ctx):
     _before_text = """\
-    func.func @my_func(%x : index) -> index {
+    func.func @my_func(%x: index) -> index {
       %c0 = arith.constant 0 : index
       %c2 = arith.constant 2 : index
       %also_x = arith.addi %c0, %x : index
@@ -79,7 +79,7 @@ def _(Parser, ctx):
 @app.cell(hide_code=True)
 def _(Parser, ctx):
     _after_text = """\
-    func.func @my_func(%x : index) -> index {
+    func.func @my_func(%x: index) -> index {
       %two_x = arith.addi %x, %x : index
       func.return %two_x : index
     }

docs/marimo/pdl.py

@@ -77,15 +77,15 @@ def _(mo):
 @app.cell(hide_code=True)
 def _(Parser, builtin, ctx, xmo):
     first_text = """
-    func.func @first(%x : i32) -> i32 {
+    func.func @first(%x: i32) -> i32 {
       %c0 = arith.constant 0 : i32
       %y = arith.muli %x, %c0 : i32
       func.return %y : i32
     }
     """
 
     second_text = """
-    func.func @second(%x : i32) -> i32 {
+    func.func @second(%x: i32) -> i32 {
       %c0 = arith.constant 0 : i32
       func.return %c0 : i32
     }
@@ -462,7 +462,7 @@ def _(mo, xmo):
 @app.cell
 def _():
     expected_text = """\
-    func.func @main(%a : f64, %b : f64, %c : f64) -> f64 {
+    func.func @main(%a: f64, %b: f64, %c: f64) -> f64 {
       func.return %c : f64
     }"""
     return (expected_text,)

docs/marimo/rewrite_exercises.py

@@ -484,7 +484,7 @@ def _(mo):
 
     ```
     builtin.module {
-      func.func @main(%y : f64, %x : f64) -> f64 {
+      func.func @main(%y: f64, %x: f64) -> f64 {
         %0 = arith.subf %x, %y : f64
         func.return %0 : f64
       }

docs/marimo/riscv_dialects.py

@@ -241,7 +241,7 @@ def _(mo):
 @app.cell
 def _():
     mul_ir = """
-    riscv_func.func @mul(%num : !riscv.reg<a0>) -> !riscv.reg<a0> {
+    riscv_func.func @mul(%num: !riscv.reg<a0>) -> !riscv.reg<a0> {
       %res = riscv.mul %num, %num : (!riscv.reg<a0>, !riscv.reg<a0>) -> !riscv.reg<a0>
       riscv_func.return %res : !riscv.reg<a0>
     }
@@ -314,7 +314,7 @@ def _(mo):
 @app.cell(hide_code=True)
 def _(Parser, ctx, xmo):
     switch_ir = """\
-    riscv_func.func @switch(%a : !riscv.reg<a0>, %b : !riscv.reg<a1>, %c : !riscv.reg<a2>) -> !riscv.reg<a0> {
+    riscv_func.func @switch(%a: !riscv.reg<a0>, %b: !riscv.reg<a1>, %c: !riscv.reg<a2>) -> !riscv.reg<a0> {
       %zero = rv32.get_register : !riscv.reg<zero>
       riscv_cf.beq %a : !riscv.reg<a0>, %zero : !riscv.reg<zero>, ^bb2(), ^bb1()
     ^bb1():
@@ -435,14 +435,14 @@ def _(comment_only_line, fib_text):
 @app.cell(hide_code=True)
 def _(mo):
     fib_editor = mo.ui.code_editor("""\
-    riscv_func.func @fib(%num : !riscv.reg<a0>) -> !riscv.reg<a0> {
+    riscv_func.func @fib(%num: !riscv.reg<a0>) -> !riscv.reg<a0> {
       %zero = rv32.get_register : !riscv.reg<zero>
       riscv_cf.bge %zero: !riscv.reg<zero>, %num :!riscv.reg<a0>, ^bb4(), ^bb1()
     ^bb1():
       %a_init = rv32.li 1 : !riscv.reg<a2>
       %b_init = rv32.li 1 : !riscv.reg<a3>
       riscv_cf.branch ^bb2 (%num : !riscv.reg<a0>, %a_init : !riscv.reg<a2>, %b_init : !riscv.reg<a3>)
-    ^bb2(%i : !riscv.reg<a0>, %a_in : !riscv.reg<a2>, %b_in : !riscv.reg<a3>):
+    ^bb2(%i: !riscv.reg<a0>, %a_in: !riscv.reg<a2>, %b_in: !riscv.reg<a3>):
       riscv.label ".LBB1_2"
       %sum = rv32.li 2 : !riscv.reg<a4>
       %i_next = rv32.li 3 : !riscv.reg<a0>
@@ -501,14 +501,14 @@ def _():
     # Solution
 
     _ = """\
-    riscv_func.func @fib(%num : !riscv.reg<a0>) -> !riscv.reg<a0> {
+    riscv_func.func @fib(%num: !riscv.reg<a0>) -> !riscv.reg<a0> {
       %zero = rv32.get_register : !riscv.reg<zero>
       riscv_cf.bge %zero: !riscv.reg<zero>, %num :!riscv.reg<a0>, ^bb4(), ^bb1()
     ^bb1():
       %a_init = rv32.li 1 : !riscv.reg<a2>
       %b_init = rv32.li 1 : !riscv.reg<a3>
       riscv_cf.branch ^bb2 (%num : !riscv.reg<a0>, %a_init : !riscv.reg<a2>, %b_init : !riscv.reg<a3>)
-    ^bb2(%i : !riscv.reg<a0>, %a_in : !riscv.reg<a2>, %b_in : !riscv.reg<a3>):
+    ^bb2(%i: !riscv.reg<a0>, %a_in: !riscv.reg<a2>, %b_in: !riscv.reg<a3>):
       riscv.label ".LBB1_2"
       %sum = riscv.add %a_in, %b_in : (!riscv.reg<a2>, !riscv.reg<a3>) -> !riscv.reg<a4>
       %i_next = riscv.addi %i, -1 : (!riscv.reg<a0>) -> !riscv.reg<a0>

docs/marimo/xdsl_introduction.py

@@ -654,7 +654,7 @@ def _(mo):
     ```
     %0 : !sql.bag = sql.select() ["table_name" = "T"]
     %1 : !sql.bag = sql.filter(%0 : !sql.bag) {
-    ^bb0(%2 : !i32):
+    ^bb0(%2: !i32):
       %3 : !i32 = arith.constant() ["value" = 5 : !i32]
       %4 : !i32 = arith.constant() ["value" = 5 : !i32]
       %5 : !i32 = arith.addi(%3 : !i32, %4 : !i32)