PowerPC 9 adapt

Ramon Nourequested to merge
rnou/powertest into master

Some changes to use GekkoFS in powerpc

  • Syscall intercept powerpc branch (dl_dep modified to allow commits in branches)
  • powerpc define to avoid syscall_intercept_wrapper (as return codes work different compared to x86)
  • Removed oerrno in hooks avoiding the correct behaviour of mpirun (errno was Success, it should be EEXIST)
  • unlinkat syscall tests failed.
  • intercept header in hooks.hpp , removed from external C, to allow syscall_no_intercept_wrapper template in powerpc
Edited by Ramon Nou

Merge request reports

include/client/hooks.hpp

+20 −0
Changes for include/client/hooks.hpp: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,7 +36,27 @@ extern "C" { 
#include <sys/stat.h>

#include <sys/syscall.h>

}

#include <libsyscall_intercept_hook_point.h>



/*

 * For PowerPC, syscall_no_intercept_wrapper() is defined in the

 * syscall intercept branch `powerpc` and file

 * `include/libsyscall_intercept_hook_point.h`

 */

#ifndef _ARCH_PPC64

template <class... Args>

inline long

syscall_no_intercept_wrapper(long syscall_number, Args... args) {

    long result;

    int error;

    result = syscall_no_intercept(syscall_number, args...);

    error = syscall_error_code(result);

    if(error != 0) {

        return -error;

    }

    return result;

}

#endif



struct statfs;

struct linux_dirent;

scripts/profiles/0.9.1/p9.specs

0 → 100644
+82 −0
Changes for scripts/profiles/0.9.1/p9.specs: 82 added lines, 0 removed lines.
Original line number Diff line number Diff line 
################################################################################

# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain            #

# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany          #

#                                                                              #

# This software was partially supported by the                                 #

# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #

#                                                                              #

# This software was partially supported by the                                 #

# ADA-FS project under the SPPEXA project funded by the DFG.                   #

#                                                                              #

# This file is part of GekkoFS.                                                #

#                                                                              #

# GekkoFS is free software: you can redistribute it and/or modify              #

# it under the terms of the GNU General Public License as published by         #

# the Free Software Foundation, either version 3 of the License, or            #

# (at your option) any later version.                                          #

#                                                                              #

# GekkoFS is distributed in the hope that it will be useful,                   #

# but WITHOUT ANY WARRANTY; without even the implied warranty of               #

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #

# GNU General Public License for more details.                                 #

#                                                                              #

# You should have received a copy of the GNU General Public License            #

# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #

#                                                                              #

# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



# vi: ft=bash



# Variables to be imported into the scripts

declare -A wgetdeps clonedeps clonedeps_args clonedeps_patches extra_install_args

declare -a order



# Comment that should be displayed when printing the profile

comment="Dependencies for PowerPC supercomputer"



# Dependencies that must be downloaded directly

wgetdeps=(

    ["lz4"]="1.9.3"

    ["capstone"]="4.0.2"

    ["argobots"]="1.1"

    ["rocksdb"]="6.26.1"

    ["psm2"]="11.2.185"

    ["json-c"]="0.15-20200726"

)



# Dependencies that must be cloned

clonedeps=(

    ["libfabric"]="HEAD@v1.13.2"

    ["mercury"]="v2.1.0"

    ["margo"]="v0.9.6"

    ["syscall_intercept"]="6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f"

    ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"

)



# Extra arguments for git clone

clonedeps_args=(

    ["mercury"]="--recurse-submodules"

)



# Patches that should be applied post-clone

clonedeps_patches=(

    ["syscall_intercept"]="syscall_intercept.patch"

)



# Ordering that MUST be followed when downloading

order=(

    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" 

)



# Extra arguments passed to the installation script. As such, they can

# reference the following variables:

#  - CMAKE: a variable that expands to the cmake binary

#  - SOURCE_DIR: the directory where the sources for the package were

#               downloaded

#  - INSTALL_DIR: the directory where the package should be installed

#  - CORES: the number of cores to use when building

#  - PERFORM_TEST: whether tests for the package should be executed

extra_install_args=(

    ["libfabric"]="--enable-psm2=no --enable-sockets=yes"

)

