Synthesis of PSL built-in rose() function.

5 files changed, 92 insertions, 2 deletions

diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb
index 6f8317831..7c2dba7c5 100644
--- a/src/synth/synth-expr.adb
+++ b/src/synth/synth-expr.adb
@@ -1927,6 +1927,37 @@ package body Synth.Expr is
 
    end Synth_Psl_Stable;
 
+   function Synth_Psl_Rose (Syn_Inst : Synth_Instance_Acc; Call : Node)
+                              return Valtyp
+   is
+      Ctxt    : constant Context_Acc := Get_Build (Syn_Inst);
+      DffCurr : Net;
+      Dff     : Net;
+      NotDff  : Net;
+      Clk_Net : Net;
+      Expr    : Valtyp;
+      Res     : Net;
+   begin
+      Expr := Synth_Expression (Syn_Inst, Get_Expression (Call));
+
+      Clk_Net := Synth_Psl_Function_Clock(Syn_Inst, Call, Ctxt);
+
+      DffCurr := Get_Net (Ctxt, Expr);
+      Set_Location (DffCurr, Call);
+      Dff := Build_Dff (Ctxt, Clk_Net, DffCurr);
+      Set_Location (Dff, Call);
+
+      NotDff := Build_Monadic (Ctxt, Id_Not, Dff);
+      Set_Location (NotDff, Call);
+
+      Res := Build_Dyadic (Ctxt, Id_And,
+             NotDff, DffCurr);
+      Set_Location (Res, Call);
+
+      return Create_Value_Net (Res, Boolean_Type);
+
+   end Synth_Psl_Rose;
+
    subtype And_Or_Module_Id is Module_Id range Id_And .. Id_Or;
 
    function Synth_Short_Circuit (Syn_Inst : Synth_Instance_Acc;
@@ -2269,6 +2300,8 @@ package body Synth.Expr is
             return Synth_Psl_Prev (Syn_Inst, Expr);
          when Iir_Kind_Psl_Stable =>
             return Synth_Psl_Stable (Syn_Inst, Expr);
+         when Iir_Kind_Psl_Rose =>
+            return Synth_Psl_Rose(Syn_Inst, Expr);
          when Iir_Kind_Overflow_Literal =>
             Error_Msg_Synth (+Expr, "out of bound expression");
             return No_Valtyp;
diff --git a/src/vhdl/vhdl-prints.adb b/src/vhdl/vhdl-prints.adb
index a0163a63d..60da5bef2 100644
--- a/src/vhdl/vhdl-prints.adb
+++ b/src/vhdl/vhdl-prints.adb
@@ -2303,6 +2303,21 @@ package body Vhdl.Prints is
       Disp_Token (Ctxt, Tok_Right_Paren);
    end Disp_Psl_Stable;
 
+   procedure Disp_Psl_Rose (Ctxt : in out Ctxt_Class; Call : Iir)
+   is
+      Expr : Iir;
+   begin
+      Disp_Token (Ctxt, Tok_Rose);
+      Disp_Token (Ctxt, Tok_Left_Paren);
+      Print (Ctxt, Get_Expression (Call));
+      Expr := Get_Clock_Expression (Call);
+      if Expr /= Null_Iir then
+         Disp_Token (Ctxt, Tok_Comma);
+         Print (Ctxt, Expr);
+      end if;
+      Disp_Token (Ctxt, Tok_Right_Paren);
+   end Disp_Psl_Rose;
+
    procedure Disp_Psl_Declaration (Ctxt : in out Ctxt_Class; Stmt : Iir)
    is
       Decl : constant PSL_Node := Get_Psl_Declaration (Stmt);
@@ -4768,6 +4783,8 @@ package body Vhdl.Prints is
             Disp_Psl_Prev (Ctxt, Expr);
          when Iir_Kind_Psl_Stable =>
             Disp_Psl_Stable (Ctxt, Expr);
+         when Iir_Kind_Psl_Rose =>
+            Disp_Psl_Rose (Ctxt, Expr);
 
          when Iir_Kinds_Type_And_Subtype_Definition =>
             Disp_Type (Ctxt, Expr);
diff --git a/src/vhdl/vhdl-sem_expr.adb b/src/vhdl/vhdl-sem_expr.adb
index c9cc2bae6..491d9873c 100644
--- a/src/vhdl/vhdl-sem_expr.adb
+++ b/src/vhdl/vhdl-sem_expr.adb
@@ -416,7 +416,8 @@ package body Vhdl.Sem_Expr is
            | Iir_Kind_Function_Call =>
             return Expr;
          when Iir_Kind_Psl_Endpoint_Declaration
-           | Iir_Kind_Psl_Stable =>
+           | Iir_Kind_Psl_Stable
+           | Iir_Kind_Psl_Rose =>
             return Expr;
          when Iir_Kind_Simple_Name
            | Iir_Kind_Parenthesis_Name
@@ -4832,6 +4833,9 @@ package body Vhdl.Sem_Expr is
          when Iir_Kind_Psl_Stable =>
             return Sem_Psl.Sem_Stable_Builtin (Expr);
 
+         when Iir_Kind_Psl_Rose =>
+            return Sem_Psl.Sem_Rose_Builtin (Expr);
+
          when Iir_Kind_Error =>
             --  Always ok.
             --  Use the error as a type.
diff --git a/src/vhdl/vhdl-sem_psl.adb b/src/vhdl/vhdl-sem_psl.adb
index 3d36070a3..d34d36918 100644
--- a/src/vhdl/vhdl-sem_psl.adb
+++ b/src/vhdl/vhdl-sem_psl.adb
@@ -141,7 +141,7 @@ package body Vhdl.Sem_Psl is
       end if;
 
       if First then
-         --  Analyze count and clock only once.
+         --  Analyze clock only once.
          Clock := Get_Clock_Expression (Call);
          if Clock /= Null_Iir then
             Clock := Sem_Expression_Wildcard (Clock, Wildcard_Psl_Bit_Type);
@@ -158,6 +158,41 @@ package body Vhdl.Sem_Psl is
       return Call;
    end Sem_Stable_Builtin;
 
+   function Sem_Rose_Builtin (Call : Iir) return Iir
+   is
+      use Vhdl.Sem_Expr;
+      use Vhdl.Std_Package;
+      Expr  : Iir;
+      Clock : Iir;
+      First : Boolean;
+   begin
+      Expr := Get_Expression (Call);
+      First := Is_Expr_Not_Analyzed (Expr);
+      Expr := Sem_Expression (Expr, Null_Iir);
+      if Expr /= Null_Iir then
+         Set_Expression (Call, Expr);
+         Set_Type (Call, Vhdl.Std_Package.Boolean_Type_Definition);
+         Set_Expr_Staticness (Call, None);
+      end if;
+
+      if First then
+         --  Analyze clock only once.
+         Clock := Get_Clock_Expression (Call);
+         if Clock /= Null_Iir then
+            Clock := Sem_Expression_Wildcard (Clock, Wildcard_Psl_Bit_Type);
+            Set_Clock_Expression (Call, Clock);
+         else
+            if Current_Psl_Default_Clock = Null_Iir then
+               Error_Msg_Sem (+Call, "no clock for PSL rose builtin");
+            else
+               Set_Default_Clock (Call, Current_Psl_Default_Clock);
+            end if;
+         end if;
+      end if;
+
+      return Call;
+   end Sem_Rose_Builtin;
+
    --  Convert VHDL and/or/not nodes to PSL nodes.
    function Convert_Bool (Expr : Iir) return PSL_Node
    is
diff --git a/src/vhdl/vhdl-sem_psl.ads b/src/vhdl/vhdl-sem_psl.ads
index 9f13ac080..28f67ed06 100644
--- a/src/vhdl/vhdl-sem_psl.ads
+++ b/src/vhdl/vhdl-sem_psl.ads
@@ -24,6 +24,7 @@ package Vhdl.Sem_Psl is
 
    function Sem_Prev_Builtin (Call : Iir; Atype : Iir) return Iir;
    function Sem_Stable_Builtin (Call : Iir) return Iir;
+   function Sem_Rose_Builtin (Call : Iir) return Iir;
 
    procedure Sem_Psl_Declaration (Stmt : Iir);
    procedure Sem_Psl_Endpoint_Declaration (Stmt : Iir);