Merge pull request #1661 from jacassidy/SOC_project

Soc Project Lab2 Update

Author: jordancarlin

examples/exercises/lynn/Makefile

@@ -16,7 +16,7 @@ PROCESSOR_TOP 		?= riscvsingle # top-level module name
 PROCESSOR_CONFIG 	?= $(CURDIR)/sample_processor/config
 
 #--trace-all
-SAIL_TRACE_FLAGS 	?=
+SAIL_TRACE_FLAGS 	?= --trace-all
 
 # ----    Synthesis Configuration ---- #
 SYNTH_TECH 			?= sky130 #tsmc28 #tsmc28psyn
@@ -222,7 +222,7 @@ C_test:
 .PHONY: bringup_test
 bringup_test:
 	@$(MAKE) -C $(BRINGUP_TEST_DIR) \
-		XLEN=$(XLEN) ARCH="$(ARCH)" ABI=$(ABI) LINKER=$(LINKER) TOOLPREFIX=$(TOOLPREFIX)
+		XLEN=$(XLEN) ARCH="$(ARCH)" ABI=$(ABI) TOOLPREFIX=$(TOOLPREFIX)
 	@$(MAKE) run ELFS="$(BRINGUP_TEST_DIR)/work/bringup.elf"
 
 # ----  Coremark flow  ---- #

examples/exercises/lynn/tests/act4/Makefile

@@ -14,11 +14,11 @@ populate: $(STAMP)
 $(STAMP): Makefile
 	@mkdir -p $(WORK_DIR)
 	@$(MAKE) -C $(RISCV_ARCH_TEST) \
-		CONFIG_FILES=$(RISCV_ARCH_TEST)/config/ref/sail-rv32gc/test_config.yaml \
-		EXTENSIONS=I,Zicntr,Zihpm,Zicsr \
+		CONFIG_FILES=$(RISCV_ARCH_TEST)/config/sail/sail-RVI20U32/test_config.yaml \
+		EXTENSIONS=I,Zicntr,Zihpm,Zicsr,Zmmul \
 		DEBUG=True \
 		--jobs $$(nproc)
-	@cp -r $(RISCV_ARCH_TEST)/work/common/elfs/rv32i/I/* $(WORK_DIR)/
+	@cp -r $(RISCV_ARCH_TEST)/work/sail-RVI20U32/elfs/rv32i/I/* $(WORK_DIR)/
 	@touch $(STAMP)
 
 .PHONY: list-elfs

examples/exercises/lynn/tests/bringup/Makefile

@@ -11,7 +11,7 @@ TOOLPREFIX ?= riscv64-unknown-elf-
 GCC         ?= $(TOOLPREFIX)gcc
 
 # Intentionally undefined unless caller provides it:
-LINKER     ?=
+LINKER     ?= $(CURDIR)/link.ld
 
 WORK_DIR   ?= $(CURDIR)/work
 

examples/exercises/lynn/tests/bringup/crt0.S

@@ -86,22 +86,6 @@ finish:
     add t0, t0, t0       # 20
     add t0, t0, t0       # 21   -> t0 = 0x8000_0000
 
-    # t1 = 1 << 12 = 0x1000
-    add t1, t1, t1       # 1
-    add t1, t1, t1       # 2
-    add t1, t1, t1       # 3
-    add t1, t1, t1       # 4
-    add t1, t1, t1       # 5
-    add t1, t1, t1       # 6
-    add t1, t1, t1       # 7
-    add t1, t1, t1       # 8
-    add t1, t1, t1       # 9
-    add t1, t1, t1       # 10
-    add t1, t1, t1       # 11
-    add t1, t1, t1       # 12   -> t1 = 0x0000_1000
-
-    add t0, t0, t1       # t0 = 0x8000_1000
-
     sw   gp, 0(t0)
     sw   x0, 4(t0)
 1:

examples/exercises/lynn/tests/bringup/link.ld

@@ -0,0 +1,74 @@
+/*======================================================================*/
+/* Proxy kernel linker script                                           */
+/*======================================================================*/
+/* This is the linker script used when building the proxy kernel. */
+
+/*----------------------------------------------------------------------*/
+/* Setup                                                                */
+/*----------------------------------------------------------------------*/
+
+/* The OUTPUT_ARCH command specifies the machine architecture where the
+   argument is one of the names used in the BFD library. More
+   specifically one of the entries in bfd/cpu-mips.c */
+
+OUTPUT_ARCH( "riscv" )
+ENTRY(rvtest_entry_point)
+
+/*----------------------------------------------------------------------*/
+/* Sections                                                             */
+/*----------------------------------------------------------------------*/
+
+SECTIONS
+{
+  . = 0x80000000;
+  .tohost : { *(.tohost) }
+  . = ALIGN(0x1000);
+
+  /* text: test code section */
+  .text.init : { *(.text.init) }
+
+  .text : { *(.text) *(.text.main) }
+
+  . = ALIGN(0x1000);
+  .rodata : { *(.rodata .rodata.*) *(.srodata .srodata.*) } /* Read-only data in DMEM */
+  . = ALIGN(16);
+
+  /* data segment */
+  .data : { *(.data) }
+  .data.string : { *(.data.string)}
+
+  .sdata : {
+    __global_pointer$ = . + 0x800;
+    *(.srodata.cst16) *(.srodata.cst8) *(.srodata.cst4) *(.srodata.cst2) *(.srodata*)
+    *(.sdata .sdata.* .gnu.linkonce.s.*)
+  }
+
+  /* bss segment */
+  .sbss : {
+    *(.sbss .sbss.* .gnu.linkonce.sb.*)
+    *(.scommon)
+  }
+  .bss : { *(.bss) }
+
+  /* thread-local data segment */
+  .tdata :
+  {
+    _tls_data = .;
+    *(.tdata.begin)
+    *(.tdata)
+    *(.tdata.end)
+  }
+  .tbss :
+  {
+    *(.tbss)
+    *(.tbss.end)
+  }
+
+  . = ALIGN(16);
+  _stack_bottom = .;
+  . += 0x1000;
+  _stack_top = .;
+
+  /* End of uninitialized data segment */
+  _end = .;
+}