Merge branch 'develop'

Author: tinebp

.travis.yml

@@ -25,19 +25,22 @@ cache:
     - $HOME/build64
 
 before_install:
-  - if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0.3" ]; then
+  - if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0.4" ]; then
       rm -rf $TOOLDIR;
       mkdir -p $TRAVIS_BUILD_DIR/build && cd $TRAVIS_BUILD_DIR/build;
       ../configure --tooldir=$TOOLDIR;
       ci/toolchain_install.sh --all;
       echo "v0.3" > "$TOOLDIR/version.txt";
+    else
+      echo "using existing tooldir build";
     fi
   - if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v0.2" ]; then
       cd $TRAVIS_BUILD_DIR;
       make -C third_party > /dev/null;
       echo "v0.2" > "third_party/version.txt";
       cp -rf third_party $HOME;
     else
+      echo "using existing third_party build";
       cp -rf $HOME/third_party $TRAVIS_BUILD_DIR;
     fi
 
@@ -50,6 +53,7 @@ install:
       echo "$TRAVIS_COMMIT" > version.txt;
       cp -rf $TRAVIS_BUILD_DIR/build$XLEN $HOME;
     else
+      echo "using existing build for commit $TRAVIS_COMMIT";
       cp -rf $HOME/build$XLEN $TRAVIS_BUILD_DIR;
     fi
 

Makefile.in

@@ -22,41 +22,40 @@ clean:
 	$(MAKE) -C runtime clean
 	$(MAKE) -C tests clean
 
-clean-all:
-	$(MAKE) -C hw clean
-	$(MAKE) -C sim clean
-	$(MAKE) -C kernel clean
-	$(MAKE) -C runtime clean
-	$(MAKE) -C tests clean-all
-
 # Install setup
-KERNEL_LIB_DST = $(PREFIX)/kernel/lib$(XLEN)
-RUNTIME_LIB_DST = $(PREFIX)/runtime/lib
 KERNEL_INC_DST = $(PREFIX)/kernel/include
+KERNEL_LIB_DST = $(PREFIX)/kernel/lib$(XLEN)
 RUNTIME_INC_DST = $(PREFIX)/runtime/include
