From afc332280d4f1c6cf0ed936163c385d585bed9de Mon Sep 17 00:00:00 2001 From: Matthew Naylor Date: Thu, 12 Nov 2020 08:50:44 +0000 Subject: [PATCH] Increase block RAM usage --- de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.html | 4 +- de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.sopcinfo | 2 +- de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.xml | 2 +- de10-pro/data.mif | 258 ++++++++++++++++- de10-pro/pebbles_core.v | 48 ++-- de10-pro/prog.mif | 260 +++++++++++++++++- de10-pro/software/MEM_TEST_bsp/settings.bsp | 4 +- de10-pro/software/MEM_TEST_bsp/summary.html | 4 +- pebbles/boot/Makefile | 4 +- pebbles/boot/link.ld | 4 +- pebbles/src/Pebbles/Memory/DTCM.hs | 2 +- pebbles/src/Pebbles/Pipeline/Scalar.hs | 2 +- 12 files changed, 553 insertions(+), 41 deletions(-) diff --git a/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.html b/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.html index 9063472..5999ca8 100644 --- a/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.html +++ b/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.html @@ -67,7 +67,7 @@ - +
2020.11.11.09:07:032020.11.11.09:30:45 Datasheet
@@ -3623,7 +3623,7 @@

Software Assignments

- +
generation took 0.00 secondsrendering took 0.06 secondsrendering took 0.04 seconds
diff --git a/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.sopcinfo b/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.sopcinfo index e11ca93..311bacc 100644 --- a/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.sopcinfo +++ b/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.sopcinfo @@ -1,7 +1,7 @@ - + java.lang.Integer diff --git a/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.xml b/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.xml index 6ccd3ce..895e220 100644 --- a/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.xml +++ b/de10-pro/DE10_Pro_QSYS/DE10_Pro_QSYS.xml @@ -1,6 +1,6 @@ hal default - 10-Nov-2020 15:09:49 - 1605020989485 + 11-Nov-2020 09:31:06 + 1605087066657 ./ MEM_TEST_bsp/settings.bsp ../../DE10_Pro_QSYS/DE10_Pro_QSYS.sopcinfo diff --git a/de10-pro/software/MEM_TEST_bsp/summary.html b/de10-pro/software/MEM_TEST_bsp/summary.html index 88834c2..071c2a7 100644 --- a/de10-pro/software/MEM_TEST_bsp/summary.html +++ b/de10-pro/software/MEM_TEST_bsp/summary.html @@ -22,10 +22,10 @@

BSP Description

BSP Version:default -BSP Generated On:10-Nov-2020 15:09:49 +BSP Generated On:11-Nov-2020 09:31:06 -BSP Generated Timestamp:1605020989485 +BSP Generated Timestamp:1605087066657 BSP Generated Location:./ diff --git a/pebbles/boot/Makefile b/pebbles/boot/Makefile index f430325..b9b853e 100644 --- a/pebbles/boot/Makefile +++ b/pebbles/boot/Makefile @@ -23,8 +23,8 @@ CFILES = main.c io.c OFILES = $(patsubst %.c,%.o,$(CFILES)) # Sizes of instruction and data memories -INSTR_BYTES = 1024 -DATA_BYTES = 1024 +INSTR_BYTES = 2048 +DATA_BYTES = 2048 .PHONY: all all: $(QP)/prog.mif \ diff --git a/pebbles/boot/link.ld b/pebbles/boot/link.ld index 00f6e89..1db2eff 100644 --- a/pebbles/boot/link.ld +++ b/pebbles/boot/link.ld @@ -1,12 +1,12 @@ OUTPUT_ARCH( "riscv" ) -__stackBase = 0x000003fc ; +__stackBase = 0x000007fc ; SECTIONS { . = 0; .text : { *.o(.text*) } -. = 0x400; +. = 0x800; .bss : { *.o(.bss*) } .rodata : { *.o(.rodata*) } .sdata : { *.o(.sdata*) } diff --git a/pebbles/src/Pebbles/Memory/DTCM.hs b/pebbles/src/Pebbles/Memory/DTCM.hs index fb9c18c..5a5a6fb 100644 --- a/pebbles/src/Pebbles/Memory/DTCM.hs +++ b/pebbles/src/Pebbles/Memory/DTCM.hs @@ -14,7 +14,7 @@ import Pebbles.Memory.Interface -- One possible implementation of MemUnit, using a block RAM -- DTCM size -type DTCMAddrWidth = 8 +type DTCMAddrWidth = 9 -- Tightly-coupled data memory with single-cycle read latency makeDTCM :: Maybe String -> Module MemUnit diff --git a/pebbles/src/Pebbles/Pipeline/Scalar.hs b/pebbles/src/Pebbles/Pipeline/Scalar.hs index c8860eb..4d65712 100644 --- a/pebbles/src/Pebbles/Pipeline/Scalar.hs +++ b/pebbles/src/Pebbles/Pipeline/Scalar.hs @@ -28,7 +28,7 @@ import qualified Data.Map as Map import Pebbles.Pipeline.Interface -- Instruction memory size -type InstrAddr = Bit 8 +type InstrAddr = Bit 9 -- Scalar pipeline configuration data ScalarPipelineConfig =