scripts/profiles/0.9.2/p9.specs

0 → 100644
+82 −0
Changes for scripts/profiles/0.9.2/p9.specs: 82 added lines, 0 removed lines.
Original line number Diff line number Diff line 
################################################################################

# Copyright 2018-2021, Barcelona Supercomputing Center (BSC), Spain            #

# Copyright 2015-2021, Johannes Gutenberg Universitaet Mainz, Germany          #

#                                                                              #

# This software was partially supported by the                                 #

# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #

#                                                                              #

# This software was partially supported by the                                 #

# ADA-FS project under the SPPEXA project funded by the DFG.                   #

#                                                                              #

# This file is part of GekkoFS.                                                #

#                                                                              #

# GekkoFS is free software: you can redistribute it and/or modify              #

# it under the terms of the GNU General Public License as published by         #

# the Free Software Foundation, either version 3 of the License, or            #

# (at your option) any later version.                                          #

#                                                                              #

# GekkoFS is distributed in the hope that it will be useful,                   #

# but WITHOUT ANY WARRANTY; without even the implied warranty of               #

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #

# GNU General Public License for more details.                                 #

#                                                                              #

# You should have received a copy of the GNU General Public License            #

# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #

#                                                                              #

# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



# vi: ft=bash



# Variables to be imported into the scripts

declare -A wgetdeps clonedeps clonedeps_args clonedeps_patches extra_install_args

declare -a order



# Comment that should be displayed when printing the profile

comment="Dependencies for PowerPC supercomputer"



# Dependencies that must be downloaded directly

wgetdeps=(

    ["lz4"]="1.9.3"

    ["capstone"]="4.0.2"

    ["argobots"]="1.1"

    ["rocksdb"]="6.26.1"

    ["psm2"]="11.2.185"

    ["json-c"]="0.15-20200726"

)



# Dependencies that must be cloned

clonedeps=(

    ["libfabric"]="HEAD@v1.13.2"

    ["mercury"]="v2.1.0"

    ["margo"]="v0.9.6"

    ["syscall_intercept"]="6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f"

    ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"

)



# Extra arguments for git clone

clonedeps_args=(

    ["mercury"]="--recurse-submodules"

)



# Patches that should be applied post-clone

clonedeps_patches=(

    ["syscall_intercept"]="syscall_intercept.patch"

)



# Ordering that MUST be followed when downloading

order=(

    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" 

)



# Extra arguments passed to the installation script. As such, they can

# reference the following variables:

#  - CMAKE: a variable that expands to the cmake binary

#  - SOURCE_DIR: the directory where the sources for the package were

#               downloaded

#  - INSTALL_DIR: the directory where the package should be installed

#  - CORES: the number of cores to use when building

#  - PERFORM_TEST: whether tests for the package should be executed

extra_install_args=(

    ["libfabric"]="--enable-psm2=no --enable-sockets=yes"

)

scripts/profiles/sources.list

+1 −1
Changes for scripts/profiles/sources.list: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ sources=( 
    ["libfabric%verbs"]="https://github.com/ofiwg/libfabric.git"

    ["mercury"]="https://github.com/mercury-hpc/mercury"

    ["margo"]="https://github.com/mochi-hpc/mochi-margo"

    ["syscall_intercept"]="https://github.com/pmem/syscall_intercept.git"

    ["syscall_intercept"]="https://github.com/GekkoFS/syscall_intercept.git"

    ["date"]="https://github.com/HowardHinnant/date.git"

    ["agios"]="https://github.com/francielizanon/agios.git"

    ["json-c"]="https://github.com/json-c/json-c/archive/json-c-{{VERSION}}.tar.gz"

scripts/dl_dep.sh

+1 −1
Changes for scripts/dl_dep.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
################################################################################



COMMON_CURL_FLAGS="--silent --fail --show-error --location -O"

COMMON_GIT_FLAGS="--quiet --single-branch -c advice.detachedHead=false"

COMMON_GIT_FLAGS="--quiet -c advice.detachedHead=false"

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

PATCH_DIR="${SCRIPT_DIR}/patches"

DEPENDENCY=""