From a41e973062ddc4b0d1d43f1e11dfa25f0068d2a2 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 16 May 2023 20:58:40 +0800 Subject: [PATCH] stdenv: add alderlake support Signed-off-by: Haonan Chen --- lib/systems/architectures.nix | 3 +++ pkgs/build-support/cc-wrapper/default.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 57b9184ca60c..782c9e25bee1 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -18,6 +18,7 @@ rec { cascadelake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; cooperlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; tigerlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; + alderlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; # x86_64 AMD btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ]; btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; @@ -55,6 +56,8 @@ rec { cascadelake = [ "skylake-avx512" ] ++ inferiors.cannonlake; cooperlake = [ "cascadelake" ] ++ inferiors.cascadelake; tigerlake = [ "icelake-server" ] ++ inferiors.icelake-server; + # CX16 does not exist on alderlake, while it does on nearly all other intel CPUs + alderlake = [ ]; # x86_64 AMD # TODO: fill this (need testing) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e4dcb8134669..e9c8c31d6c6d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -116,6 +116,7 @@ let cooperlake = versionAtLeast ccVersion "10.0"; tigerlake = versionAtLeast ccVersion "10.0"; knm = versionAtLeast ccVersion "8.0"; + alderlake = versionAtLeast ccVersion "12.0"; # AMD znver1 = versionAtLeast ccVersion "6.0"; znver2 = versionAtLeast ccVersion "9.0"; @@ -127,6 +128,7 @@ let icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; knm = versionAtLeast ccVersion "7.0"; + alderlake = versionAtLeast ccVersion "16.0"; # AMD znver1 = versionAtLeast ccVersion "4.0"; znver2 = versionAtLeast ccVersion "9.0";