luke
/
sv2v
mirror of https://github.com/zachjs/sv2v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix common_module_item to include deferred_assertion_item (#178)

This commit is contained in:
Saw Xue Zheng 2021-09-12 03:22:04 +08:00 committed by GitHub
parent 88d632fb14
commit 8ecd2c6e52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Language/SystemVerilog/Parser/Parse.y
View File

@ -720,28 +720,43 @@ AssignOption :: { AssignOption }
-- for ModuleItem, for now
AssertionItem :: { AssertionItem }
: ConcurrentAssertionItem { $1 }
: ConcurrentAssertionItem { $1 }
| DeferredImmediateAssertionItem { $1 }
-- for Stmt, for now
ProceduralAssertionStatement :: { Assertion }
: ConcurrentAssertionStatement { $1 }
| ImmediateAssertionStatement { $1 }
ImmediateAssertionStatement :: { Assertion }
: SimpleImmediateAssertionStatement { $1 }
| DeferredImmediateAssertionStatement { $1 }
DeferredImmediateAssertionItem :: { AssertionItem }
: Identifier ":" DeferredImmediateAssertionStatement { ($1, $3) }
| DeferredImmediateAssertionStatement { ("", $1) }
ConcurrentAssertionItem :: { AssertionItem }
: Identifier ":" ConcurrentAssertionStatement { ($1, $3) }
| ConcurrentAssertionStatement { ("", $1) }
ConcurrentAssertionStatement :: { Assertion }
: "assert" "property" "(" PropertySpec ")" ActionBlock { Assert (Concurrent $4) $6 }
| "assume" "property" "(" PropertySpec ")" ActionBlock { Assume (Concurrent $4) $6 }
| "cover" "property" "(" PropertySpec ")" Stmt { Cover (Concurrent $4) $6 }
ImmediateAssertionStatement :: { Assertion }
DeferredImmediateAssertionStatement :: { Assertion }
: "assert" Deferral "(" Expr ")" ActionBlock { Assert (Immediate $2 $4) $6 }
| "assume" Deferral "(" Expr ")" ActionBlock { Assume (Immediate $2 $4) $6 }
| "cover" Deferral "(" Expr ")" Stmt { Cover (Immediate $2 $4) $6 }
SimpleImmediateAssertionStatement :: { Assertion }
: "assert" "(" Expr ")" ActionBlock { Assert (Immediate NotDeferred $3) $5 }
| "assume" "(" Expr ")" ActionBlock { Assume (Immediate NotDeferred $3) $5 }
| "cover" "(" Expr ")" Stmt { Cover (Immediate NotDeferred $3) $5 }
Deferral :: { Deferral }
: {- empty -} { NotDeferred }
| "#" number {% expectZeroDelay $2 ObservedDeferred }
: "#" number {% expectZeroDelay $2 ObservedDeferred }
| "final" { FinalDeferred }
PropertySpec :: { PropertySpec }

15
test/nosim/assert.sv
View File

@ -22,6 +22,21 @@ module top;
assume final (1);
cover final (1);
end
assert final (1);
assume final (1);
cover final (1);
a1: assert final (1);
a2: assume final (1);
a3: cover final (1);
assert #0 (1);
assume #0 (1);
cover #0 (1);
b1: assert #0 (1);
b2: assume #0 (1);
b3: cover #0 (1);
assert property (@(posedge clk) 1)
else $display("FOO");
assume property (@(posedge clk) 1)