dialects: (riscv) add ability to fld from label (#1797)

Will file some issues to add this to the rest of the fld/fsd ops
xdslproject · Nov 23, 2023 · a517988 · a517988
1 parent 3fe2047
commit a517988
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/tests/filecheck/dialects/riscv/riscv_assembly_emission.mlir b/tests/filecheck/dialects/riscv/riscv_assembly_emission.mlir
@@ -254,6 +254,10 @@
 
     %fld = riscv.fld %0, 1 : (!riscv.reg<zero>) -> !riscv.freg<j8>
     // CHECK-NEXT: fld j8, 1(zero)
+
+    %min_val = riscv.fld %0, "hello" : (!riscv.reg<zero>) -> !riscv.freg<j8>
+    // CHECK-NEXT: fld j8, hello, zero
+
     riscv.fsd %0, %f0, 1  : (!riscv.reg<zero>, !riscv.freg<j5>) -> ()
     // CHECK-NEXT: fsd j5, 1(zero)
 

diff --git a/xdsl/dialects/riscv.py b/xdsl/dialects/riscv.py
@@ -3532,9 +3532,14 @@ def assembly_line(self) -> str | None:
         value = _assembly_arg_str(self.rd)
         imm = _assembly_arg_str(self.immediate)
         offset = _assembly_arg_str(self.rs1)
-        return _assembly_line(
-            instruction_name, f"{value}, {imm}({offset})", self.comment
-        )
+        if isinstance(self.immediate, LabelAttr):
+            return _assembly_line(
+                instruction_name, f"{value}, {imm}, {offset}", self.comment
+            )
+        else:
+            return _assembly_line(
+                instruction_name, f"{value}, {imm}({offset})", self.comment
+            )
 
 
 class FSdOpHasCanonicalizationPatternTrait(HasCanonicalisationPatternsTrait):