Cesar Strauss [Sat, 16 Apr 2022 17:33:04 +0000 (14:33 -0300)]
Add port declarations to the SRAM wrappers
Cesar Strauss [Sat, 16 Apr 2022 17:25:14 +0000 (14:25 -0300)]
Change write lane signal from one-hot to binary
It's simpler to write, and actually runs faster, somehow...
Luke Kenneth Casson Leighton [Sat, 16 Apr 2022 16:21:05 +0000 (17:21 +0100)]
whoops, WBASyncBridge ack signal not wired up!
Luke Kenneth Casson Leighton [Sat, 16 Apr 2022 15:26:33 +0000 (16:26 +0100)]
select width is data_width // data granularity.
(common mistake to make, confused the hell out of me too)
Cesar Strauss [Sat, 16 Apr 2022 14:33:08 +0000 (11:33 -0300)]
Synchronize LVT state, completing the induction proof
Cesar Strauss [Sat, 16 Apr 2022 14:29:05 +0000 (11:29 -0300)]
Sync proof state with downstream memories
Luke Kenneth Casson Leighton [Sat, 16 Apr 2022 13:51:47 +0000 (14:51 +0100)]
put the old microwatt compatibility back
PLEASE DO NOT CHANGE THIS WITHOUT CONSULTATION
Luke Kenneth Casson Leighton [Sat, 16 Apr 2022 12:33:33 +0000 (13:33 +0100)]
blegh.
* add in a new PRE_IDLE state into issue FSM (to allow pc_at_reset to
get a word in edgeways)
* set nia to pc_at_reset on core_rst (not 0x0)
* add in a terrible hack where the STATE regfile entry for PC is
shifted down by one.
absolutely no frickin idea why that is needed
Cesar Strauss [Fri, 15 Apr 2022 19:43:56 +0000 (16:43 -0300)]
Complete moving the induction support into the DUT
That way, we pass the state down, to be checked by single code at
the lowest level, instead of having to check all variations of the
lower level states, at the top level.
Had to increment the proof depth, for some reason.
Cesar Strauss [Fri, 15 Apr 2022 19:36:05 +0000 (16:36 -0300)]
Fix incorrect signal widths
dbg_data is the width of a write lane (granularity) and dbg_wrote is a
single bit.
Cesar Strauss [Fri, 15 Apr 2022 16:55:00 +0000 (13:55 -0300)]
Move part of formal proof to the implementation
For induction, some state has to be synchronized with the
device under test. Make the device itself responsible for checking
this, to avoid exposing its internal workings, and making the proof
more generic.
This is done for PhasedDualPortRegfile, the rest will follow.
Luke Kenneth Casson Leighton [Thu, 14 Apr 2022 13:13:23 +0000 (14:13 +0100)]
add option Spec to XICS ICP/ICS to be able to activate (in a horrible
hack way) make_wb_layout to add stall
this is done by spotting "spec.microwatt_compat" adds stall
blegh
Luke Kenneth Casson Leighton [Thu, 14 Apr 2022 13:12:36 +0000 (14:12 +0100)]
move IRQLine out because that makes soc dependent on LambdaSOC
Luke Kenneth Casson Leighton [Thu, 14 Apr 2022 11:47:24 +0000 (12:47 +0100)]
80 char limit, remove creation of stall from ack/cyc, it has to be
done in the parent because that is what knows the usage
Raptor Engineering Development Team [Thu, 14 Apr 2022 00:57:20 +0000 (19:57 -0500)]
wb_async: Allow different feature fields for master/slave busses
Raptor Engineering Development Team [Thu, 14 Apr 2022 00:56:47 +0000 (19:56 -0500)]
Add separate memory clock register to SYSCON
Tobias Platen [Tue, 12 Apr 2022 18:37:00 +0000 (20:37 +0200)]
issuer.py: add microwatt_old and microwatt_debug options
Raptor Engineering Development Team [Mon, 11 Apr 2022 19:31:02 +0000 (14:31 -0500)]
Separate core and nest clocks in Microwatt SYSCON
Raptor Engineering Development Team [Mon, 11 Apr 2022 19:30:39 +0000 (14:30 -0500)]
Add initial wrapper for Wishbone asynchronous bridge module
Cesar Strauss [Sun, 10 Apr 2022 15:21:14 +0000 (12:21 -0300)]
Begin a formal proof of the LVT-based 1W/1R wrapper
Start with a Bounded Model Check, on the transparent case.
Cesar Strauss [Sun, 10 Apr 2022 12:24:19 +0000 (09:24 -0300)]
Implement 1W/1R with a transparent (or not) read port.
Seems that it's just a matter of the underlying memories being
transparent (or not).
Cesar Strauss [Sat, 9 Apr 2022 21:15:52 +0000 (18:15 -0300)]
Implement a true 1W/1R memory from 1RW blocks
Uses four phased memories, multiplexers, and FFRAM for the LVT.
Only non-transparent reads, for now.
Test case is included, seems to work.
Luke Kenneth Casson Leighton [Sat, 9 Apr 2022 12:36:12 +0000 (13:36 +0100)]
add a new make target for setting coldboot firmware at 0xfff0_0000
put reset values of pc and msr into Issuer explicitly on reset
Luke Kenneth Casson Leighton [Fri, 8 Apr 2022 20:10:19 +0000 (21:10 +0100)]
syntax error
Luke Kenneth Casson Leighton [Fri, 8 Apr 2022 20:10:00 +0000 (21:10 +0100)]
add dram to SysCon
Luke Kenneth Casson Leighton [Fri, 8 Apr 2022 17:41:30 +0000 (18:41 +0100)]
add SPI offset to microwatt syscon
Luke Kenneth Casson Leighton [Wed, 6 Apr 2022 11:29:03 +0000 (12:29 +0100)]
only add clock-settings on ECP5 due to special SPI clock handling
(Tercel QSPI)
Luke Kenneth Casson Leighton [Mon, 4 Apr 2022 21:32:32 +0000 (22:32 +0100)]
add tempfile to uart16550 wrapper which defines DATA_BUS_WIDTH_8
Luke Kenneth Casson Leighton [Mon, 4 Apr 2022 20:41:51 +0000 (21:41 +0100)]
disable sphinx verilg-diagrams for now
Luke Kenneth Casson Leighton [Mon, 4 Apr 2022 19:13:41 +0000 (20:13 +0100)]
allow direction-setting on each of dq0-3 in Tercel QSPI
Luke Kenneth Casson Leighton [Sun, 3 Apr 2022 23:52:27 +0000 (00:52 +0100)]
cant stand the practice of putting docstrings *after* the code they
document. a trick to get them to go on one line: semi-colons
Cesar Strauss [Sun, 3 Apr 2022 22:12:15 +0000 (19:12 -0300)]
Extend the proof to a non-transparent port
For the non-transparent case, have to distinguish the case of a
simultaneous write, where the expected value is the previous
value of the holding register, not the new.
Cesar Strauss [Sun, 3 Apr 2022 19:31:13 +0000 (16:31 -0300)]
Run formal proof on both types (even/odd) of phased SRAMs
Cesar Strauss [Sun, 3 Apr 2022 19:10:16 +0000 (16:10 -0300)]
Complete the formal proof of the pseudo dual port SRAM
Have to ensure that the holding register is in sync with the memory
contents, to avoid false positives due to unreachable states.
Since we are adding assertions, we can only strengthen the proof, even
if it does become more complex.
Cesar Strauss [Sun, 3 Apr 2022 18:50:43 +0000 (15:50 -0300)]
Implement a debug port on the pseudo 1W/1R SRAM
Exposes the debug ports of the underlying memories.
This is needed to assist the induction proof.
Cesar Strauss [Sun, 3 Apr 2022 18:24:16 +0000 (15:24 -0300)]
Formal proof of the phased write dual port memory wrapper
Similar to the proof of the 1RW memory block, but read and writes are
done on dedicated ports.
For now, only transparent regfile is tested.
To complete the formal verification, an induction proof will follow.
Luke Kenneth Casson Leighton [Sun, 3 Apr 2022 16:00:18 +0000 (17:00 +0100)]
correct default to zero string not zero int
Luke Kenneth Casson Leighton [Sun, 3 Apr 2022 10:30:44 +0000 (11:30 +0100)]
add alternative pc_reset argument to issuer_verilog.py
which propagates right the way down to core.py
next to msr_reset it is now possible to set the pc_reset value.
these actually have to go into the regfile as initial values,
which will be fun for an ASIC
Luke Kenneth Casson Leighton [Sun, 3 Apr 2022 10:29:33 +0000 (11:29 +0100)]
fix some of instantiation errors in opencores_ethmac.py
Raptor Engineering Development Team [Sat, 2 Apr 2022 21:52:49 +0000 (16:52 -0500)]
Fix opencores EthMAC module wiring
Cesar Strauss [Sat, 2 Apr 2022 20:46:29 +0000 (17:46 -0300)]
Implement transparent read ports on the phased write SRAM
Add a multiplexer to select the write memory instead of the read
memory, in case both port addresses coincide.
Cesar Strauss [Fri, 1 Apr 2022 09:47:01 +0000 (06:47 -0300)]
Implement and test a "phased write port" memory
It has one read and one write port, but the writes can only happen every
two cycles.
It uses two 1RW memory blocks.
For the moment, it's not transparent: a simultaneous read and write from
the same address returns the old value. Next step is implementing a
transparent read port.
Luke Kenneth Casson Leighton [Thu, 31 Mar 2022 13:44:24 +0000 (14:44 +0100)]
invert cs_n pin in Tercel
Luke Kenneth Casson Leighton [Wed, 30 Mar 2022 09:27:44 +0000 (10:27 +0100)]
nope, default features in Tercel WB Buses need to not set err yet
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 19:43:10 +0000 (20:43 +0100)]
add bus.err to list of default Wishbone signals in Tercel
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 18:54:40 +0000 (19:54 +0100)]
byte-reverse Tercel read/write data and config bus. urr...
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 18:18:07 +0000 (19:18 +0100)]
set clock freq Constant length to 32-bit in Tercel.
this really needs to come from SYSCON
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 14:28:52 +0000 (15:28 +0100)]
self.specials does not exist, Instances must be added as submodules
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 13:33:49 +0000 (14:33 +0100)]
more sorting out wishbone names in Tercel
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 13:15:00 +0000 (14:15 +0100)]
fix names of Instance signals in Tercel
names *start* with o_ for output i_ for input p_ for parameter a_ for attr
not end with them
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 13:10:30 +0000 (14:10 +0100)]
sort out variable names in Tercel
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 12:51:49 +0000 (13:51 +0100)]
self.comb does not exist, comb is a local temp-var (comb = m.d.comb)
Luke Kenneth Casson Leighton [Tue, 29 Mar 2022 12:11:47 +0000 (13:11 +0100)]
whitespace cleanup (80 char limit)
Raptor Engineering Development Team [Tue, 29 Mar 2022 01:11:17 +0000 (20:11 -0500)]
Add initial integration for OpenCores 10/100 Ethernet MAC
Cesar Strauss [Sun, 27 Mar 2022 17:23:39 +0000 (14:23 -0300)]
Finish the SRAM formal proof by implementing induction
Add a combinatorial (no delay) debug read port to the SRAM model,
for turning an unreacheable state (memory and holding register differ)
into an illegal state.
Just two clock cycles are needed for a working proof.
Cesar Strauss [Sat, 26 Mar 2022 21:09:12 +0000 (18:09 -0300)]
Add formal verification of the single port memory block
We test a single, random memory location.
If any memory location, chosen at random, passes, then the whole memory
is correct.
Note that an induction proof is still missing, since it requires
additional assertions to avoid illegal states.
Luke Kenneth Casson Leighton [Sat, 26 Mar 2022 20:18:53 +0000 (20:18 +0000)]
rename PLRU modules to avoid conflict in microwatt
Luke Kenneth Casson Leighton [Fri, 18 Mar 2022 10:45:59 +0000 (10:45 +0000)]
whitespace cleanup (80 char limit, pep8)
Luke Kenneth Casson Leighton [Fri, 18 Mar 2022 10:00:13 +0000 (10:00 +0000)]
turn CompALU/CompLDST latches synchronous
to cut down combinatorial loops
Raptor Engineering Development Team [Mon, 14 Mar 2022 00:33:04 +0000 (19:33 -0500)]
Add initial Tercel integration
NOTE: Still needs testing on physical hardware,
waiting for Arctic Tern support.
Cesar Strauss [Sun, 13 Mar 2022 19:13:04 +0000 (16:13 -0300)]
Simulate some read/write/modify operations on the SRAM model
Cesar Strauss [Sun, 13 Mar 2022 11:56:24 +0000 (08:56 -0300)]
Add a Single R/W Port SRAM model
Begin making unit tests by checking with Yosys.
Luke Kenneth Casson Leighton [Sat, 12 Mar 2022 16:08:29 +0000 (16:08 +0000)]
add extra pipeline stages to ALU FU to make timing
Luke Kenneth Casson Leighton [Sat, 12 Mar 2022 15:45:16 +0000 (15:45 +0000)]
introduce extra register of delay to split combinatorial loops
by making fetch_ic_i_valid sync
Luke Kenneth Casson Leighton [Sat, 12 Mar 2022 14:43:19 +0000 (14:43 +0000)]
Revert "read last row from r.wb.adr not r.req_adr in icache"
This reverts commit
1bcb90676398c8fa0c309c3c7ed3c9ef306c577e.
Luke Kenneth Casson Leighton [Sat, 12 Mar 2022 14:13:15 +0000 (14:13 +0000)]
Revert "store cur_state.pc+4 in separate register to help reduce"
This reverts commit
d9b58d594ede33db2b0290d7edf8e062f5e91460.
Luke Kenneth Casson Leighton [Sat, 12 Mar 2022 13:22:39 +0000 (13:22 +0000)]
store cur_state.pc+4 in separate register to help reduce
combinatorial chains
Luke Kenneth Casson Leighton [Sat, 12 Mar 2022 13:22:15 +0000 (13:22 +0000)]
read last row from r.wb.adr not r.req_adr in icache
Luke Kenneth Casson Leighton [Tue, 8 Mar 2022 16:47:27 +0000 (16:47 +0000)]
remove stbs_done in icache.py
Luke Kenneth Casson Leighton [Tue, 8 Mar 2022 15:46:15 +0000 (15:46 +0000)]
remove ld_stbs_done from dcache: not needed
Luke Kenneth Casson Leighton [Tue, 8 Mar 2022 15:45:49 +0000 (15:45 +0000)]
work-in-progress on sdram opencores wrapper
Cesar Strauss [Sun, 6 Mar 2022 18:00:37 +0000 (15:00 -0300)]
Copy the startup delay from issuer.py to inorder.py
Fixes TestIssuerInternalInOrder hanging at startup.
Luke Kenneth Casson Leighton [Mon, 28 Feb 2022 17:43:39 +0000 (17:43 +0000)]
attempting to introduce an extra few clock cycles delay on power-up
this may help with initialisation of I-Cache SRAM which is combinatorial.
maybe
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 21:23:12 +0000 (21:23 +0000)]
for lulz make I-Cache possible to set to 32-bit (XLEN=32)
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 19:50:33 +0000 (19:50 +0000)]
bit_length is 1 more than needed: subtract 1 from XLEN first
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 19:34:05 +0000 (19:34 +0000)]
fix up shift_rot test_pipe_caller to new regspeckls style
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 19:25:54 +0000 (19:25 +0000)]
convert shift_rot pipeline to XLEN=32/64
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 19:16:35 +0000 (19:16 +0000)]
fix up Logical pipeline to produce HDL with XLEN=32
fix Logical test_pipe_caller.py to use new regspeckls style
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 18:48:28 +0000 (18:48 +0000)]
whoops ALU common output target must be XLEN-bit,
cannot set to length of output (o) using Signal.like
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 18:41:43 +0000 (18:41 +0000)]
set up dummy parent_pspec to pass XLEN=64 in
ALU test_pipe_spec.py
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 18:37:37 +0000 (18:37 +0000)]
start on converting MUL and DIV pipelines to XLEN
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 18:17:08 +0000 (18:17 +0000)]
convert from public static functions/properties for regspecs
to member functions to obtain regspecs
this allows pspec (containing XLEN) to be passed to the regspecs,
which in turn allows them to be dynamically set by issuer_verilog.py
and unit tests
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 18:09:13 +0000 (18:09 +0000)]
fix ALU with XLEN=32, carry and overflow
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 18:01:54 +0000 (18:01 +0000)]
use XLEN in Function Units (starting with ALU)
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 17:31:51 +0000 (17:31 +0000)]
add XLEN to issuer_verilog.py defaults to 64
Luke Kenneth Casson Leighton [Sun, 27 Feb 2022 17:17:07 +0000 (17:17 +0000)]
add XLEN option to regfiles via pspec
Jacob Lifshay [Thu, 24 Feb 2022 03:33:13 +0000 (19:33 -0800)]
add running instructions
Jacob Lifshay [Thu, 24 Feb 2022 03:28:02 +0000 (19:28 -0800)]
add formal proof for shift/rot o.ok
Jacob Lifshay [Thu, 24 Feb 2022 03:16:17 +0000 (19:16 -0800)]
clean up code
Jacob Lifshay [Thu, 24 Feb 2022 03:12:49 +0000 (19:12 -0800)]
add formal proof for OP_RLCR
Jacob Lifshay [Thu, 24 Feb 2022 03:01:49 +0000 (19:01 -0800)]
add formal proof for OP_RLCL
Jacob Lifshay [Thu, 24 Feb 2022 02:40:48 +0000 (18:40 -0800)]
add formal proof for OP_RLC
Luke Kenneth Casson Leighton [Wed, 23 Feb 2022 17:17:50 +0000 (17:17 +0000)]
forgot to pass cix (cache-inhibited) through to LD/ST which was
causing D-Cache to make too many read/writes and overrun wishbone
bus addressing on peripherals.
D-Cache always (for non-cache-inhibited) makes 8 64-bit requests:
if a memory-mapped peripheral has only say 3 32-bit CSRs then the
additional requests beyond the range of the peripheral will cause
a permanent lock-up
Jacob Lifshay [Tue, 22 Feb 2022 09:33:16 +0000 (01:33 -0800)]
speed up shift/rot formal proof by running stuff in parallel
it now runs in about 1m30s in `pytest -n auto <file>.py`
also start work on rewriting proofs to hopefully work better, all
of grev, ternlog, extswsli, shl, and shr are completed.
Luke Kenneth Casson Leighton [Mon, 21 Feb 2022 00:26:14 +0000 (00:26 +0000)]
again reduce combinatorial chains, similar to Trap pipeline,
introduce dummy passthrough stage in Branch pipeline
Luke Kenneth Casson Leighton [Sun, 20 Feb 2022 23:58:58 +0000 (23:58 +0000)]
add syn_ramstyle "block_ram" attributes and reduce i/d-cache sizes again
Luke Kenneth Casson Leighton [Sun, 20 Feb 2022 23:51:32 +0000 (23:51 +0000)]
same as shiftrot, split out separate pipelines for logical
stages in order to meet FPGA timing
Luke Kenneth Casson Leighton [Sun, 20 Feb 2022 23:38:13 +0000 (23:38 +0000)]
put LDST go-store on a 1-clock delay to help with combinatorial chains
Luke Kenneth Casson Leighton [Sun, 20 Feb 2022 23:28:50 +0000 (23:28 +0000)]
name core_stop and terminated_o synchronous to potentially help
cut down on combinatorial chains
Luke Kenneth Casson Leighton [Sun, 20 Feb 2022 22:20:21 +0000 (22:20 +0000)]
nope, it's perfectly fine
Revert "weird exception, oe not found in the shiftrot input record"
This reverts commit
264cc7fd7d7547e1e19424b8f8fd0fbfea29cec5.