Merge pull request OSCPU#33 from OSCPU/develop

Reorganize files, update OoO execution backend

Author: wakafa1

.gitignore

@@ -314,6 +314,7 @@ xcuserdata
 .cache
 .history
 .lib/
+.coursier/
 dist/*
 target/
 lib_managed/

Makefile

@@ -92,17 +92,23 @@ $(REF_SO):
 endif
 
 $(EMU): $(EMU_MK) $(EMU_DEPS) $(EMU_HEADERS) $(REF_SO)
-	CPPFLAGS=-DREF_SO=\\\"$(REF_SO)\\\" $(MAKE) -C $(dir $(EMU_MK)) -f $(abspath $(EMU_MK))
+	CPPFLAGS=-DREF_SO=\\\"$(REF_SO)\\\" $(MAKE) VM_PARALLEL_BUILDS=1 -C $(dir $(EMU_MK)) -f $(abspath $(EMU_MK))
 
 SEED = -s $(shell seq 1 10000 | shuf | head -n 1)
 
+# log will only be printed when (LOG_BEGIN<=GTimer<=LOG_END) && (LOG_LEVEL < loglevel)
+# use 'emu -h' to see more details
+LOG_BEGIN ?= 0
+LOG_END ?= 0
+LOG_LEVEL ?= ALL
+
 emu: $(EMU)
-	@$(EMU) -i $(IMAGE) $(SEED)
+	@$(EMU) -i $(IMAGE) $(SEED) -b $(LOG_BEGIN) -e $(LOG_END) -v $(LOG_LEVEL)
 
 cache:
 	$(MAKE) emu IMAGE=Makefile
 
 clean:
 	rm -rf $(BUILD_DIR)
 
-.PHONY: verilog emu clean help $(REF_SO)
+.PHONY: verilog emu clean help $(REF_SO)

debug/Makefile

@@ -1,8 +1,17 @@
-ARCH = ARCH=riscv64-nutshell
-NANOS_HOME ?= $(AM_HOME)/../nanos-lite
-SINGLETEST = ALL=recursion
-RVTEST_TARGET = towers
+# ------------------------------------------------------------------
+# test settings
+# ------------------------------------------------------------------
+
+LOG_BEGIN ?= 0
+LOG_END ?= 0
 
+ARCH = ARCH=riscv64-noop
+# ------------------------------------------------------------------
+
+SINGLETEST = recursion
+RVTEST_TARGET = towers
+NANOS_HOME ?= $(AM_HOME)/../nanos-lite
+EMU_ARGS = LOG_BEGIN=$(LOG_BEGIN) LOG_END=$(LOG_END)
 CPU_TEST_RESULT = $(shell cat cpu.log | grep -E "different|stuck")
 MB_RESULT = $(shell cat microbench.log | grep IPC)
 MBT_RESULT = $(shell cat microbench-train.log | grep IPC)
@@ -13,14 +22,14 @@ CM_RESULT = $(shell cat coremark.log | grep IPC)
 # ------------------------------------------------------------------
 
 cpu:
-	$(MAKE) -C $(AM_HOME)/tests/cputest $(ARCH) ALL=dummy run
+	$(MAKE) -C $(AM_HOME)/tests/cputest $(ARCH) $(EMU_ARGS) ALL=dummy run
 
 # ------------------------------------------------------------------
 # unit tests
 # ------------------------------------------------------------------
 
 cputest:
-	$(MAKE) -C $(AM_HOME)/tests/cputest $(ARCH) run 2>&1 | tee > cpu.log
+	$(MAKE) -C $(AM_HOME)/tests/cputest $(ARCH) $(EMU_ARGS) run 2>&1 | tee > cpu.log
 	# cat cpu.log | grep different
 ifeq ($(CPU_TEST_RESULT),)
 	@echo "simple CPU test passed"
@@ -29,17 +38,27 @@ else
 	@echo "simple CPU test failed"
 endif
 
+rvtest-ui:
+	$(MAKE) -C $(RVTEST_HOME)/isa noop_run LOG_LEVEL=OFF SUITES=rv64ui ENV=p
+
+rvtest:
+	$(MAKE) -C $(RVTEST_HOME)/isa noop_run LOG_LEVEL=OFF SUITES=rv64ui ENV=p
+	$(MAKE) -C $(RVTEST_HOME)/isa noop_run LOG_LEVEL=OFF SUITES=rv64um ENV=p
+	$(MAKE) -C $(RVTEST_HOME)/isa noop_run LOG_LEVEL=OFF SUITES=rv64uc ENV=p
+	$(MAKE) -C $(RVTEST_HOME)/isa noop_run LOG_LEVEL=OFF SUITES=rv64si ENV=p
+	$(MAKE) -C $(RVTEST_HOME)/isa noop_run LOG_LEVEL=OFF SUITES=rv64mi ENV=p
+
 bputest:
-	$(MAKE) -C $(AM_HOME)/tests/bputest $(ARCH) ALL=forcall2 run 2>&1 | tee > bpu.log
+	$(MAKE) -C $(AM_HOME)/tests/bputest $(ARCH) $(EMU_ARGS) ALL=forcall2 run 2>&1 | tee > bpu.log
 	cat bpu.log | grep Mbp
 
 unittest:
-	$(MAKE) -C $(AM_HOME)/tests/cputest $(ARCH) $(SINGLETEST) run 2>&1 | tee > test.log
+	$(MAKE) -C $(AM_HOME)/tests/cputest $(ARCH) $(EMU_ARGS) ALL=$(SINGLETEST) run 2>&1 | tee > test.log
 	cat test.log | grep -E "different|stuck|GOOD"
 	cat test.log | grep ISU > isu.log
 
 microbench:
-	$(MAKE) -C $(AM_HOME)/apps/microbench $(ARCH) mainargs=test run 2>&1 | tee > microbench.log
+	$(MAKE) -C $(AM_HOME)/apps/microbench $(ARCH) $(EMU_ARGS) mainargs=test run 2>&1 | tee > microbench.log
 	cat microbench.log | grep IPC
 	@date >> history.log
 	@git log --pretty=format:"%h %an %ad %s" -1 >> history.log
@@ -48,11 +67,11 @@ microbench:
 	@echo -e "" >> history.log
 
 microbench-train:
-	$(MAKE) -C $(AM_HOME)/apps/microbench $(ARCH) mainargs=train run 2>&1 | tee > microbench-train.log
+	$(MAKE) -C $(AM_HOME)/apps/microbench $(ARCH) $(EMU_ARGS) mainargs=train run 2>&1 | tee > microbench-train.log
 	cat microbench-train.log | grep IPC
 
 coremark:
-	$(MAKE) -C $(AM_HOME)/apps/coremark $(ARCH) mainargs=test run 2>&1 | tee > coremark.log
+	$(MAKE) -C $(AM_HOME)/apps/coremark $(ARCH) $(EMU_ARGS) mainargs=test run 2>&1 | tee > coremark.log
 	cat coremark.log | grep IPC
 	@date >> cm_history.log
 	@git log --pretty=format:"%h %an %ad %s" -1 >> cm_history.log
@@ -62,15 +81,11 @@ coremark:
 
 
 dhrystone:
-	$(MAKE) -C $(AM_HOME)/apps/dhrystone $(ARCH) mainargs=test run 2>&1 | tee > dhrystone.log
+	$(MAKE) -C $(AM_HOME)/apps/dhrystone $(ARCH) $(EMU_ARGS) mainargs=test run 2>&1 | tee > dhrystone.log
 	cat dhrystone.log | grep IPC
 
-rvtest:
-	$(MAKE) -C $(AM_HOME)/tests/riscv-test/benchmarks/$(RVTEST_TARGET) $(ARCH) run
-	# usage: make rvtest RVTEST_TARGET=dhrystone
-
 xj:
-	$(MAKE) -C $(NANOS_HOME) $(ARCH) run
+	$(MAKE) -C $(NANOS_HOME) $(ARCH) $(EMU_ARGS) run
 
 xjnemu:
 	$(MAKE) -C $(NANOS_HOME) ARCH=riscv64-nemu run
@@ -100,19 +115,22 @@ linux-debug:
 # test set
 # ------------------------------------------------------------------
 
-smoke-test: cpu cputest microbench
+smoke-test: cpu cputest microbench coremark
 	@echo "Smoke Test Passed"
 
-regression-test: smoke-test linux
+regression-test: smoke-test coremark linux
 	@echo "Regression Test Passed"
 
-perf-test: smoke-test microbench-train coremark
+perf-test: smoke-test microbench-train
 	@echo "Perf Test Finished"
 
 # ------------------------------------------------------------------
 # get disassembled test src
 # ------------------------------------------------------------------
 
+disassemble-unittest:
+	cp $(AM_HOME)/tests/cputest/build/$(SINGLETEST)-riscv64-noop.txt ./d-unittest.log
+
 disassemble-rttos:
 	cp $(RTTOS_HOME)/bsp/riscv64-nutshell/build/code.txt ./d-rttos.log
 
@@ -122,3 +140,9 @@ disassemble-freertos:
 disassemble-xv6:
 	cp $(XV6_HOME)/build/code.txt ./d-xv6.log
 
+# ------------------------------------------------------------------
+# chore
+# ------------------------------------------------------------------
+
+clean:
+	$(MAKE) -C .. clean

devlog.md

@@ -0,0 +1,17 @@
+mymap = {}
+last = ""
+
+with open("../build/NutShellSimTop.v", "r") as f:
+    line = f.readline()
+    cnt = 0
+    while(line):
+        if "module " in line:
+            if last!="" :
+                mymap[last] = cnt
+            last = line[6:-2]
+            cnt = 1
+        else:
+            cnt = cnt + 1
+        line = f.readline()
+    for k,v in mymap.items():
+        print(k, v)

scripts/statistics.py

@@ -40,7 +40,11 @@ class SimpleBusCrossbar1toN(addressSpace: List[(Long, Long)]) extends Module {
   val outSelResp = io.out(outSelIdxResp)
   val reqInvalidAddr = io.in.req.valid && !outSelVec.asUInt.orR
 
-  when(!(!io.in.req.valid || outSelVec.asUInt.orR) || !(!(io.in.req.valid && outSelVec.asUInt.andR))){printf("[ERROR] bad addr %x, time %d\n", addr, GTimer())}
+  when(!(!io.in.req.valid || outSelVec.asUInt.orR) || !(!(io.in.req.valid && outSelVec.asUInt.andR))){
+    Debug(){
+      printf("crossbar access bad addr %x, time %d\n", addr, GTimer())
+    }
+  }
   // assert(!io.in.req.valid || outSelVec.asUInt.orR, "address decode error, bad addr = 0x%x\n", addr)
   assert(!(io.in.req.valid && outSelVec.asUInt.andR), "address decode error, bad addr = 0x%x\n", addr)
 

src/main/scala/bus/simplebus/Crossbar.scala

@@ -47,6 +47,13 @@ class RedirectIO extends NutCoreBundle {
   val valid = Output(Bool())
 }
 
+class MisPredictionRecIO extends NutCoreBundle {
+  val redirect = new RedirectIO
+  val valid = Output(Bool())
+  val checkpoint = Output(UInt(brTagWidth.W))
+  val prfidx = Output(UInt(prfAddrWidth.W))
+}
+
 class CtrlFlowIO extends NutCoreBundle {
   val instr = Output(UInt(64.W))
   val pc = Output(UInt(VAddrBits.W))
@@ -63,7 +70,6 @@ class DecodeIO extends NutCoreBundle {
   val cf = new CtrlFlowIO
   val ctrl = new CtrlSignalIO
   val data = new DataSrcIO
-  val pipeline2 = Output(Bool())
 }
 
 class WriteBackIO extends NutCoreBundle {
@@ -86,6 +92,8 @@ class OOCommitIO extends NutCoreBundle with HasBackendConst{
   val commits = Output(UInt(XLEN.W))
   val prfidx = Output(UInt(prfAddrWidth.W)) //also as robidx
   val exception = Output(Bool())
+  val store = Output(Bool())
+  val brMask = Output(UInt(checkpointSize.W))
 }
 
 class FunctionUnitIO extends NutCoreBundle {
@@ -152,11 +160,13 @@ class InstFetchIO extends NutCoreBundle {
   val instr = Output(UInt(64.W))
 }
 
+// Micro OP
 class RenamedDecodeIO extends NutCoreBundle with HasBackendConst {
   val decode = new DecodeIO
   val prfDest = Output(UInt(prfAddrWidth.W))
   val prfSrc1 = Output(UInt(prfAddrWidth.W))
   val prfSrc2 = Output(UInt(prfAddrWidth.W))
   val src1Rdy = Output(Bool())
   val src2Rdy = Output(Bool())
+  val brMask = Output(UInt(checkpointSize.W))
 }