[rtl] add generic cache module (not used yet) (#842)

stnolting · Mar 9, 2024 · a2bc846 · a2bc846
2 parents 1f6bcf2 + 5dc0ddd
commit a2bc846
Show file tree

Hide file tree

Showing 7 changed files with 1,020 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ mimpid = 0x01040312 -> Version 01.04.03.12 -> v1.4.3.12
 
 | Date | Version | Comment | Link |
 |:----:|:-------:|:--------|:----:|
+| 09.03.2024 | 1.9.6.1 | add generic cache module (not used yet) | [#842](https://github.com/stnolting/neorv32/pull/842) |
 | 01.03.2024 | [**:rocket:1.9.6**](https://github.com/stnolting/neorv32/releases/tag/v1.9.6) | **New release** | |
 | 25.02.2024 | 1.9.5.10 | :bug: fix minor GPTMR threshold configuration issue | [#834](https://github.com/stnolting/neorv32/pull/834) |
 | 23.02.2024 | 1.9.5.9 | :bug: fix atomic write/clear/set accesses of clear-only CSR bits (re-fix of v1.9.5.6) | [#829](https://github.com/stnolting/neorv32/pull/829) |

diff --git a/docs/datasheet/cpu.adoc b/docs/datasheet/cpu.adoc
@@ -367,6 +367,11 @@ The figure below shows three exemplary bus accesses:
 .Three Exemplary Bus Transactions
 image::bus_interface.png[700]
 
+.Adding Register Stages
+[TIP]
+Arbitrary pipeline stages can be added to the request and response buses at any point to relax timing (at the cost of
+additional latency). However, _all_ bus signals (request and response) need to be registered.
+
 
 :sectnums:
 ==== Atomic Accesses

diff --git a/rtl/core/neorv32_cache.vhd b/rtl/core/neorv32_cache.vhd
diff --git a/rtl/core/neorv32_package.vhd b/rtl/core/neorv32_package.vhd
@@ -53,7 +53,7 @@ package neorv32_package is
 
   -- Architecture Constants -----------------------------------------------------------------
   -- -------------------------------------------------------------------------------------------
-  constant hw_version_c : std_ulogic_vector(31 downto 0) := x"01090600"; -- hardware version
+  constant hw_version_c : std_ulogic_vector(31 downto 0) := x"01090601"; -- hardware version
   constant archid_c     : natural := 19; -- official RISC-V architecture ID
   constant XLEN         : natural := 32; -- native data path width
 

diff --git a/sim/neorv32_tb.vhd b/sim/neorv32_tb.vhd
@@ -185,7 +185,7 @@ begin
     if ci_mode then
       -- No need to send the full expectation in one big chunk
       check_uart(net, uart1_rx_handle, nul & nul);
-      check_uart(net, uart1_rx_handle, "0/58" & cr & lf);
+      check_uart(net, uart1_rx_handle, "0/57" & cr & lf);
     end if;
 
     -- Wait until all expected data has been received

diff --git a/sw/common/common.mk b/sw/common/common.mk
@@ -297,7 +297,7 @@ endif
 # In-console simulation using default/simple testbench and GHDL
 # -----------------------------------------------------------------------------
 sim: $(APP_IMG) install
-	@echo "Simulating $(APP_IMG)..."
+	@echo "Simulating processor using simple testbench..."
 	@sh $(NEORV32_SIM_PATH)/simple/ghdl.sh $(GHDL_RUN_FLAGS)
 
 

diff --git a/sw/example/processor_check/main.c b/sw/example/processor_check/main.c
@@ -85,11 +85,11 @@
 void sim_irq_trigger(uint32_t sel);
 void global_trap_handler(void);
 void rte_service_handler(void);
-void vectored_irq_table(void) __attribute__((naked, aligned(128)));
-void vectored_global_handler(void) __attribute__((interrupt("machine")));
-void vectored_mei_handler(void) __attribute__((interrupt("machine")));
-void __attribute__ ((interrupt)) hw_breakpoint_handler(void);
-void __attribute__ ((noinline)) trigger_module_dummy(void);
+void vectored_irq_table(void);
+void vectored_global_handler(void);
+void vectored_mei_handler(void);
+void hw_breakpoint_handler(void);
+void trigger_module_dummy(void);
 void xirq_trap_handler0(void);
 void xirq_trap_handler1(void);
 void test_ok(void);
@@ -284,27 +284,6 @@ int main() {
   }
 
 
-  // ----------------------------------------------------------
-  // Test fence instructions
-  // ----------------------------------------------------------
-  neorv32_cpu_csr_write(CSR_MCAUSE, mcause_never_c);
-  PRINT_STANDARD("[%i] FENCEs ", cnt_test);
-
-  cnt_test++;
-
-  asm volatile ("fence"); // flush/reload d-cache
-  asm volatile ("fence.i"); // clear instruction prefetch buffer and clear i-cache
-  asm volatile ("fence");
-  asm volatile ("fence.i");
-
-  if (neorv32_cpu_csr_read(CSR_MCAUSE) == mcause_never_c) {
-    test_ok();
-  }
-  else {
-    test_fail();
-  }
-
-
   // ----------------------------------------------------------
   // Test standard RISC-V counters
   // ----------------------------------------------------------
@@ -1499,8 +1478,11 @@ int main() {
     // setup source data
     dma_src = 0x7788ee11;
 
+    // flush/reload d-cache
+    asm volatile ("fence");
+
     // setup CRC unit
-    neorv32_crc_setup(CRC_MODE32, 0x4C11DB7, 0xFFFFFFFF);
+    neorv32_crc_setup(CRC_MODE32, 0x04C11DB7, 0xFFFFFFFF);
 
     // configure and trigger DMA transfer
     tmp_a = DMA_CMD_B2UW | DMA_CMD_SRC_INC | DMA_CMD_DST_CONST | DMA_CMD_ENDIAN;
@@ -2324,7 +2306,7 @@ void rte_service_handler(void) {
 /**********************************************************************//**
  * Vectored mtvec mode jump table.
  **************************************************************************/
-void vectored_irq_table(void) {
+void __attribute__((naked, aligned(128))) vectored_irq_table(void) {
   asm volatile(
     ".org  vectored_irq_table + 0*4  \n"
     "jal   zero, %[glb]              \n" // 0
@@ -2359,7 +2341,7 @@ void vectored_irq_table(void) {
 /**********************************************************************//**
  * Vectored trap handler for ALL exceptions/interrupts.
  **************************************************************************/
-void vectored_global_handler(void) {
+void __attribute__((interrupt("machine"))) vectored_global_handler(void) {
 
   // Call the default trap handler, cannot be put into the vector table directly
   // as all function in the table must have the gcc attribute "interrupt".
@@ -2370,7 +2352,7 @@ void vectored_global_handler(void) {
 /**********************************************************************//**
  * Machine external interrupt handler.
  **************************************************************************/
-void vectored_mei_handler(void) {
+void __attribute__((interrupt("machine"))) vectored_mei_handler(void) {
 
   vectored_mei_handler_ack = 1; // successfully called
 }
@@ -2379,7 +2361,7 @@ void vectored_mei_handler(void) {
 /**********************************************************************//**
  * Hardware-breakpoint trap handler
  **************************************************************************/
-void __attribute__ ((interrupt)) hw_breakpoint_handler(void) {
+void __attribute__ ((interrupt("machine"),aligned(4))) hw_breakpoint_handler(void) {
 
   // make sure mscratch has not been updated yet
   if (neorv32_cpu_csr_read(CSR_MSCRATCH) == 0) {
@@ -2394,7 +2376,7 @@ void __attribute__ ((interrupt)) hw_breakpoint_handler(void) {
 /**********************************************************************//**
  * Test function for the trigger module
  **************************************************************************/
-void __attribute__ ((noinline,naked)) trigger_module_dummy(void) {
+void __attribute__ ((noinline,naked,aligned(4))) trigger_module_dummy(void) {
 
   asm volatile ("csrwi mscratch, 4 \n" // hardware breakpoint should trigger before executing this
                 "ret               \n");