Merge pull request #61019 from volth/gcc.arch-amd (1965a241) · Commits · mdf / nixpkgs

lib/systems/architectures.nix

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		{ lib }:

		rec {
		# platform.gcc.arch to its features (as in /proc/cpuinfo)
		features = {
		default = [ ];
		# x86_64 Intel
		westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ];
		sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
		ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
		haswell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
		broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
		skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ];
		skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ];
		# x86_64 AMD
		btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ];
		btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
		bdver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
		bdver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
		bdver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ];
		bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ];
		znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
		znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
		# other
		armv5te = [ ];
		armv6 = [ ];
		armv7-a = [ ];
		armv8-a = [ ];
		mips32 = [ ];
		loongson2f = [ ];
		};

		# a superior CPU has all the features of an inferior and is able to build and test code for it
		inferiors = {
		# x86_64 Intel
		default = [ ];
		westmere = [ ];
		sandybridge = [ "westmere" ] ++ inferiors.westmere;
		ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge;
		haswell = [ "ivybridge" ] ++ inferiors.ivybridge;
		broadwell = [ "haswell" ] ++ inferiors.haswell;
		skylake = [ "broadwell" ] ++ inferiors.broadwell;
		skylake-avx512 = [ "skylake" ] ++ inferiors.skylake;
		# x86_64 AMD
		btver1 = [ ];
		btver2 = [ ]; # TODO: fill this (need testing)
		bdver1 = [ ]; # TODO: fill this (need testing)
		bdver2 = [ ]; # TODO: fill this (need testing)
		bdver3 = [ ]; # TODO: fill this (need testing)
		bdver4 = [ ]; # TODO: fill this (need testing)
		znver1 = [ ]; # TODO: fill this (need testing)
		znver2 = [ ]; # TODO: fill this (need testing)
		# other
		armv5te = [ ];
		armv6 = [ ];
		armv7-a = [ ];
		armv8-a = [ ];
		mips32 = [ ];
		loongson2f = [ ];
		};

		predicates = let
		featureSupport = feature: x: builtins.elem feature features.${x};
		in {
		sse3Support = featureSupport "sse3";
		ssse3Support = featureSupport "ssse3";
		sse4_1Support = featureSupport "sse4_1";
		sse4_2Support = featureSupport "sse4_2";
		sse4_aSupport = featureSupport "sse4a";
		avxSupport = featureSupport "avx";
		avx2Support = featureSupport "avx2";
		avx512Support = featureSupport "avx512";
		aesSupport = featureSupport "aes";
		fmaSupport = featureSupport "fma";
		fma4Support = featureSupport "fma4";
		};
		}

lib/systems/default.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ rec {
		inspect = import ./inspect.nix { inherit lib; };
		platforms = import ./platforms.nix { inherit lib; };
		examples = import ./examples.nix { inherit lib; };
		architectures = import ./architectures.nix { inherit lib; };

		# Elaborate a `localSystem` or `crossSystem` so that it contains everything
		# necessary.
		@@ -126,6 +127,7 @@ rec {
		else throw "Don't know how to run ${final.config} executables.";

		} // mapAttrs (n: v: v final.parsed) inspect.predicates
		// mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates
		// args;
		in assert final.useAndroidPrebuilt -> final.isAndroid;
		assert lib.foldl

nixos/modules/services/misc/nix-daemon.nix

+4 −10

Original line number	Diff line number	Diff line
		@@ -587,16 +587,10 @@ in

		nix.systemFeatures = mkDefault (
		[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
		optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) (
		# a x86_64 builder can run code for `platform.gcc.arch` and minor architectures:
		[ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ {
		sandybridge = [ "gccarch-westmere" ];
		ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ];
		haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
		broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
		skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
		skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
		}.${pkgs.hostPlatform.platform.gcc.arch} or []
		optionals (pkgs.hostPlatform.platform ? gcc.arch) (
		# a builder can run code for `platform.gcc.arch` and inferior architectures
		[ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
		map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
		)
		);

pkgs/applications/science/math/nauty/default.nix

+4 −6

Original line number	Diff line number	Diff line
		@@ -10,15 +10,13 @@ stdenv.mkDerivation rec {
		sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww";
		};
		outputs = [ "out" "dev" ];
		configureFlags = {
		configureFlags = [
		# Prevent nauty from sniffing some cpu features. While those are very
		# widely available, it can lead to nasty bugs when they are not available:
		# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
		default = [ "--disable-clz" "--disable-popcnt" ];
		westmere = [ "--disable-clz" ];
		sandybridge = [ "--disable-clz" ];
		ivybridge = [ "--disable-clz" ];
		}.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
		"--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt"
		"--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz"
		];
		installPhase = ''
		mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}

pkgs/build-support/cc-wrapper/default.nix

+10 −2

Original line number	Diff line number	Diff line
		@@ -64,18 +64,26 @@ let
		# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
		isGccArchSupported = arch:
		if isGNU then
		{ skylake = versionAtLeast ccVersion "6.0";
		{ # Intel
		skylake = versionAtLeast ccVersion "6.0";
		skylake-avx512 = versionAtLeast ccVersion "6.0";
		cannonlake = versionAtLeast ccVersion "8.0";
		icelake-client = versionAtLeast ccVersion "8.0";
		icelake-server = versionAtLeast ccVersion "8.0";
		knm = versionAtLeast ccVersion "8.0";
		# AMD
		znver1 = versionAtLeast ccVersion "6.0";
		znver2 = versionAtLeast ccVersion "9.0";
		}.${arch} or true
		else if isClang then
		{ cannonlake = versionAtLeast ccVersion "5.0";
		{ # Intel
		cannonlake = versionAtLeast ccVersion "5.0";
		icelake-client = versionAtLeast ccVersion "7.0";
		icelake-server = versionAtLeast ccVersion "7.0";
		knm = versionAtLeast ccVersion "7.0";
		# AMD
		znver1 = versionAtLeast ccVersion "4.0";
		znver2 = versionAtLeast ccVersion "9.0";
		}.${arch} or true
		else
		false;

Admin message