Merge branch 'tc-l3' into dev

Author: maksyuki

.github/workflows/unit-test.yml

@@ -15,5 +15,10 @@ jobs:
           cd rtl
           chmod +x scripts/install.sh
           make install
-# chmod +x scripts/setup.sh
-# make setup
+          chmod +x scripts/setup.sh
+          make setup
+          make nemuBuild
+          make dramsim3Build
+          make riscvTestBuild
+          make cpuTestBuild
+          make CHIP_TARGET=tc_l2 unit-test

README.md

@@ -97,11 +97,14 @@ adsfadfasdfasf
 
 First, you need to install verilator, mill and dependency libraries:
 ```bash
+$ su -
 $ cd rtl
+$ chmod +x scripts/install.sh
 $ make install
 ```
 Then, download and configuare all components from the github:
 ```bash
+$ chmod +x scripts/setup.sh
 $ make setup
 ```
 After that, you need to set the `NEMU_HOME` and `NOOP_HOME` environment variables:

rtl/Makefile

@@ -184,7 +184,7 @@ demoTest:
 simpleTestbinFile   = $(foreach dir, $(SIMPLETEST_HOME)/build, $(wildcard $(dir)/*.bin))
 simpleTestCaseName  = $(foreach file, $(simpleTestbinFile), $(patsubst %-riscv64-mycpu, simpletest-%, $(basename $(notdir $(file)))))
 simpleTestLogFile   = $(foreach file, $(simpleTestCaseName), $(patsubst %, %-log.txt, $(file)))
-$(shell mkdir -p $(SIMPLETEST_HOME)/build/log 1>/dev/null 2>&1)
+$(shell if [[ -d $(SIMPLETEST_HOME) ]]; then mkdir -p $(SIMPLETEST_HOME)/build/log 1>/dev/null 2>&1; fi)
 
 simpleRecursiveTest: $(simpleTestLogFile) $(simpleTestCaseName)
 	@printf "[\033[0;33m%s\033[0m]\n" all-done
@@ -202,11 +202,12 @@ $(simpleTestCaseName): simpletest-%: $(SIMPLETEST_HOME)/build/%-riscv64-mycpu.bi
 
 
 ###### riscv test recursive test target ######
+riscvNum = 50
 riscvTestbinFile   = $(foreach dir, $(RISCVTEST_HOME)/build, $(wildcard $(dir)/*.bin))
 riscvTestCaseName  = $(foreach file, $(riscvTestbinFile), $(patsubst %-riscv64-mycpu, riscvtest-%, $(basename $(notdir $(file)))))
 riscvTestLogFile   = $(foreach file, $(riscvTestCaseName), $(patsubst %, %-log.txt, $(file)))
-riscvNum = 50
-$(shell mkdir -p $(RISCVTEST_HOME)/build/log 1>/dev/null 2>&1)
+$(shell if [[ -d $(RISCVTEST_HOME) ]]; then mkdir -p $(RISCVTEST_HOME)/build/log 1>/dev/null 2>&1; fi)
+
 riscvRecursiveTest: $(riscvTestLogFile) $(riscvTestCaseName)
 	@printf "[\033[0;33mall-done\033[0m]\n"
 	@echo -e "[\033[0;33mAll: $$(cat $(RISCVTEST_HOME)/build/log/allcasenum-log.txt)  \033[0;32mPASS: $$(cat $(RISCVTEST_HOME)/build/log/passcasenum-log.txt)  \033[0;31mFAIL: $$(echo $$(echo $$(cat $(RISCVTEST_HOME)/build/log/allcasenum-log.txt) - $$(cat $(RISCVTEST_HOME)/build/log/passcasenum-log.txt) | bc))\033[0m]";
@@ -226,7 +227,8 @@ $(riscvTestCaseName): riscvtest-%: $(RISCVTEST_HOME)/build/%-riscv64-mycpu.bin
 cpuTestbinFile   = $(foreach dir, $(CPUTEST_HOME)/build, $(wildcard $(dir)/*.bin))
 cpuTestCaseName  = $(foreach file, $(cpuTestbinFile), $(patsubst %-riscv64-mycpu, cputest-%, $(basename $(notdir $(file)))))
 cpuTestLogFile   = $(foreach file, $(cpuTestCaseName), $(patsubst %, %-log.txt, $(file)))
-$(shell mkdir -p $(CPUTEST_HOME)/build/log 1>/dev/null 2>&1)
+$(shell if [[ -d $(CPUTEST_HOME) ]]; then mkdir -p $(CPUTEST_HOME)/build/log 1>/dev/null 2>&1; fi)
+
 cpuRecursiveTest: $(cpuTestLogFile) $(cpuTestCaseName)
 	@printf "[\033[0;33mall-done\033[0m]\n"
 	@echo -e "[\033[0;33mAll: $$(cat $(CPUTEST_HOME)/build/log/allcasenum-log.txt)  \033[0;32mPASS: $$(cat $(CPUTEST_HOME)/build/log/passcasenum-log.txt)  \033[0;31mFAIL: $$(echo $$(echo $$(cat $(CPUTEST_HOME)/build/log/allcasenum-log.txt) - $$(cat $(CPUTEST_HOME)/build/log/passcasenum-log.txt) | bc))\033[0m]";

rtl/scripts/install.sh

@@ -46,22 +46,26 @@ install_verilator() {
         install_package $package
     done
 
-    git clone https://github.com/verilator/verilator   # Only first time
+    which verilator >/dev/null 2>&1 && {
+        echo "verilator has been installed."
+    } || {
+        git clone https://github.com/verilator/verilator /tmp/verilator  # run first time
 
-    # Every time you need to build:
-    # unsetenv VERILATOR_ROOT  # For csh; ignore error if on bash
-    unset VERILATOR_ROOT  # For bash
-    cd verilator
-    git pull         # Make sure git repository is up-to-date
-    git tag          # See what versions exist
-    #git checkout master      # Use development branch (e.g. recent bug fixes)
-    #git checkout stable      # Use most recent stable release
-    git checkout v4.204  # Switch to specified release version
+        # every time you need to build:
+        # unsetenv VERILATOR_ROOT  # For csh; ignore error if on bash
+        unset VERILATOR_ROOT  # for bash
+        cd /tmp/verilator
+        git pull         # make sure git repository is up-to-date
+        git tag          # see what versions exist
+        #git checkout master      # use development branch (e.g. recent bug fixes)
+        #git checkout stable      # use most recent stable release
+        git checkout v4.204  # switch to specified release version
 
-    autoconf         # Create ./configure script
-    ./configure      # Configure and create Makefile
-    make -j `nproc`  # Build Verilator itself (if error, try just 'make')
-    sudo make install
+        autoconf         # create ./configure script
+        ./configure      # configure and create Makefile
+        make -j `nproc`  # build Verilator itself (if error, try just 'make')
+        sudo make install
+    }
 
     # dpkg -s verilator >/dev/null 2>&1 && {
     #     echo "verilator has been installed."
@@ -95,8 +99,11 @@ install_package libsqlite3-dev
 install_package libreadline-dev libsdl2-dev bison
 # install cmake for DRAMsim3
 install_package cmake
+# isntall riscv toolchain
+install_package g++-riscv64-linux-gnu
+install_package binutils-riscv64-linux-gnu
 
 [[ $GTKWAVE == "true" ]] && install_package gtkwave libcanberra-gtk-module
 [[ $CHISEL == "true" ]] && install_mill
 
-echo "finish!"
+echo "############# verilator and mill install finish!!! #############"

rtl/scripts/setup.sh

@@ -34,9 +34,10 @@ configYsyxSoftwareFile() {
 # download the am repo from the github
 ###### abstract-machine ######
 configAbstractMachine() {
+    configYsyxSoftwareFile
+
     mkdir -p ${AM_FOLDER_PATH}
     cd ${AM_FOLDER_PATH}
-
     if [[ -d ${ABSTRACT_MACHINE_FOLDER_PATH} ]]; then
         echo -e "${RIGHT}abstract-machine exist!${END}"
         # if git fsck --full != 0; then
@@ -45,12 +46,14 @@ configAbstractMachine() {
         #     git clone https://github.com/NJU-ProjectN/abstract-machine.git
         # fi
     else
-        echo -e "${INFO}[no download]: git clone...${END}"
-        git clone https://github.com/NJU-ProjectN/abstract-machine.git
+        echo -e "${INFO}[no exist] copy...${END}"
+        cp -rf ${YSYX_SOFTWARE_FILE_PATH}/abstract-machine ./
+        # echo -e "${INFO}[no download]: git clone...${END}"
+        # git clone https://github.com/NJU-ProjectN/abstract-machine.git
     fi
 
     cd ${ABSTRACT_MACHINE_FOLDER_PATH}
-    git checkout ysyx2021
+    # git checkout ysyx2021
 
     if [[ -z $AM_HOME ]]; then
         echo -e "${INFO}AM_HOME is empty, set AM_HOME...${END}"
@@ -72,12 +75,11 @@ configAbstractMachine() {
 configTestSuites() {
     mkdir -p ${AM_FOLDER_PATH}
     cd ${AM_FOLDER_PATH}
-
     if [[ -d ${RISCV_TESTS_FOLDER_PATH} ]]; then
         echo -e "${RIGHT}riscv-tests exist!${END}"
     else
         echo -e "${INFO}[no download]: git clone...${END}"
-    git clone https://github.com/NJU-ProjectN/riscv-tests.git
+        git clone https://github.com/NJU-ProjectN/riscv-tests.git
     fi
 
     cd ${ROOT_PATH}
@@ -137,6 +139,8 @@ configDiffTest() {
 
 ###### NEMU ######
 configNemu() {
+    cd ${ROOT_PATH}
+
     if [[ -d ${NEMU_FOLDER_PATH} ]]; then
         echo -e "${RIGHT}NEMU exist!${END}"
     else
@@ -167,7 +171,9 @@ configNemu() {
     # change the sim memory from 8G to 256MB
     # need to enter 'make menuconfig' and 
     # modify [Memory Configuration]->[Memory size] to '0x10000000' manually
-    # sed -i 's/^\(CONFIG_MSIZE=0x\)\(.*\)/\110000000/' .config
+    sed -i 's/^\(CONFIG_MSIZE=0x\)\(.*\)/\110000000/' .config
+    # NOTE: you need to set the 'NEMU_HOME' and 'NOOP_HOME' in sh config file!
+    # because the compliation only reads sh env vars
 
     cd ${ROOT_PATH}
 }
@@ -186,6 +192,7 @@ configDramSim3() {
 
     cd ${DRAMSIM3_FOLDER_PATH}
     git checkout 5723f6b1cc157ac2d7b4154b50fd1799c9cf54aa
+
     cd ${ROOT_PATH}
 }
 
@@ -199,6 +206,8 @@ configYsyxSoC() {
         echo -e "${INFO}[no download]: git clone...${END}"
         git clone --depth 1 https://github.com/OSCPU/ysyxSoC.git
     fi
+
+    cd ${ROOT_PATH}
 }
 
 helpInfo() {