Add cm config

.github/scripts/gdb_test.sh

@@ -18,7 +18,9 @@
 
 SIM_LOG=`realpath sim.log`
 OPENOCD_LOG=`realpath openocd.log`
-GCC_PREFIX=riscv64-unknown-elf
+if [ -z $GCC_PREFIX ]; then
+    GCC_PREFIX=riscv64-unknown-elf
+fi
 
 # Ensure that RISC-V toolchain is installed
 if ! which ${GCC_PREFIX}-gcc >/dev/null; then
@@ -58,13 +60,22 @@ echo -e "${COLOR_WHITE}======== Launching interactive simulation ========${COLOR
 
 # Start the simulation
 echo -e "Starting simulation..."
-./obj_dir/Vtb_top >"${SIM_LOG}" 2>&1 &
+if [ -f obj_dir/Vtb_top ]; then
+    SIM_START_STRING="VerilatorTB: Start of sim"
+    obj_dir/Vtb_top >"${SIM_LOG}" 2>&1 &
+elif [ -f ./simv ]; then
+    SIM_START_STRING="  remote_bitbang_port 5000"
+    ./simv +vcs+lic+wait -cm line+cond+fsm+tgl+branch >"${SIM_LOG}" 2>&1 &
+else
+    echo "No simulation binary found, exiting"
+    exit 1
+fi
 SIM_PID=$!
 
 # Wait
-wait_for_phrase "${SIM_LOG}" "Start of sim"
+wait_for_phrase "${SIM_LOG}" "${SIM_START_STRING}"
 # TODO handle proper string in the output instead of waiting
-sleep 10s
+sleep 1s
 retcode=$?
 if [ $retcode -ne 0 ]; then
     echo -e "${COLOR_RED}Failed to start the simulation: $retcode ${COLOR_OFF}"

.github/scripts/openocd_test.sh

@@ -42,11 +42,20 @@ echo -e "${COLOR_WHITE}======== Launching interactive simulation ========${COLOR
 
 # Start the simulation
 echo -e "Starting simulation..."
-obj_dir/Vtb_top >"${SIM_LOG}" 2>&1 &
+if [ -f obj_dir/Vtb_top ]; then
+    SIM_START_STRING="VerilatorTB: Start of sim"
+    obj_dir/Vtb_top >"${SIM_LOG}" 2>&1 &
+elif [ -f ./simv ]; then
+    SIM_START_STRING="  remote_bitbang_port 5000"
+    ./simv +vcs+lic+wait -cm line+cond+fsm+tgl+branch >"${SIM_LOG}" 2>&1 &
+else
+    echo "No simulation binary found, exiting"
+    exit 1
+fi
 SIM_PID=$!
 
 # Wait
-wait_for_phrase "${SIM_LOG}" "VerilatorTB: Start of sim"
+wait_for_phrase "${SIM_LOG}" "${SIM_START_STRING}"
 if [ $? -ne 0 ]; then
     echo -e "${COLOR_RED}Failed to start the simulation!${COLOR_OFF}"
     print_logs

.github/scripts/prepare_coverage_data.sh

