Commit e3e0d461 authored by Ramon Nou's avatar Ramon Nou
Browse files

updated riscv syscall

parent b66841ca

scripts/profiles/0.9.6-dev/install/syscall_intercept.install

+1 −5
Original line number Diff line number Diff line
@@ -61,16 +61,12 @@ pkg_install() { 
    -DCMAKE_BUILD_TYPE:STRING=Debug \

    -DBUILD_EXAMPLES:BOOL=OFF \

    -DSTATIC_CAPSTONE:BOOL=OFF \

    -DBUILD_TESTS:BOOK=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..

    -DBUILD_TESTS:BOOK=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -S ..

    make -j"${CORES}" install

    if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then

        cp "${CURR}"/arch/aarch64/include/libsyscall_intercept_hook_point.h ${INSTALL_DIR}/include

    fi



    # patch for riscv syscall_intercept version to fit other implementations

    # it replaces line 91 only if there is the struct wrapper_ret of riscv

    sed -i '89s/struct wrapper_ret/long/g' \

      ${INSTALL_DIR}/include/libsyscall_intercept_hook_point.h

}



pkg_check() {

scripts/profiles/0.9.6-dev/riscv.specs

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ clonedeps=( 
    ["libfabric"]="HEAD@v1.20.1"

    ["mercury"]="v2.4.1"

    ["margo"]="v0.21.0"

    ["syscall_intercept"]="fcc6d7bd4a62c2fa0419ad65ecd8d5ed95b99f63"

    ["syscall_intercept"]="5a6a416395422346e0086b75abd11bc8f5210f4a"

)



# Extra arguments for git clone

src/client/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ target_link_libraries( 
    fmt::fmt

    Threads::Threads

    Microsoft.GSL::GSL

    Syscall_intercept::Syscall_intercept

)

endif()
@@ -172,6 +173,7 @@ target_link_libraries( 
    fmt::fmt

    Threads::Threads

    Microsoft.GSL::GSL

    Syscall_intercept::Syscall_intercept

)

# Enable MSGPack metrics for intercept only

if (GKFS_ENABLE_CLIENT_METRICS)

src/client/syscalls/util.S

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef __riscv

.global syscall_no_intercept;

.type   syscall_no_intercept, @function
@@ -69,3 +69,4 @@ syscall_no_intercept: 
#endif



.size   syscall_no_intercept, .-syscall_no_intercept

#endif

tests/scripts/dl_dep.sh/0.9.6-dev/riscv.out

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4. 
Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'

Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''

Downloaded 'https://github.com/facebook/rocksdb/archive/v8.10.0.tar.gz' to 'rocksdb'

Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[2a25b21926ab115d667e135389458a7a159e8bb1]' and flags ''

Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[5a6a416395422346e0086b75abd11bc8f5210f4a]' and flags ''

Done