forked from rarias/jungle
Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
1fba0a14a8 | |||
d6621e939a | |||
67726c1d44 | |||
a971ed6a54 | |||
06581e455c | |||
dd7f24f455 | |||
64e2c39582 | |||
98d17b19d3 |
@ -12,4 +12,9 @@ jobs:
|
|||||||
runs-on: native
|
runs-on: native
|
||||||
steps:
|
steps:
|
||||||
- uses: https://gitea.com/ScMi1/checkout@v1.4
|
- uses: https://gitea.com/ScMi1/checkout@v1.4
|
||||||
- run: nix build -L --no-link --print-out-paths .#bsc-ci.all
|
- run: nix build -L --no-link --print-out-paths .#bsc.ci.all
|
||||||
|
build:cross:
|
||||||
|
runs-on: native
|
||||||
|
steps:
|
||||||
|
- uses: https://gitea.com/ScMi1/checkout@v1.4
|
||||||
|
- run: nix build -L --no-link --print-out-paths .#bsc.ci.cross
|
||||||
|
@ -42,9 +42,7 @@ in
|
|||||||
# full nixpkgs with our overlay applied
|
# full nixpkgs with our overlay applied
|
||||||
legacyPackages.${system} = pkgs;
|
legacyPackages.${system} = pkgs;
|
||||||
|
|
||||||
hydraJobs = {
|
hydraJobs = self.legacyPackages.${system}.bsc.hydraJobs;
|
||||||
inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
|
|
||||||
};
|
|
||||||
|
|
||||||
# propagate nixpkgs lib, so we can do bscpkgs.lib
|
# propagate nixpkgs lib, so we can do bscpkgs.lib
|
||||||
inherit (nixpkgs) lib;
|
inherit (nixpkgs) lib;
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
./base/hw.nix
|
./base/hw.nix
|
||||||
./base/net.nix
|
./base/net.nix
|
||||||
./base/nix.nix
|
./base/nix.nix
|
||||||
|
./base/sys-devices.nix
|
||||||
./base/ntp.nix
|
./base/ntp.nix
|
||||||
./base/rev.nix
|
./base/rev.nix
|
||||||
./base/ssh.nix
|
./base/ssh.nix
|
||||||
|
9
m/common/base/sys-devices.nix
Normal file
9
m/common/base/sys-devices.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
nix.settings.system-features = [ "sys-devices" ];
|
||||||
|
|
||||||
|
programs.nix-required-mounts.enable = true;
|
||||||
|
programs.nix-required-mounts.allowedPatterns.sys-devices.paths = [
|
||||||
|
"/sys/devices/system/cpu"
|
||||||
|
"/sys/devices/system/node"
|
||||||
|
];
|
||||||
|
}
|
53
overlay.nix
53
overlay.nix
@ -62,7 +62,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
tests = rec {
|
tests = rec {
|
||||||
#hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
|
hwloc = callPackage ./test/bugs/hwloc.nix { };
|
||||||
#sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
|
#sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
|
||||||
hello-c = callPackage ./test/compilers/hello-c.nix { };
|
hello-c = callPackage ./test/compilers/hello-c.nix { };
|
||||||
hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
|
hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
|
||||||
@ -94,12 +94,18 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgs = filterAttrs (_: isDerivation) bscPkgs;
|
# For now, only build toplevel packages in CI/Hydra
|
||||||
|
pkgsTopLevel = filterAttrs (_: isDerivation) bscPkgs;
|
||||||
|
|
||||||
crossTargets = [ "riscv64" ];
|
# Native build in that platform doesn't imply cross build works
|
||||||
cross = prev.lib.genAttrs crossTargets (target:
|
canCrossCompile = platform: pkg:
|
||||||
final.pkgsCross.${target}.bsc-ci.pkgs
|
(isDerivation pkg) &&
|
||||||
);
|
# Must be defined explicitly
|
||||||
|
(pkg.meta.cross or false) &&
|
||||||
|
(meta.availableOn platform pkg);
|
||||||
|
|
||||||
|
# For now only RISC-V
|
||||||
|
crossSet = { riscv64 = final.pkgsCross.riscv64.bsc.pkgsTopLevel; };
|
||||||
|
|
||||||
buildList = name: paths:
|
buildList = name: paths:
|
||||||
final.runCommandLocal name { } ''
|
final.runCommandLocal name { } ''
|
||||||
@ -113,22 +119,31 @@ let
|
|||||||
printf '%s\n' $deps >$out
|
printf '%s\n' $deps >$out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
|
pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgsTopLevel);
|
||||||
|
testsList = buildList "ci-tests" (collect isDerivation tests);
|
||||||
pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
|
allList = buildList' "ci-all" [ pkgsList testsList ];
|
||||||
testList = buildList "ci-tests" (collect isDerivation tests);
|
# For now only RISC-V
|
||||||
|
crossList = buildList "ci-cross"
|
||||||
all = buildList' "ci-all" [ pkgsList testList ];
|
(filter
|
||||||
|
(canCrossCompile final.pkgsCross.riscv64.stdenv.hostPlatform)
|
||||||
|
(builtins.attrValues crossSet.riscv64));
|
||||||
|
|
||||||
in bscPkgs // {
|
in bscPkgs // {
|
||||||
# Prevent accidental usage of bsc attribute
|
# Prevent accidental usage of bsc-ci attribute
|
||||||
bsc = throw "the bsc attribute is deprecated, packages are now in the root";
|
bsc-ci = throw "the bsc-ci attribute is deprecated, use bsc.ci";
|
||||||
|
|
||||||
# Internal for our CI tests
|
# Internal for our CI tests
|
||||||
bsc-ci = {
|
bsc = {
|
||||||
inherit pkgs pkgsList;
|
# CI targets for nix build
|
||||||
inherit tests testList;
|
ci = { pkgs = pkgsList; tests = testsList; all = allList; cross = crossList; };
|
||||||
inherit cross crossList;
|
|
||||||
inherit all;
|
# Direct access to package sets
|
||||||
|
tests = tests;
|
||||||
|
pkgs = bscPkgs;
|
||||||
|
pkgsTopLevel = pkgsTopLevel;
|
||||||
|
cross = crossSet;
|
||||||
|
|
||||||
|
# Hydra uses attribute sets of pkgs
|
||||||
|
hydraJobs = { tests = tests; pkgs = pkgsTopLevel; cross = crossSet; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#, python3Packages
|
#, python3Packages
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, symlinkJoin
|
, symlinkJoin
|
||||||
|
, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
|
|||||||
--enable-sampling
|
--enable-sampling
|
||||||
--with-unwind=${libunwind.dev}
|
--with-unwind=${libunwind.dev}
|
||||||
--with-xml-prefix=${libxml2.dev}
|
--with-xml-prefix=${libxml2.dev}
|
||||||
--with-papi=${papi}
|
${lib.optionalString enablePapi "--with-papi=${papi}"}
|
||||||
${if (mpi != null) then ''--with-mpi=${mpi}''
|
${if (mpi != null) then ''--with-mpi=${mpi}''
|
||||||
else ''--without-mpi''}
|
else ''--without-mpi''}
|
||||||
--without-dyninst)
|
--without-dyninst)
|
||||||
|
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
|
|||||||
CFLAGS=-Wno-implicit-int
|
CFLAGS=-Wno-implicit-int
|
||||||
CPPFLAGS=-I${libtirpc.dev}/include/tirpc
|
CPPFLAGS=-I${libtirpc.dev}/include/tirpc
|
||||||
LDFLAGS=-ltirpc
|
LDFLAGS=-ltirpc
|
||||||
|
CC=$CC
|
||||||
|
AR=$AR
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
, jemallocNanos6 ? null
|
, jemallocNanos6 ? null
|
||||||
, cachelineBytes ? 64
|
, cachelineBytes ? 64
|
||||||
, enableGlibcxxDebug ? false
|
, enableGlibcxxDebug ? false
|
||||||
|
, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
|
||||||
, useGit ? false
|
, useGit ? false
|
||||||
, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
|
, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
|
||||||
, gitBranch ? "master"
|
, gitBranch ? "master"
|
||||||
@ -47,6 +48,8 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
source = if (useGit) then git else release;
|
source = if (useGit) then git else release;
|
||||||
|
|
||||||
|
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (source // {
|
stdenv.mkDerivation (source // {
|
||||||
pname = "nanos6";
|
pname = "nanos6";
|
||||||
@ -71,9 +74,13 @@ in
|
|||||||
"--disable-all-instrumentations"
|
"--disable-all-instrumentations"
|
||||||
"--enable-ovni-instrumentation"
|
"--enable-ovni-instrumentation"
|
||||||
"--with-ovni=${ovni}"
|
"--with-ovni=${ovni}"
|
||||||
|
"--with-boost=${boost.dev}"
|
||||||
] ++
|
] ++
|
||||||
(optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
|
(optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
|
||||||
(optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
|
(optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++
|
||||||
|
# Most nanos6 api symbols are resolved at runtime, so prefer
|
||||||
|
# ifunc by default
|
||||||
|
(optional isCross "--with-symbol-resolution=ifunc");
|
||||||
|
|
||||||
postConfigure = lib.optionalString (!enableDebug) ''
|
postConfigure = lib.optionalString (!enableDebug) ''
|
||||||
# Disable debug
|
# Disable debug
|
||||||
@ -97,16 +104,14 @@ in
|
|||||||
# TODO: papi_version is needed for configure:
|
# TODO: papi_version is needed for configure:
|
||||||
# ./configure: line 27378: papi_version: command not found
|
# ./configure: line 27378: papi_version: command not found
|
||||||
# This probably breaks cross-compilation
|
# This probably breaks cross-compilation
|
||||||
papi
|
] ++ lib.optionals enablePapi [ papi ];
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
numactl
|
numactl
|
||||||
hwloc
|
hwloc
|
||||||
papi
|
|
||||||
ovni
|
ovni
|
||||||
];
|
] ++ lib.optionals enablePapi [ papi ];
|
||||||
|
|
||||||
# Create a script that sets NANOS6_HOME
|
# Create a script that sets NANOS6_HOME
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
, numactl
|
, numactl
|
||||||
, hwloc
|
, hwloc
|
||||||
, papi
|
, papi
|
||||||
, enablePapi ? true
|
, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
|
||||||
, cacheline ? 64 # bits
|
, cacheline ? 64 # bits
|
||||||
, ovni ? null
|
, ovni ? null
|
||||||
, useGit ? false
|
, useGit ? false
|
||||||
|
@ -55,4 +55,7 @@ in
|
|||||||
doCheck = true;
|
doCheck = true;
|
||||||
checkTarget = "test";
|
checkTarget = "test";
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
|
meta = {
|
||||||
|
cross = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "hwloc-test";
|
name = "hwloc-test";
|
||||||
|
requiredSystemFeatures = [ "sys-devices" ];
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
@ -14,7 +15,7 @@ stdenv.mkDerivation {
|
|||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
ls -l /sys
|
ls -l /sys
|
||||||
gcc -lhwloc hwloc.c -o hwloc
|
gcc -lhwloc hwloc.c -o hwloc
|
||||||
strace ./hwloc
|
strace ./hwloc > $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -23,9 +23,8 @@ in stdenv.mkDerivation {
|
|||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
||||||
# nOS-V requires access to /sys/devices to request NUMA information. It will
|
# nOS-V requires access to /sys/devices to request NUMA information
|
||||||
# fail to run otherwise, so we disable the sandbox for this test.
|
requiredSystemFeatures = [ "sys-devices" ];
|
||||||
__noChroot = true;
|
|
||||||
|
|
||||||
buildInputs = [ openmp ];
|
buildInputs = [ openmp ];
|
||||||
|
|
||||||
|
@ -36,9 +36,8 @@ in stdenv.mkDerivation {
|
|||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
||||||
# nOS-V requires access to /sys/devices to request NUMA information. It will
|
# nOS-V requires access to /sys/devices to request NUMA information
|
||||||
# fail to run otherwise, so we disable the sandbox for this test.
|
requiredSystemFeatures = [ "sys-devices" ];
|
||||||
__noChroot = true;
|
|
||||||
|
|
||||||
buildInputs = [ nosv ];
|
buildInputs = [ nosv ];
|
||||||
|
|
||||||
|
@ -24,9 +24,8 @@ in stdenv.mkDerivation {
|
|||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
||||||
# nOS-V requires access to /sys/devices to request NUMA information. It will
|
# nOS-V requires access to /sys/devices to request NUMA information
|
||||||
# fail to run otherwise, so we disable the sandbox for this test.
|
requiredSystemFeatures = [ "sys-devices" ];
|
||||||
__noChroot = true;
|
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
set -x
|
set -x
|
||||||
|
@ -25,9 +25,10 @@ stdenv.mkDerivation rec {
|
|||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
#NIX_DEBUG = 1;
|
#NIX_DEBUG = 1;
|
||||||
buildInputs = [ ]; #strace gdb;
|
buildInputs = [ ]; #strace gdb;
|
||||||
# NODES requires access to /sys/devices to request NUMA information. It will
|
|
||||||
# fail to run otherwise, so we disable the sandbox for this test.
|
# NODES requires access to /sys/devices to request NUMA information
|
||||||
__noChroot = true;
|
requiredSystemFeatures = [ "sys-devices" ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
set -x
|
set -x
|
||||||
#$CC -v
|
#$CC -v
|
||||||
|
Loading…
x
Reference in New Issue
Block a user