@@ -0,0 +1,161 @@
+set -e
+set -o pipefail
+
+cat <<EOF >> split.py
+import sys
+files = {}
+active_file = None
+with open(sys.argv[1], 'r') as file:
+ for line in file:
+   if line[0:1] == "#":
+       continue
+   elif line[0:3] == "SF:":
+       active_file = line.replace("\n", "").split(":")[1]
+       files[active_file] = {}
+       files[active_file]["da"] = []
+       files[active_file]["brda"] = []
+       files[active_file]["brf"] = 0
+       files[active_file]["brh"] = 0
+   elif line[0:3] == "DA:":
+       files[active_file]["da"].append(line.replace("\n", "").split(":")[1:])
+   elif line[0:5] == "BRDA:":
+       files[active_file]["brda"].append(line.replace("\n", "").split(":")[1:])
+   elif line[0:4] == "BRF:":
+       files[active_file]["brf"] = int(line.replace("\n", "").split(":")[1])
+   elif line[0:4] == "BRH:":
+       files[active_file]["brh"] = int(line.replace("\n", "").split(":")[1])
+   elif "end_of_record" in line:
+       active_file = None
+if sys.argv[2] == "--branch":
+  print("TN:verilator_coverage")
+  for f in files:
+     print("SF:%s" % f)
+     for brda in files[f]["brda"]:
+       brda_line = brda[0].split(",")[0]
+       for da in files[f]["da"]:
+          da_line = da[0].split(",")[0]
+          if da_line == brda_line:
+            print("DA:%s" % (",".join(da)))
+            files[f]["da"].remove(da)
+       print("BRDA:%s" % (",".join(brda)))
+     print("end_of_record")
+elif sys.argv[2] == "--line":
+  print("TN:verilator_coverage")
+  for f in files:
+     print("SF:%s" % f)
+     for da in files[f]["da"]:
+       da_line = da[0].split(",")[0]
+       found = False
+       for brda in files[f]["brda"]:
+          brda_line = brda[0].split(",")[0]
+          if da_line == brda_line:
+            found = True
+       if not found:
+         print("DA:%s" % (",".join(da)))
+     print("end_of_record")
+  sys.exit(0)
+EOF
+
+cat <<EOF >> preprocess.py
+import sys
+filter = None
+in_file = False
+if sys.argv[2] == "--filter":
+  filter = sys.argv[3]
+print("TN:verilator_coverage")
+with open(sys.argv[1], 'r') as file:
+  for line in file:
+    line = line.replace("\n", "")
+    if line[0:3] == "SF:":
+        if filter == None or line.startswith("SF:%s" % filter):
+            in_file = True
+            print(line)
+            continue
+        else:
+            in_file = False
+            continue
+    if not in_file:
+        continue
+    if "end_of_record" in line:
+        in_file = False
+        print(line)
+        continue
+    if line[0:1] == "#":
+      print(line)
+    elif line[0:3] == "DA:":
+      data = line.split(",")
+      line = "%s,%d" % (data[0], int(data[1]) > 0)
+      print(line)
+    elif line[0:5] == "BRDA:":
+      data = line.split(",")
+      line = "%s,%s,%s,%d" % (data[0],data[1],data[2], int(data[3]) > 0)
+      print(line)
+    else:
+      print(line)
+EOF
+
+mkdir info_files
+mv *.info info_files
+cd info_files
+git clone https://github.com/linux-test-project/lcov -b v2.3-beta
+PATH="`pwd`/lcov/bin:$PATH"
+
+ls *_toggle.info | xargs printf -- '-a %s\n' | xargs echo | awk '{ print "lcov "$0" --ignore-errors inconsistent --rc lcov_branch_coverage=1 -o coverage_toggle_verilator.info" }' | bash
+ls *_branch.info | xargs printf -- '-a %s\n' | xargs echo | awk '{ print "lcov "$0" --ignore-errors inconsistent --rc lcov_branch_coverage=1 -o coverage_line_verilator.info" }' | bash
+
+cp coverage_toggle_verilator.info ../
+cp coverage_line_verilator.info ../
+
+cd ../
+rm -rf info_files
+
+mv coverage_line_verilator.info line.info
+python3 split.py line.info --branch > coverage_branch_verilator.info
+python3 split.py line.info --line > coverage_line_verilator.info
+
+find . -type f -name 'coverage_*.info' -exec sed -i 's_^SF:.*Cores-VeeR-EL2/_SF:_g' {} \;
+
+python3 preprocess.py coverage_line_verilator.info --filter "design/" > _coverage_line.info
+python3 preprocess.py coverage_toggle_verilator.info --filter "design/" > _coverage_toggle.info
+python3 preprocess.py coverage_branch_verilator.info --filter "design/" > _coverage_branch.info
+
+cp _coverage_line.info coverage_line_verilator.info
+cp _coverage_branch.info coverage_branch_verilator.info
+cp _coverage_toggle.info coverage_toggle_verilator.info
+
+grep 'SF:' coverage_*.info | cut -d ":" -f 3 | sort | uniq > files.txt
+
+export BRANCH=$GITHUB_HEAD_REF
+export COMMIT=$GITHUB_SHA
+{
+        while read file
+                do
+                        if [ -f $file ]; then
+                                echo "### FILE: $file"
+                                cat "$file"
+                        else
+                                echo "### SKIPPING: $file"
+                        fi
+                done
+} < files.txt > sources.txt
+
+mkdir test_data
+cp coverage_line_*.info coverage_toggle_*.info coverage_branch_* sources.txt test_data
+
+# add logo
+cp docs/dashboard-styles/assets/chips-alliance-logo-mono.svg test_data/logo.svg
+
+# add config.json
+echo -n '{ "datasets": { "verilator": { "line": "coverage_line_verilator.info", "branch": "coverage_branch_verilator.info", "toggle": "coverage_toggle_verilator.info" } }, "title": "VeeR EL2 coverage dashboard", "commit": "' > test_data/config.json
+echo -n $COMMIT >> test_data/config.json
+echo -n '", "branch": "' >> test_data/config.json
+echo -n $BRANCH >> test_data/config.json
+echo -n '", "repo": "cores-veer-el2", "timestamp": "' >> test_data/config.json
+echo -n `date +"%Y-%m-%dT%H:%M:%S.%3N%z"` >> test_data/config.json
+echo -n '" }' >> test_data/config.json
+
+cat test_data/config.json
+
+cd test_data
+zip ../data.zip *
+cd ..

