forked from cores/microwatt
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Paul Mackerras
9b3b57710a
This fixes two bugs in the flash invalidation of the icache. The first is that an instruction could get executed twice. The i-cache RAM is 2 instructions (64 bits) wide, so one read can supply results for 2 cycles. The fetch1 stage tells icache when the address is equal to the address of the previous cycle plus 4, and in cases where that is true, bit 2 of the address is 1, and the previous cycle was a cache hit, we just use the second word of the doubleword read from the cache RAM. However, the cache hit/miss logic also continues to operate, so in the case where the first word hits but the second word misses (because of an icache invalidation or a snoop occurring in the first cycle), we supply the instruction from the data previously read from the icache RAM but also stall fetch1 and start a cache reload sequence, and subsequently supply the second instruction again. This fixes the issue by inhibiting req_is_miss and stall_out when use_previous is true. The second bug is that if an icache invalidation occurs while reloading a line, we continue to reload the line, and make it valid when the reload finishes, even though some of the data may have been read before the invalidation occurred. This adds a new state STOP_RELOAD which we go to if an invalidation happens while we are in CLR_TAG or WAIT_ACK state. In STOP_RELOAD state we don't request any more reads from memory and wait for the reads we have previously requested to be acked, and then go to IDLE state. Data returned is still written to the icache RAM, but that doesn't matter because the line is invalid and is never made valid. Note that we don't have to worry about invalidations due to snooped writes while reloading a line, because the wishbone arbiter won't switch to another master once it has started sending our reload requests to memory. Thus a store to memory will either happen before any of our reads have got to memory, or after we have finished the reload (in which case we will no longer be in WAIT_ACK state). Signed-off-by: Paul Mackerras <paulus@ozlabs.org> |
3 years ago | |
|---|---|---|
| .github/workflows | 3 years ago | |
| constraints | 5 years ago | |
| fpga | 3 years ago | |
| hello_world | 4 years ago | |
| include | 4 years ago | |
| lib | 4 years ago | |
| litedram | 3 years ago | |
| liteeth | 3 years ago | |
| litesdcard | 3 years ago | |
| media | 5 years ago | |
| micropython | 4 years ago | |
| openocd | 3 years ago | |
| rust_lib_demo | 4 years ago | |
| scripts | 3 years ago | |
| sim-unisim | 5 years ago | |
| tests | 3 years ago | |
| uart16550 | 4 years ago | |
| verilator | 3 years ago | |
| .gitignore | 3 years ago | |
| LICENSE | 5 years ago | |
| Makefile | 3 years ago | |
| README.md | 4 years ago | |
| cache_ram.vhdl | 4 years ago | |
| common.vhdl | 3 years ago | |
| control.vhdl | 4 years ago | |
| core.vhdl | 3 years ago | |
| core_debug.vhdl | 3 years ago | |
| core_dram_tb.vhdl | 4 years ago | |
| core_flash_tb.vhdl | 4 years ago | |
| core_tb.vhdl | 4 years ago | |
| countzero.vhdl | 4 years ago | |
| countzero_tb.vhdl | 4 years ago | |
| cr_file.vhdl | 4 years ago | |
| crhelpers.vhdl | 5 years ago | |
| dcache.vhdl | 3 years ago | |
| dcache_tb.vhdl | 4 years ago | |
| decode1.vhdl | 3 years ago | |
| decode2.vhdl | 4 years ago | |
| decode_types.vhdl | 4 years ago | |
| divider.vhdl | 4 years ago | |
| divider_tb.vhdl | 4 years ago | |
| dmi_dtm_dummy.vhdl | 5 years ago | |
| dmi_dtm_tb.vhdl | 4 years ago | |
| dmi_dtm_xilinx.vhdl | 3 years ago | |
| dram_tb.vhdl | 3 years ago | |
| execute1.vhdl | 3 years ago | |
| fetch1.vhdl | 3 years ago | |
| foreign_random.vhdl | 4 years ago | |
| fpu.vhdl | 4 years ago | |
| glibc_random.vhdl | 5 years ago | |
| glibc_random_helpers.vhdl | 5 years ago | |
| gpio.vhdl | 3 years ago | |
| helpers.vhdl | 4 years ago | |
| icache.vhdl | 3 years ago | |
| icache_tb.vhdl | 4 years ago | |
| icache_test.bin | 5 years ago | |
| insn_helpers.vhdl | 4 years ago | |
| loadstore1.vhdl | 3 years ago | |
| logical.vhdl | 3 years ago | |
| microwatt.core | 3 years ago | |
| mmu.vhdl | 3 years ago | |
| multiply.vhdl | 3 years ago | |
| multiply_tb.vhdl | 4 years ago | |
| nonrandom.vhdl | 4 years ago | |
| plru.vhdl | 4 years ago | |
| plru_tb.vhdl | 4 years ago | |
| pmu.vhdl | 3 years ago | |
| ppc_fx_insns.vhdl | 3 years ago | |
| random.vhdl | 4 years ago | |
| register_file.vhdl | 4 years ago | |
| rotator.vhdl | 4 years ago | |
| rotator_tb.vhdl | 4 years ago | |
| run.py | 3 years ago | |
| sim_16550_uart.vhdl | 4 years ago | |
| sim_bram.vhdl | 3 years ago | |
| sim_bram_helpers.vhdl | 5 years ago | |
| sim_bram_helpers_c.c | 5 years ago | |
| sim_console.vhdl | 5 years ago | |
| sim_console_c.c | 4 years ago | |
| sim_jtag.vhdl | 5 years ago | |
| sim_jtag_socket.vhdl | 5 years ago | |
| sim_jtag_socket_c.c | 5 years ago | |
| sim_no_flash.vhdl | 5 years ago | |
| sim_pp_uart.vhdl | 4 years ago | |
| sim_vhpi_c.c | 5 years ago | |
| sim_vhpi_c.h | 5 years ago | |
| soc.vhdl | 3 years ago | |
| spi_flash_ctrl.vhdl | 3 years ago | |
| spi_rxtx.vhdl | 4 years ago | |
| sync_fifo.vhdl | 5 years ago | |
| syscon.vhdl | 3 years ago | |
| utils.vhdl | 5 years ago | |
| wishbone_arbiter.vhdl | 5 years ago | |
| wishbone_bram_tb.bin | 5 years ago | |
| wishbone_bram_tb.vhdl | 3 years ago | |
| wishbone_bram_wrapper.vhdl | 3 years ago | |
| wishbone_debug_master.vhdl | 3 years ago | |
| wishbone_types.vhdl | 3 years ago | |
| writeback.vhdl | 3 years ago | |
| xics.vhdl | 3 years ago | |
| xilinx-mult.vhdl | 3 years ago | |
README.md
Microwatt
A tiny Open POWER ISA softcore written in VHDL 2008. It aims to be simple and easy to understand.
Simulation using ghdl
You can try out Microwatt/Micropython without hardware by using the ghdl simulator. If you want to build directly for a hardware target board, see below.
- Build micropython. If you aren't building on a ppc64le box you will need a cross compiler. If it isn't available on your distro grab the powerpc64le-power8 toolchain from https://toolchains.bootlin.com. You may need to set the CROSS_COMPILE environment variable to the prefix used for your cross compilers. The default is powerpc64le-linux-gnu-.
git clone https://github.com/micropython/micropython.git
cd micropython
cd ports/powerpc
make -j$(nproc)
cd ../../../
A prebuilt micropython image is also available in the micropython/ directory.
-
Microwatt uses ghdl for simulation. Either install this from your distro or build it. Microwatt requires ghdl to be built with the LLVM or gcc backend, which not all distros do (Fedora does, Debian/Ubuntu appears not to). ghdl with the LLVM backend is likely easier to build.
If building ghdl from scratch is too much for you, the microwatt Makefile supports using Docker or Podman.
-
Next build microwatt:
git clone https://github.com/antonblanchard/microwatt
cd microwatt
make
To build using Docker:
make DOCKER=1
and to build using Podman:
make PODMAN=1
- Link in the micropython image:
ln -s ../micropython/ports/powerpc/build/firmware.bin main_ram.bin
Or if you were using the pre-built image:
ln -s micropython/firmware.bin main_ram.bin
- Now run microwatt, sending debug output to /dev/null:
./core_tb > /dev/null
Synthesis on Xilinx FPGAs using Vivado
-
Install Vivado (I'm using the free 2019.1 webpack edition).
-
Setup Vivado paths:
source /opt/Xilinx/Vivado/2019.1/settings64.sh
- Install FuseSoC:
pip3 install --user -U fusesoc
Fedora users can get FuseSoC package via
sudo dnf copr enable sharkcz/danny
sudo dnf install fusesoc
- If this is your first time using fusesoc, initialize fusesoc. This is needed to be able to pull down fussoc library components referenced by microwatt. Run
fusesoc init
- Create a working directory and point FuseSoC at microwatt:
mkdir microwatt-fusesoc
cd microwatt-fusesoc
fusesoc library add microwatt /path/to/microwatt/
- Build using FuseSoC. For hello world (Replace nexys_video with your FPGA board such as --target=arty_a7-100): You may wish to ensure you have installed Digilent Board files or appropriate files for your board first.
fusesoc run --target=nexys_video microwatt --memory_size=16384 --ram_init_file=/path/to/microwatt/fpga/hello_world.hex
You should then be able to see output via the serial port of the board (/dev/ttyUSB1, 115200 for example assuming standard clock speeds). There is a know bug where initial output may not be sent - try the reset (not programming button) on your board if you don't see anything.
- To build micropython (currently requires 1MB of BRAM eg an Artix-7 A200):
fusesoc run --target=nexys_video microwatt
Testing
- A simple test suite containing random execution test cases and a couple of micropython test cases can be run with:
make -j$(nproc) check
Issues
This is functional, but very simple. We still have quite a lot to do:
- There are a few instructions still to be implemented
- Need to add caches and bypassing (in progress)
- Need to add supervisor state (in progress)