Skip to content

Commit 7385491

Browse files
committed
some tests are correctly updated.
1 parent d29d7ba commit 7385491

33 files changed

+165
-71
lines changed

led.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import sys
2+
import os
3+
from veriloggen import *
4+
5+
def mkLed():
6+
m = Module('blinkled')
7+
width = m.Parameter('WIDTH', 8)
8+
clk = m.Input('CLK')
9+
rst = m.Input('RST')
10+
led = m.OutputReg('LED', width)
11+
count = m.Reg('count', 32)
12+
13+
m.Always(Posedge(clk))(
14+
If(rst)(
15+
count(0)
16+
).Else(
17+
If(count == 1023)(
18+
count(0)
19+
).Else(
20+
count(count + 1)
21+
)
22+
))
23+
24+
m.Always(Posedge(clk))(
25+
If(rst)(
26+
led(0)
27+
).Else(
28+
If(count == 1024 - 1)(
29+
led(led + 1)
30+
)
31+
))
32+
33+
return m
34+
35+
if __name__ == '__main__':
36+
led = mkLed()
37+
# led.to_verilog(filename='tmp.v')
38+
verilog = led.to_verilog()
39+
print(verilog)

tests/cat/cat.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import sys
22
import os
33

4+
# the next line can be removed after installation
5+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
6+
47
from veriloggen import *
58

69
def mkLed():

tests/cat/test_cat.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import led
1+
import cat
22

33
expected_verilog = """
44
module blinkled #
@@ -34,9 +34,9 @@
3434
endmodule
3535
"""
3636

37-
def test_led():
38-
led_module = led.mkLed()
39-
led_code = led_module.to_verilog()
37+
def test():
38+
test_module = cat.mkLed()
39+
code = test_module.to_verilog()
4040

4141
from pyverilog.vparser.parser import VerilogParser
4242
from pyverilog.ast_code_generator.codegen import ASTCodeGenerator
@@ -45,4 +45,4 @@ def test_led():
4545
codegen = ASTCodeGenerator()
4646
expected_code = codegen.visit(expected_ast)
4747

48-
assert(expected_code == led_code)
48+
assert(expected_code == code)

tests/class/class.py renamed to tests/class/_class.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import sys
22
import os
33

4+
# the next line can be removed after installation
5+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
6+
47
from veriloggen import *
58

69
class Led(Module):

tests/class/test_class.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import led
1+
import _class
22

33
expected_verilog = """
44
module blinkled #
@@ -34,9 +34,9 @@
3434
endmodule
3535
"""
3636

37-
def test_led():
38-
led_module = led.Led()
39-
led_code = led_module.to_verilog()
37+
def test():
38+
test_module = _class.Led()
39+
code = test_module.to_verilog()
4040

4141
from pyverilog.vparser.parser import VerilogParser
4242
from pyverilog.ast_code_generator.codegen import ASTCodeGenerator
@@ -45,4 +45,4 @@ def test_led():
4545
codegen = ASTCodeGenerator()
4646
expected_code = codegen.visit(expected_ast)
4747

48-
assert(expected_code == led_code)
48+
assert(expected_code == code)

tests/cond/cond.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import sys
22
import os
3+
4+
# the next line can be removed after installation
5+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
6+
37
from veriloggen import *
48

59
def mkLed():

tests/cond/test_cond.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import led
1+
import cond
22

33
expected_verilog = """
44
module test #
@@ -73,8 +73,8 @@
7373
endmodule
7474
"""
7575

76-
def test_led():
77-
test_module = led.mkTest()
76+
def test():
77+
test_module = cond.mkTest()
7878
code = test_module.to_verilog()
7979

8080
from pyverilog.vparser.parser import VerilogParser

tests/for/for.py renamed to tests/for/_for.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import sys
22
import os
33

4+
# the next line can be removed after installation
5+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
6+
47
from veriloggen import *
58

69
def mkLed():

tests/for/test_for.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import led
1+
import _for
22

33
expected_verilog = """
44
module blinkled #
@@ -31,9 +31,9 @@
3131
endmodule
3232
"""
3333

34-
def test_led():
35-
led_module = led.mkLed()
36-
led_code = led_module.to_verilog()
34+
def test():
35+
test_module = _for.mkLed()
36+
code = test_module.to_verilog()
3737

3838
from pyverilog.vparser.parser import VerilogParser
3939
from pyverilog.ast_code_generator.codegen import ASTCodeGenerator
@@ -42,4 +42,4 @@ def test_led():
4242
codegen = ASTCodeGenerator()
4343
expected_code = codegen.visit(expected_ast)
4444

45-
assert(expected_code == led_code)
45+
assert(expected_code == code)

tests/function/function.py renamed to tests/function/_function.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import sys
22
import os
33

4+
# the next line can be removed after installation
5+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
6+
47
from veriloggen import *
58

69
# external function definition

0 commit comments

Comments
 (0)