.github/scripts/test.gdb

@@ -126,19 +126,5 @@ continue
 
 delete
 
-# This causes an error. Let's execute it anyway for coverage.
-echo Accessing region at 0xe0000000...\n
-set *(0xe0000000) = 0x01234567
-set *(0xe0000004) = 0x89ABCDEF
-set *(0xe0000008) = 0x55555555
-set *(0xe000000C) = 0xAAAAAAAA
-print/x *0xe0000000@4
-echo Accessing region at 0xf0000000...\n
-set *(0xf0000000) = 0x01234567
-set *(0xf0000004) = 0x89ABCDEF
-set *(0xf0000008) = 0x55555555
-set *(0xf000000C) = 0xAAAAAAAA
-print/x *0xf0000000@4
-
 # end the simulation gracefully
 set *(volatile unsigned char*)0xd0580000 = 0xff

.github/scripts/utils.sh

@@ -33,8 +33,8 @@ wait_for_phrase () {
     fi
 
     # Wait for the phrase
-    DEADLINE=$((${EPOCHSECONDS} + 30))
-    while [ ${EPOCHSECONDS} -lt ${DEADLINE} ]
+    DEADLINE=$(($(date +%s) + 30))
+    while [ $(date +%s) -lt ${DEADLINE} ]
     do
         # Check for the phrase
         grep "$2" "$1" >/dev/null

.github/workflows/publish-webpage.yml

@@ -69,6 +69,7 @@ jobs:
       - name: Update webpage
         if: github.event_name != 'pull_request'
         run: |
+          mv coverage_dashboard/*.zip .
           sis -d webpage \
             --include-documentation \
             --doc-project-name "Cores VeeR EL2" \
@@ -79,11 +80,15 @@ jobs:
           rm -rf public.new/html/main/docs_rendered
           mkdir -p public.new/html/main/docs_rendered
           mv ./docs_rendered/* public.new/html/main/docs_rendered
+          mv data.zip public.new/html/main/
+          mv data_v.zip public.new/html/main/
+          echo ${GITHUB_RUN_ID} > public.new/html/main/run_id
           tar -acf webpage.tar.gz public.new
 
       - name: Update webpage PR
         if: github.event_name == 'pull_request'
         run: |
+          mv coverage_dashboard/*.zip .
           sis -d webpage \
             --include-documentation \
             --doc-project-name "Cores VeeR EL2" \
@@ -94,6 +99,9 @@ jobs:
           rm -rf public.new/html/dev/${{ github.event.number }}/docs_rendered
           mkdir -p public.new/html/dev/${{ github.event.number }}/docs_rendered
           mv ./docs_rendered/* public.new/html/dev/${{ github.event.number }}/docs_rendered
+          mv data.zip public.new/html/dev/${{ github.event.number }}/
+          mv data_v.zip public.new/html/dev/${{ github.event.number }}/
+          echo ${GITHUB_RUN_ID} > public.new/html/dev/${{ github.event.number }}/run_id
           tar -acf webpage.tar.gz public.new
 
       - name: Add redirect index page