Merge branch 'master' into master

Author: CharliePu

.github/workflows/ci.yml

@@ -17,17 +17,17 @@ on: [push, pull_request]
 
 jobs:
   setup:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -36,7 +36,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -63,23 +63,23 @@ jobs:
           make -C third_party > /dev/null
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: setup
     strategy:
       matrix:
         xlen: [32, 64]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: |
           sudo bash ./ci/install_dependencies.sh
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -88,7 +88,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -112,7 +112,7 @@ jobs:
           path: build${{ matrix.xlen }}
 
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build
     strategy:
       fail-fast: false
@@ -122,15 +122,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: |
           sudo bash ./ci/install_dependencies.sh
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -139,7 +139,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -167,7 +167,7 @@ jobs:
           fi
 
   complete:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: tests
 
     steps:

ci/install_dependencies.sh

@@ -31,7 +31,7 @@ check_gcc_version() {
 apt-get update -y
 
 # install system dependencies
-apt-get install -y build-essential valgrind libstdc++6 binutils python3 uuid-dev ccache cmake
+apt-get install -y build-essential valgrind libstdc++6 binutils python3 uuid-dev ccache cmake libffi7
 
 # Check and install GCC 11 if necessary
 if check_gcc_version; then

kernel/include/vx_intrinsics.h

@@ -222,21 +222,21 @@ inline void vx_fence() {
 }
 
 //Matrix load
-inline void vx_matrix_load(unsigned dest, unsigned  addr) 
+inline void vx_matrix_load(unsigned dest, unsigned  addr)
 {
-    asm volatile (".insn i 0x7b, 0, x0, %0(%1)" :: "i"(dest), "r"(addr));
+    __asm__ volatile (".insn i 0x7b, 0, x0, %0(%1)" :: "i"(dest), "r"(addr));
 }
 
 //Matrix Store
-inline void vx_matrix_store(unsigned  addr) 
+inline void vx_matrix_store(unsigned  addr)
 {
-    asm volatile (".insn i 0x7b, 1, x0, 0(%0)" :: "r"(addr));
+    __asm__ volatile (".insn i 0x7b, 1, x0, 0(%0)" :: "r"(addr));
 }
 
 //Matrix Mul
-inline void vx_matrix_mul() 
+inline void vx_matrix_mul()
 {
-    asm volatile (".insn i 0x7b, 2, x0, 0(x0)");
+    __asm__ volatile (".insn i 0x7b, 2, x0, 0(x0)");
 }
 
 #ifdef __cplusplus

tests/opencl/common.mk

@@ -31,7 +31,7 @@ VX_CFLAGS  += -fno-rtti -fno-exceptions -nostartfiles -nostdlib -fdata-sections
 VX_CFLAGS  += -I$(ROOT_DIR)/hw -I$(VORTEX_HOME)/kernel/include -DXLEN_$(XLEN) -DNDEBUG
 VX_CFLAGS  += -Xclang -target-feature -Xclang +vortex
 VX_CFLAGS  += -Xclang -target-feature -Xclang +zicond
-VX_CFLAGS  += -mllvm -disable-loop-idiom-all
+VX_CFLAGS  += -mllvm -disable-loop-idiom-all	# disable memset/memcpy loop replacement
 #VX_CFLAGS += -mllvm -vortex-branch-divergence=0
 #VX_CFLAGS += -mllvm -print-after-all