From b8ba98e661830b4e720d7ecafbcdce15f21085cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eymen=20=C3=9Cnay?=
 <20779470+Eymay@users.noreply.github.com>
Date: Thu, 18 May 2023 16:56:36 +0300
Subject: [PATCH] cleanup and rebase fixes

---
 xdsl/dialects/riscv.py              | 9 ---------
 xdsl/dialects/riscv_func.py         | 7 ++-----
 xdsl/transforms/lower_riscv_func.py | 1 +
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/xdsl/dialects/riscv.py b/xdsl/dialects/riscv.py
index 9d1a279e00..0227271797 100644
--- a/xdsl/dialects/riscv.py
+++ b/xdsl/dialects/riscv.py
@@ -1064,15 +1064,6 @@ class JalOp(RdImmJumpOperation):
 
     name = "riscv.jal"
 
-    def __init__(
-        self,
-        immediate: int | AnyIntegerAttr | str | LabelAttr,
-        *,
-        rd: RegisterType | Register | None = None,
-        comment: str | StringAttr | None = None,
-    ):
-        super().__init__(immediate, rd=rd)
-
 
 @irdl_op_definition
 class JOp(RdImmJumpOperation):
diff --git a/xdsl/dialects/riscv_func.py b/xdsl/dialects/riscv_func.py
index 1716ca689a..ece38ac62f 100644
--- a/xdsl/dialects/riscv_func.py
+++ b/xdsl/dialects/riscv_func.py
@@ -25,10 +25,6 @@ class SyscallOp(IRDLOperation):
     args: Annotated[VarOperand, riscv.RegisterType]
     syscall_num: OpAttr[IntegerAttr[IntegerType]]
     result: Annotated[OptOpResult, riscv.RegisterType]
-    """
-    Some syscalls return values by putting them into a0. If result is not None, then the
-    contents of a0 will be moved to its register.
-    """
 
     def __init__(
         self,
@@ -139,8 +135,9 @@ def __init__(
         )
 
 
-RISCV_FUNC = Dialect(
+RISCV_Func = Dialect(
     [
+        SyscallOp,
         CallOp,
         FuncOp,
         ReturnOp,
diff --git a/xdsl/transforms/lower_riscv_func.py b/xdsl/transforms/lower_riscv_func.py
index d3ff36131d..f26cac1431 100644
--- a/xdsl/transforms/lower_riscv_func.py
+++ b/xdsl/transforms/lower_riscv_func.py
@@ -124,6 +124,7 @@ class LowerRISCVFunc(ModulePass):
     name = "lower-riscv-func"
 
     def apply(self, ctx: MLContext, op: ModuleOp) -> None:
+        PatternRewriteWalker(LowerSyscallOp()).rewrite_module(op)
         PatternRewriteWalker(LowerRISCVFuncReturnOp()).rewrite_module(op)
         PatternRewriteWalker(LowerRISCVFuncOp()).rewrite_module(op)
         PatternRewriteWalker(LowerRISCVCallOp()).rewrite_module(op)