+RUNTIME_LIB_DST = $(PREFIX)/runtime/lib
 
 KERNEL_HEADERS = $(wildcard $(VORTEX_HOME)/kernel/include/*.h)
+KERNEL_LIBS = $(wildcard kernel/*.a)
 RUNTIME_HEADERS = $(wildcard $(VORTEX_HOME)/runtime/include/*.h)
+RUNTIME_LIBS = $(wildcard runtime/*.so)
 
 INSTALL_DIRS = $(KERNEL_LIB_DST) $(RUNTIME_LIB_DST) $(KERNEL_INC_DST) $(RUNTIME_INC_DST)
 
 $(INSTALL_DIRS):
 	mkdir -p $@
 
+$(KERNEL_INC_DST)/VX_types.h: hw/VX_types.h | $(KERNEL_INC_DST)
+	cp $< $@
+
 $(KERNEL_INC_DST)/%.h: $(VORTEX_HOME)/kernel/include/%.h | $(KERNEL_INC_DST)
 	cp $< $@
 
 $(RUNTIME_INC_DST)/%.h: $(VORTEX_HOME)/runtime/include/%.h | $(RUNTIME_INC_DST)
 	cp $< $@
 
-$(KERNEL_LIB_DST)/libvortex.a: kernel/libvortexrt.a | $(KERNEL_LIB_DST)
+$(KERNEL_LIB_DST)/%.a: kernel/%.a | $(KERNEL_LIB_DST)
 	cp $< $@
 
-$(RUNTIME_LIB_DST)/libvortex.so: runtime/stub/libvortex.so | $(RUNTIME_LIB_DST)
+$(RUNTIME_LIB_DST)/%.so: runtime/%.so | $(RUNTIME_LIB_DST)
 	cp $< $@
 
 install: $(INSTALL_DIRS) \
-         $(KERNEL_HEADERS:$(VORTEX_HOME)/kernel/include/%=$(KERNEL_INC_DST)/%) \
+         $(KERNEL_INC_DST)/VX_types.h \
+		 $(KERNEL_HEADERS:$(VORTEX_HOME)/kernel/include/%=$(KERNEL_INC_DST)/%) \
          $(RUNTIME_HEADERS:$(VORTEX_HOME)/runtime/include/%=$(RUNTIME_INC_DST)/%) \
-         $(KERNEL_LIB_DST)/libvortex.a \
-         $(RUNTIME_LIB_DST)/libvortex.so
+		 $(KERNEL_LIBS:kernel/%=$(KERNEL_LIB_DST)/%) \
+		 $(RUNTIME_LIBS:runtime/%=$(RUNTIME_LIB_DST)/%)

ci/blackbox.sh

@@ -193,7 +193,7 @@ then
 
     if [ $REBUILD -eq 1 ] || [ "$CONFIGS+$DEBUG+$SCOPE" != "$LAST_CONFIGS" ];
     then
-        make -C $DRIVER_PATH clean > /dev/null
+        make -C $DRIVER_PATH clean-driver > /dev/null
         echo "$CONFIGS+$DEBUG+$SCOPE" > $BLACKBOX_CACHE
     fi
 fi
@@ -232,11 +232,11 @@ then
         if [ $HAS_ARGS -eq 1 ]
         then
             echo "running: VORTEX_RT_PATH=$TEMPDIR OPTS=$ARGS make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1"
-            VORTEX_RT_PATH=$TEMPDIR OPTS=$ARGS make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
+            DEBUG=1 VORTEX_RT_PATH=$TEMPDIR OPTS=$ARGS make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
             status=$?
         else
             echo "running: VORTEX_RT_PATH=$TEMPDIR make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1"
-            VORTEX_RT_PATH=$TEMPDIR make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
+            DEBUG=1 VORTEX_RT_PATH=$TEMPDIR make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
             status=$?
         fi
 
@@ -257,11 +257,11 @@ then
         if [ $HAS_ARGS -eq 1 ]
         then
             echo "running: OPTS=$ARGS make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1"
-            OPTS=$ARGS make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
+            DEBUG=1 OPTS=$ARGS make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
             status=$?
         else
             echo "running: make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1"
-            make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
+            DEBUG=1 make -C $APP_PATH run-$DRIVER > $LOGFILE 2>&1
             status=$?
         fi
     fi

ci/regression.sh

@@ -19,6 +19,37 @@ set -e
 # clear blackbox cache
 rm -f blackbox.*.cache
 
+split_file() {
+    if [[ $# -ne 2 ]]; then
+        echo "Usage: $0 <filename> <start_with>"
+        return 1
+    fi
+    input_file="$1"
+    start_with="$2"
+    if [[ ! -r "$input_file" ]]; then
+        echo "Error: File '$input_file' is not readable or does not exist."
+        return 1
+    fi
+    count=0
+    output_file=""
+    while IFS= read -r line; do
+        if [[ $line == $start_with* ]]; then
+            count=$((count + 1))
+            output_file="$input_file.part$count"
+            > "$output_file" # ensure empty
+        fi
+        if [[ -n "$output_file" ]]; then
+            echo "$line" >> "$output_file"
+        fi
+    done < "$input_file"
+
+    if [[ $count -eq 0 ]]; then
+        echo "No lines starting with '$start_with' were found in '$input_file'."
+    fi
+}
+
+###############################################################################
+
 unittest()
 {
     make -C tests/unittest run
@@ -102,6 +133,9 @@ opencl()
     make -C tests/opencl run-simx
     make -C tests/opencl run-rtlsim
 
+    ./ci/blackbox.sh --driver=simx --app=lbm --warps=8
+    ./ci/blackbox.sh --driver=rtlsim --app=lbm --warps=8
+
     echo "opencl tests done!"
 }
 
@@ -125,25 +159,39 @@ cluster()
     echo "clustering tests done!"
 }
 
-debug()
+test_csv_trace()
 {
-    echo "begin debugging tests..."
-
     # test CSV trace generation
     make -C sim/simx clean && DEBUG=3 make -C sim/simx > /dev/null
     make -C sim/rtlsim clean && DEBUG=3 CONFIGS="-DGPR_RESET" make -C sim/rtlsim > /dev/null
     make -C tests/riscv/isa run-simx-32im > run_simx.log
     make -C tests/riscv/isa run-rtlsim-32im > run_rtlsim.log
-    ./ci/trace_csv.py -trtlsim run_rtlsim.log -otrace_rtlsim.csv
-    ./ci/trace_csv.py -tsimx run_simx.log -otrace_simx.csv
-    diff trace_rtlsim.csv trace_simx.csv
+    split_file run_simx.log "Running "
+    split_file run_rtlsim.log "Running "
+    for file in ./run_simx.log.part*; do
+        if [[ -f "$file" ]]; then
+            file2="${file//simx/rtlsim}"
+            if [[ -f "$file2" ]]; then
+                ./ci/trace_csv.py -tsimx $file -otrace_simx.csv
+                ./ci/trace_csv.py -trtlsim $file2 -otrace_rtlsim.csv
+                diff trace_rtlsim.csv trace_simx.csv
+            else
+                echo "File $file2 not found."
+            fi
+        fi
+    done
     # restore default prebuilt configuration
     make -C sim/simx clean && make -C sim/simx > /dev/null
     make -C sim/rtlsim clean && make -C sim/rtlsim > /dev/null
+}
 
+debug()
+{
+    echo "begin debugging tests..."
+    test_csv_trace
     ./ci/blackbox.sh --driver=opae --cores=2 --clusters=2 --l2cache --debug=1 --perf=1 --app=demo --args="-n1"
     ./ci/blackbox.sh --driver=simx --cores=2 --clusters=2 --l2cache --debug=1 --perf=1 --app=demo --args="-n1"
-    ./ci/blackbox.sh --driver=opae --cores=1 --scope --app=basic --args="-t0 -n1"
+    ./ci/blackbox.sh --driver=opae --cores=1 --scope --app=demo --args="-n1"
 
     echo "debugging tests done!"
 }
@@ -189,12 +237,10 @@ config()
     CONFIGS="-DISSUE_WIDTH=4 -DNUM_LSU_BLOCK=4 -DNUM_LSU_LANES=4" ./ci/blackbox.sh --driver=simx --app=vecaddx
 
     # custom program startup address
-    make -C tests/regression/dogfood clean-all
+    make -C tests/regression/dogfood clean-kernel
     STARTUP_ADDR=0x40000000 make -C tests/regression/dogfood
-    CONFIGS="-DSTARTUP_ADDR=0x40000000" ./ci/blackbox.sh --driver=simx --app=dogfood
-    CONFIGS="-DSTARTUP_ADDR=0x40000000" ./ci/blackbox.sh --driver=rtlsim --app=dogfood
-    make -C tests/regression/dogfood clean-all
-    make -C tests/regression/dogfood
+    ./ci/blackbox.sh --driver=simx --app=dogfood
+    ./ci/blackbox.sh --driver=rtlsim --app=dogfood
 
     # disabling M & F extensions
     make -C sim/rtlsim clean && CONFIGS="-DEXT_M_DISABLE -DEXT_F_DISABLE" make -C sim/rtlsim > /dev/null