Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tester prototype #83

Merged
merged 23 commits into from
Apr 7, 2020
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a8a9e2a
Initial commit for tester prototype
coreyeng Feb 11, 2020
c730b47
Various updates for tester prototype. Updated list/dict-like APIs to …
coreyeng Feb 12, 2020
514ec53
Merge with master. xfail one of the tests that assumes tester is none.
coreyeng Feb 12, 2020
f729f5d
Some additional tests and reorg
coreyeng Feb 13, 2020
dd24dde
Reorganize pins under the DUT, as timesets, register, etc. are
coreyeng Feb 17, 2020
7f2a189
(Sorry for pushing to an unrelated PR, but its easier this way) Part …
coreyeng Feb 20, 2020
dc62b75
Moved pin group/collections to use list like API. Updated specs. Turn…
coreyeng Feb 22, 2020
5993628
Added a rudimentary pin header object. Can be expanded later as needed.
coreyeng Feb 24, 2020
e181890
Base work for #88 - target system changes
coreyeng Mar 17, 2020
74a056f
Merge with master
coreyeng Mar 17, 2020
7101fd0
Quick bugfix induced by starting #88
coreyeng Mar 17, 2020
0f09092
Integrate proper AST with tester
coreyeng Mar 20, 2020
02d3e08
Fix cargo tests
coreyeng Mar 20, 2020
3854bd4
Round two of cargo test
coreyeng Mar 20, 2020
8d7a11b
Switched 'generator' to either 'tester' or 'renderer' depending on co…
coreyeng Mar 20, 2020
5599040
Revert dut(), tester(), and services() to wait on mutex lock
coreyeng Mar 21, 2020
e94ec26
began work on #88 - target system updates
coreyeng Mar 21, 2020
d1f461d
Merge with master
coreyeng Mar 24, 2020
f96b8af
Merge with master. Add output directory to .gitignore for the example…
coreyeng Mar 31, 2020
d45ecb1
Merge with latest AST changes
coreyeng Apr 1, 2020
d986b65
Merge with latest AST changes
coreyeng Apr 1, 2020
2c3a211
Merge with latest tester prototype
coreyeng Apr 1, 2020
fe0a94c
~90% of issue #88
coreyeng Apr 5, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ log/
*.swp
*.swo
*~

# Output files from regressions
python/templates/dut_info.txt
4 changes: 3 additions & 1 deletion example/example/blocks/dut/derivatives/eagle/pins.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
Pin("portb", width= 4)
Pin("portc", width=2, reset_data=0b11)
Pin("clk", reset_data=0, reset_action="D")
Alias("clk", "swd_clk", "tclk")
Alias("clk", "swd_clk", "tclk")
PinHeader("ports", "porta", "portb", "portc")
PinHeader("clk", "clk")
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions example/targets/eagle_with_simulator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
origen.app.instantiate_dut("dut.eagle")
origen.tester.target("::Simulator")
2 changes: 2 additions & 0 deletions example/targets/eagle_with_st7.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
origen.app.instantiate_dut("dut.eagle")
origen.tester.target("::V93K::ST7")
1 change: 1 addition & 0 deletions example/targets/tester/sim.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
origen.tester.target("::Simulator")
1 change: 1 addition & 0 deletions example/targets/tester/v93k_st7.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
origen.tester.target("::V93K::ST7")
4 changes: 3 additions & 1 deletion example/tests/compiler_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import origen
import origen # pylint: disable=import-error
import pytest
import pathlib
import os
Expand All @@ -17,6 +17,8 @@ def test_compiler_inits():
assert isinstance(origen.app.compiler.syntax, origen.compiler.Compiler.MakoSyntax) == True
assert origen.app.compiler.templates_dir() == pathlib.Path(f"{origen.root}/{origen.app.name}/templates")

# With the current tester prototype, 'origen.tester' is always valid and this test fails.
@pytest.mark.xfail
def test_compiler_understands_global_context():
assert origen.app.compile("dut's name is ${dut.name}").renders[0] == "dut's name is dut"
assert origen.app.compile("tester is ${tester}").renders[1] == "tester is None"
Expand Down
Loading