some weird uncommitted stuff i guess? No idea what is actually relevant right now
This commit is contained in:
parent
049db3a4b8
commit
dbe691ee42
12 changed files with 956 additions and 16 deletions
|
|
@ -2,26 +2,38 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, fetchpatch, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nix.settings.system-features = [
|
||||||
|
"gccarch-icelake-client"
|
||||||
|
"kvm"
|
||||||
|
"big-parallel"
|
||||||
|
"benchmark"
|
||||||
|
"nixos-test"
|
||||||
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot = {
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
loader.systemd-boot.enable = true;
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
loader.efi.canTouchEfiVariables = true;
|
||||||
|
kernelPackages = pkgs.linuxPackagesFor ( pkgs.linux_6_6 );
|
||||||
|
};
|
||||||
|
|
||||||
# Enable flatpaks
|
# Enable flatpaks
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
programs.thefuck.enable = true;
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
NIXPKGS_ALLOW_UNFREE="1";
|
NIXPKGS_ALLOW_UNFREE="1";
|
||||||
OMP_NUM_THREADS = "12";
|
OMP_NUM_THREADS = "12";
|
||||||
MOZ_ENABLE_WAYLAND="1";
|
MOZ_ENABLE_WAYLAND="1";
|
||||||
|
OCI_CLI_RC_FILE="/home/grimmauld/.oci/config";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
|
|
|
||||||
12
flake.lock
12
flake.lock
|
|
@ -18,11 +18,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701068326,
|
"lastModified": 1703255338,
|
||||||
"narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
|
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
|
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -46,11 +46,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701050261,
|
"lastModified": 1703225289,
|
||||||
"narHash": "sha256-SlfJ34TR+QdFPnTpyo/UON9RDxS3MfLU9tOabWHkknQ=",
|
"narHash": "sha256-1jRIcmRcdkdFM7LIur7eCFP9/E7fPmikZSvm9Sbfz/c=",
|
||||||
"owner": "WillPower3309",
|
"owner": "WillPower3309",
|
||||||
"repo": "swayfx",
|
"repo": "swayfx",
|
||||||
"rev": "7c75b21933215348f28a2c788b174901ef13e267",
|
"rev": "ca42d414536c167f951e23bfc50d5edabb6f9dc2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,9 @@
|
||||||
grimmauld-nixos = nixpkgs.lib.nixosSystem {
|
grimmauld-nixos = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
|
# ./kernel.nix
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
./modules/accessibility.nix
|
||||||
./modules/sway.nix
|
./modules/sway.nix
|
||||||
./modules/localisation.nix
|
./modules/localisation.nix
|
||||||
./modules/users.nix
|
./modules/users.nix
|
||||||
|
|
@ -42,6 +44,7 @@
|
||||||
./modules/system-packages.nix
|
./modules/system-packages.nix
|
||||||
./modules/mypackaegsstayinstoreffs.nix
|
./modules/mypackaegsstayinstoreffs.nix
|
||||||
./modules/opengl.nix
|
./modules/opengl.nix
|
||||||
|
./modules/kvm.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
44
kernel.nix
Normal file
44
kernel.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
{ config, pkgs, fetchpatch, ... }:
|
||||||
|
{
|
||||||
|
boot.kernelPackages = let
|
||||||
|
# nixpkgs.localSystem = {
|
||||||
|
# gcc.arch = "icelake-client";
|
||||||
|
# gcc.tune = "icelake-client";
|
||||||
|
# system = "x86_64-linux";
|
||||||
|
# };
|
||||||
|
linux_custom_pkg = { fetchurl, buildLinux, ... } @ args:
|
||||||
|
buildLinux (args // rec {
|
||||||
|
version = "6.6.4-clearlinux";
|
||||||
|
modDirVersion = "6.6.4";
|
||||||
|
allowImportFromDerivation = true;
|
||||||
|
|
||||||
|
# src = fetchurl {
|
||||||
|
# url = "mirror://kernel/linux/kernel/v6.x/linux-6.6.4.tar.xz";
|
||||||
|
# sha256 = "SeSWYMk9jW1Y8Rg2DTyoExaV7DRmkmPKjwQch22pPkU=";
|
||||||
|
# };
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner="clearlinux-pkgs";
|
||||||
|
repo="linux";
|
||||||
|
rev="6.6.4-1389";
|
||||||
|
hash="sha256-hCdhE9nqby86k4u8g8zBiMy5R7v/YeVlKMSs871d6Ak=";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraMakeFlags = [
|
||||||
|
"-j 10"
|
||||||
|
"-l"
|
||||||
|
# "CXXFLAGS='-O3' CFLAGS='-O3' KCFLAGS='-O3' KCPPFLAGS='-O3'"
|
||||||
|
];
|
||||||
|
|
||||||
|
kernelPatches = [
|
||||||
|
# pkgs.kernelPatches.bridge_stp_helper
|
||||||
|
# pkgs.kernelPatches.modinst_arg_list_too_long
|
||||||
|
];
|
||||||
|
|
||||||
|
extraConfig = ''
|
||||||
|
'';
|
||||||
|
|
||||||
|
} // (args.argsOverride or {}));
|
||||||
|
linux_custom = pkgs.callPackage linux_custom_pkg{};
|
||||||
|
in
|
||||||
|
pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_custom);
|
||||||
|
}
|
||||||
11
modules/accessibility.nix
Normal file
11
modules/accessibility.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.sessionVariables = {
|
||||||
|
QT_ACCESSIBILITY="1";
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
orca # screenreader
|
||||||
|
kmag # magnifier
|
||||||
|
|
||||||
|
];
|
||||||
|
}
|
||||||
13
modules/kvm.nix
Normal file
13
modules/kvm.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
virtualisation.libvirtd.enable = true;
|
||||||
|
programs.virt-manager.enable = true;
|
||||||
|
|
||||||
|
# home manager
|
||||||
|
# dconf.settings = {
|
||||||
|
# "org/virt-manager/virt-manager/connections" = {
|
||||||
|
# autoconnect = ["qemu:///system"];
|
||||||
|
# uris = ["qemu:///system"];
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
}
|
||||||
|
|
@ -13,6 +13,6 @@
|
||||||
nssmdns = true;
|
nssmdns = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
services.printing.cups-pdf.enable = true;
|
||||||
hardware.sane.brscan4.enable = true; # enables support for SANE scanners
|
hardware.sane.brscan4.enable = true; # enables support for SANE scanners
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,25 @@
|
||||||
{pkgs, ...}:
|
{pkgs, ...}:
|
||||||
|
let
|
||||||
|
my-python-packages = ps: with ps; [
|
||||||
|
requests
|
||||||
|
matplotlib
|
||||||
|
numpy
|
||||||
|
scipy
|
||||||
|
];
|
||||||
|
in
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
virtualisation.libvirtd.qemu.ovmf.packages = [
|
||||||
|
# pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd # AAVMF
|
||||||
|
pkgs.OVMF.fd
|
||||||
|
];
|
||||||
|
virtualisation.spiceUSBRedirection.enable = true;
|
||||||
|
# security.wrappers.spice-client-glib-usb-acl-helper.source = "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper";
|
||||||
|
programs.droidcam.enable = true;
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.pkgsCross.aarch64-multiplatform.ubootQemuAarch64
|
||||||
|
# pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd # AAVMF
|
||||||
|
] ++ (with pkgs; [
|
||||||
|
spice-gtk
|
||||||
wget
|
wget
|
||||||
xonsh
|
xonsh
|
||||||
tree
|
tree
|
||||||
|
|
@ -14,9 +33,20 @@
|
||||||
polkit-kde-agent
|
polkit-kde-agent
|
||||||
skanpage
|
skanpage
|
||||||
cached-nix-shell
|
cached-nix-shell
|
||||||
|
visualvm
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
|
lm_sensors
|
||||||
|
oci-cli
|
||||||
|
|
||||||
imagemagick
|
imagemagick
|
||||||
|
pypy3
|
||||||
|
(python3.withPackages(ps: with ps; [
|
||||||
|
requests
|
||||||
|
matplotlib
|
||||||
|
numpy
|
||||||
|
scipy
|
||||||
|
# kio-admin
|
||||||
|
]))
|
||||||
|
|
||||||
(writeShellScriptBin "primerun" ''
|
(writeShellScriptBin "primerun" ''
|
||||||
export __NV_PRIME_RENDER_OFFLOAD=1
|
export __NV_PRIME_RENDER_OFFLOAD=1
|
||||||
|
|
@ -25,5 +55,5 @@ export __GLX_VENDOR_LIBRARY_NAME=nvidia
|
||||||
export __VK_LAYER_NV_optimus=NVIDIA_only
|
export __VK_LAYER_NV_optimus=NVIDIA_only
|
||||||
exec "$@"
|
exec "$@"
|
||||||
'')
|
'')
|
||||||
];
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
{pkgs, ...}:
|
||||||
{
|
{
|
||||||
services.power-profiles-daemon.enable = false;
|
services.power-profiles-daemon.enable = false;
|
||||||
services.tlp = {
|
services.tlp = {
|
||||||
|
|
@ -19,5 +20,14 @@
|
||||||
RUNTIME_PM_ON_BAT="auto";
|
RUNTIME_PM_ON_BAT="auto";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
programs.gamemode = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
general.inhibit_screensaver=0;
|
||||||
|
custom = {
|
||||||
|
start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'";
|
||||||
|
end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
users.users.grimmauld = {
|
users.users.grimmauld = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "grimmauld";
|
description = "grimmauld";
|
||||||
extraGroups = [ "networkmanager" "wheel" "input" "video" "lp" "scanner" ];
|
extraGroups = [ "networkmanager" "wheel" "input" "video" "lp" "scanner" "libvirtd" ];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
webcord
|
webcord
|
||||||
heroic
|
heroic
|
||||||
|
|
@ -11,10 +11,20 @@
|
||||||
pdfarranger
|
pdfarranger
|
||||||
kwrited
|
kwrited
|
||||||
gparted
|
gparted
|
||||||
|
element-desktop
|
||||||
nmap
|
nmap
|
||||||
ghidra
|
ghidra
|
||||||
firefox-esr
|
firefox-esr
|
||||||
|
kcalc
|
||||||
|
rmview
|
||||||
|
krita
|
||||||
spicetify-cli
|
spicetify-cli
|
||||||
|
(writeShellScriptBin "connectWG" ''
|
||||||
|
wg-quick up wg0
|
||||||
|
'')
|
||||||
|
(writeShellScriptBin "disconnectWG" ''
|
||||||
|
wg-quick down wg0
|
||||||
|
'')
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
17
patches/fix-kconfig.patch
Normal file
17
patches/fix-kconfig.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||||
|
index 44c6a82..e5a98b3 100644
|
||||||
|
--- a/arch/x86/Kconfig
|
||||||
|
+++ b/arch/x86/Kconfig
|
||||||
|
@@ -1002,6 +1002,12 @@ config NR_CPUS
|
||||||
|
|
||||||
|
config SCHED_SMT
|
||||||
|
def_bool y if SMP
|
||||||
|
+ depends on SMP
|
||||||
|
+ ---help---
|
||||||
|
+ SMT scheduler support improves the CPU scheduler's decision making
|
||||||
|
+ when dealing with Intel Pentium 4 chips with HyperThreading at a
|
||||||
|
+ cost of slightly increased overhead in some places. If unsure say
|
||||||
|
+ N here.
|
||||||
|
|
||||||
|
config SCHED_MC
|
||||||
|
def_bool y
|
||||||
790
patches/more-uarches-for-kernel-5.17+.patch
Normal file
790
patches/more-uarches-for-kernel-5.17+.patch
Normal file
|
|
@ -0,0 +1,790 @@
|
||||||
|
From 70d4906b87983ed2ed5da78930a701625d881dd0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: graysky <therealgraysky@proton.me>
|
||||||
|
Date: Thu, 5 Jan 2023 14:29:37 -0500
|
||||||
|
|
||||||
|
FEATURES
|
||||||
|
This patch adds additional CPU options to the Linux kernel accessible under:
|
||||||
|
Processor type and features --->
|
||||||
|
Processor family --->
|
||||||
|
|
||||||
|
With the release of gcc 11.1 and clang 12.0, several generic 64-bit levels are
|
||||||
|
offered which are good for supported Intel or AMD CPUs:
|
||||||
|
• x86-64-v2
|
||||||
|
• x86-64-v3
|
||||||
|
• x86-64-v4
|
||||||
|
|
||||||
|
Users of glibc 2.33 and above can see which level is supported by current
|
||||||
|
hardware by running:
|
||||||
|
/lib/ld-linux-x86-64.so.2 --help | grep supported
|
||||||
|
|
||||||
|
Alternatively, compare the flags from /proc/cpuinfo to this list.[1]
|
||||||
|
|
||||||
|
CPU-specific microarchitectures include:
|
||||||
|
• AMD Improved K8-family
|
||||||
|
• AMD K10-family
|
||||||
|
• AMD Family 10h (Barcelona)
|
||||||
|
• AMD Family 14h (Bobcat)
|
||||||
|
• AMD Family 16h (Jaguar)
|
||||||
|
• AMD Family 15h (Bulldozer)
|
||||||
|
• AMD Family 15h (Piledriver)
|
||||||
|
• AMD Family 15h (Steamroller)
|
||||||
|
• AMD Family 15h (Excavator)
|
||||||
|
• AMD Family 17h (Zen)
|
||||||
|
• AMD Family 17h (Zen 2)
|
||||||
|
• AMD Family 19h (Zen 3)†
|
||||||
|
• AMD Family 19h (Zen 4)§
|
||||||
|
• Intel Silvermont low-power processors
|
||||||
|
• Intel Goldmont low-power processors (Apollo Lake and Denverton)
|
||||||
|
• Intel Goldmont Plus low-power processors (Gemini Lake)
|
||||||
|
• Intel 1st Gen Core i3/i5/i7 (Nehalem)
|
||||||
|
• Intel 1.5 Gen Core i3/i5/i7 (Westmere)
|
||||||
|
• Intel 2nd Gen Core i3/i5/i7 (Sandybridge)
|
||||||
|
• Intel 3rd Gen Core i3/i5/i7 (Ivybridge)
|
||||||
|
• Intel 4th Gen Core i3/i5/i7 (Haswell)
|
||||||
|
• Intel 5th Gen Core i3/i5/i7 (Broadwell)
|
||||||
|
• Intel 6th Gen Core i3/i5/i7 (Skylake)
|
||||||
|
• Intel 6th Gen Core i7/i9 (Skylake X)
|
||||||
|
• Intel 8th Gen Core i3/i5/i7 (Cannon Lake)
|
||||||
|
• Intel 10th Gen Core i7/i9 (Ice Lake)
|
||||||
|
• Intel Xeon (Cascade Lake)
|
||||||
|
• Intel Xeon (Cooper Lake)*
|
||||||
|
• Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake)*
|
||||||
|
• Intel 4th Gen 10nm++ Xeon (Sapphire Rapids)‡
|
||||||
|
• Intel 11th Gen i3/i5/i7/i9-family (Rocket Lake)‡
|
||||||
|
• Intel 12th Gen i3/i5/i7/i9-family (Alder Lake)‡
|
||||||
|
• Intel 13th Gen i3/i5/i7/i9-family (Raptor Lake)§
|
||||||
|
• Intel 14th Gen i3/i5/i7/i9-family (Meteor Lake)§
|
||||||
|
• Intel 5th Gen 10nm++ Xeon (Emerald Rapids)§
|
||||||
|
|
||||||
|
Notes: If not otherwise noted, gcc >=9.1 is required for support.
|
||||||
|
*Requires gcc >=10.1 or clang >=10.0
|
||||||
|
†Required gcc >=10.3 or clang >=12.0
|
||||||
|
‡Required gcc >=11.1 or clang >=12.0
|
||||||
|
§Required gcc >=13.0 or clang >=15.0.5
|
||||||
|
|
||||||
|
It also offers to compile passing the 'native' option which, "selects the CPU
|
||||||
|
to generate code for at compilation time by determining the processor type of
|
||||||
|
the compiling machine. Using -march=native enables all instruction subsets
|
||||||
|
supported by the local machine and will produce code optimized for the local
|
||||||
|
machine under the constraints of the selected instruction set."[2]
|
||||||
|
|
||||||
|
Users of Intel CPUs should select the 'Intel-Native' option and users of AMD
|
||||||
|
CPUs should select the 'AMD-Native' option.
|
||||||
|
|
||||||
|
MINOR NOTES RELATING TO INTEL ATOM PROCESSORS
|
||||||
|
This patch also changes -march=atom to -march=bonnell in accordance with the
|
||||||
|
gcc v4.9 changes. Upstream is using the deprecated -match=atom flags when I
|
||||||
|
believe it should use the newer -march=bonnell flag for atom processors.[3]
|
||||||
|
|
||||||
|
It is not recommended to compile on Atom-CPUs with the 'native' option.[4] The
|
||||||
|
recommendation is to use the 'atom' option instead.
|
||||||
|
|
||||||
|
BENEFITS
|
||||||
|
Small but real speed increases are measurable using a make endpoint comparing
|
||||||
|
a generic kernel to one built with one of the respective microarchs.
|
||||||
|
|
||||||
|
See the following experimental evidence supporting this statement:
|
||||||
|
https://github.com/graysky2/kernel_gcc_patch
|
||||||
|
|
||||||
|
REQUIREMENTS
|
||||||
|
linux version 5.17+
|
||||||
|
gcc version >=9.0 or clang version >=9.0
|
||||||
|
|
||||||
|
ACKNOWLEDGMENTS
|
||||||
|
This patch builds on the seminal work by Jeroen.[5]
|
||||||
|
|
||||||
|
REFERENCES
|
||||||
|
1. https://gitlab.com/x86-psABIs/x86-64-ABI/-/commit/77566eb03bc6a326811cb7e9
|
||||||
|
2. https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html#index-x86-Options
|
||||||
|
3. https://bugzilla.kernel.org/show_bug.cgi?id=77461
|
||||||
|
4. https://github.com/graysky2/kernel_gcc_patch/issues/15
|
||||||
|
5. http://www.linuxforge.net/docs/linux/linux-gcc.php
|
||||||
|
---
|
||||||
|
arch/x86/Kconfig.cpu | 427 ++++++++++++++++++++++++++++++--
|
||||||
|
arch/x86/Makefile | 44 +++-
|
||||||
|
arch/x86/include/asm/vermagic.h | 74 ++++++
|
||||||
|
3 files changed, 528 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
|
||||||
|
index 542377cd419d..f589971df2d3 100644
|
||||||
|
--- a/arch/x86/Kconfig.cpu
|
||||||
|
+++ b/arch/x86/Kconfig.cpu
|
||||||
|
@@ -157,7 +157,7 @@ config MPENTIUM4
|
||||||
|
|
||||||
|
|
||||||
|
config MK6
|
||||||
|
- bool "K6/K6-II/K6-III"
|
||||||
|
+ bool "AMD K6/K6-II/K6-III"
|
||||||
|
depends on X86_32
|
||||||
|
help
|
||||||
|
Select this for an AMD K6-family processor. Enables use of
|
||||||
|
@@ -165,7 +165,7 @@ config MK6
|
||||||
|
flags to GCC.
|
||||||
|
|
||||||
|
config MK7
|
||||||
|
- bool "Athlon/Duron/K7"
|
||||||
|
+ bool "AMD Athlon/Duron/K7"
|
||||||
|
depends on X86_32
|
||||||
|
help
|
||||||
|
Select this for an AMD Athlon K7-family processor. Enables use of
|
||||||
|
@@ -173,12 +173,106 @@ config MK7
|
||||||
|
flags to GCC.
|
||||||
|
|
||||||
|
config MK8
|
||||||
|
- bool "Opteron/Athlon64/Hammer/K8"
|
||||||
|
+ bool "AMD Opteron/Athlon64/Hammer/K8"
|
||||||
|
help
|
||||||
|
Select this for an AMD Opteron or Athlon64 Hammer-family processor.
|
||||||
|
Enables use of some extended instructions, and passes appropriate
|
||||||
|
optimization flags to GCC.
|
||||||
|
|
||||||
|
+config MK8SSE3
|
||||||
|
+ bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
|
||||||
|
+ help
|
||||||
|
+ Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
|
||||||
|
+ Enables use of some extended instructions, and passes appropriate
|
||||||
|
+ optimization flags to GCC.
|
||||||
|
+
|
||||||
|
+config MK10
|
||||||
|
+ bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
|
||||||
|
+ help
|
||||||
|
+ Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
|
||||||
|
+ Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
|
||||||
|
+ Enables use of some extended instructions, and passes appropriate
|
||||||
|
+ optimization flags to GCC.
|
||||||
|
+
|
||||||
|
+config MBARCELONA
|
||||||
|
+ bool "AMD Barcelona"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 10h Barcelona processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=barcelona
|
||||||
|
+
|
||||||
|
+config MBOBCAT
|
||||||
|
+ bool "AMD Bobcat"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 14h Bobcat processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=btver1
|
||||||
|
+
|
||||||
|
+config MJAGUAR
|
||||||
|
+ bool "AMD Jaguar"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 16h Jaguar processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=btver2
|
||||||
|
+
|
||||||
|
+config MBULLDOZER
|
||||||
|
+ bool "AMD Bulldozer"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 15h Bulldozer processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=bdver1
|
||||||
|
+
|
||||||
|
+config MPILEDRIVER
|
||||||
|
+ bool "AMD Piledriver"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 15h Piledriver processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=bdver2
|
||||||
|
+
|
||||||
|
+config MSTEAMROLLER
|
||||||
|
+ bool "AMD Steamroller"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 15h Steamroller processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=bdver3
|
||||||
|
+
|
||||||
|
+config MEXCAVATOR
|
||||||
|
+ bool "AMD Excavator"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 15h Excavator processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=bdver4
|
||||||
|
+
|
||||||
|
+config MZEN
|
||||||
|
+ bool "AMD Zen"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 17h Zen processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=znver1
|
||||||
|
+
|
||||||
|
+config MZEN2
|
||||||
|
+ bool "AMD Zen 2"
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 17h Zen 2 processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=znver2
|
||||||
|
+
|
||||||
|
+config MZEN3
|
||||||
|
+ bool "AMD Zen 3"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION >= 100300) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 19h Zen 3 processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=znver3
|
||||||
|
+
|
||||||
|
+config MZEN4
|
||||||
|
+ bool "AMD Zen 4"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 160000)
|
||||||
|
+ help
|
||||||
|
+ Select this for AMD Family 19h Zen 4 processors.
|
||||||
|
+
|
||||||
|
+ Enables -march=znver4
|
||||||
|
+
|
||||||
|
config MCRUSOE
|
||||||
|
bool "Crusoe"
|
||||||
|
depends on X86_32
|
||||||
|
@@ -270,7 +364,7 @@ config MPSC
|
||||||
|
in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
|
||||||
|
|
||||||
|
config MCORE2
|
||||||
|
- bool "Core 2/newer Xeon"
|
||||||
|
+ bool "Intel Core 2"
|
||||||
|
help
|
||||||
|
|
||||||
|
Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
|
||||||
|
@@ -278,6 +372,8 @@ config MCORE2
|
||||||
|
family in /proc/cpuinfo. Newer ones have 6 and older ones 15
|
||||||
|
(not a typo)
|
||||||
|
|
||||||
|
+ Enables -march=core2
|
||||||
|
+
|
||||||
|
config MATOM
|
||||||
|
bool "Intel Atom"
|
||||||
|
help
|
||||||
|
@@ -287,6 +383,212 @@ config MATOM
|
||||||
|
accordingly optimized code. Use a recent GCC with specific Atom
|
||||||
|
support in order to fully benefit from selecting this option.
|
||||||
|
|
||||||
|
+config MNEHALEM
|
||||||
|
+ bool "Intel Nehalem"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 1st Gen Core processors in the Nehalem family.
|
||||||
|
+
|
||||||
|
+ Enables -march=nehalem
|
||||||
|
+
|
||||||
|
+config MWESTMERE
|
||||||
|
+ bool "Intel Westmere"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for the Intel Westmere formerly Nehalem-C family.
|
||||||
|
+
|
||||||
|
+ Enables -march=westmere
|
||||||
|
+
|
||||||
|
+config MSILVERMONT
|
||||||
|
+ bool "Intel Silvermont"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for the Intel Silvermont platform.
|
||||||
|
+
|
||||||
|
+ Enables -march=silvermont
|
||||||
|
+
|
||||||
|
+config MGOLDMONT
|
||||||
|
+ bool "Intel Goldmont"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for the Intel Goldmont platform including Apollo Lake and Denverton.
|
||||||
|
+
|
||||||
|
+ Enables -march=goldmont
|
||||||
|
+
|
||||||
|
+config MGOLDMONTPLUS
|
||||||
|
+ bool "Intel Goldmont Plus"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for the Intel Goldmont Plus platform including Gemini Lake.
|
||||||
|
+
|
||||||
|
+ Enables -march=goldmont-plus
|
||||||
|
+
|
||||||
|
+config MSANDYBRIDGE
|
||||||
|
+ bool "Intel Sandy Bridge"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 2nd Gen Core processors in the Sandy Bridge family.
|
||||||
|
+
|
||||||
|
+ Enables -march=sandybridge
|
||||||
|
+
|
||||||
|
+config MIVYBRIDGE
|
||||||
|
+ bool "Intel Ivy Bridge"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 3rd Gen Core processors in the Ivy Bridge family.
|
||||||
|
+
|
||||||
|
+ Enables -march=ivybridge
|
||||||
|
+
|
||||||
|
+config MHASWELL
|
||||||
|
+ bool "Intel Haswell"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 4th Gen Core processors in the Haswell family.
|
||||||
|
+
|
||||||
|
+ Enables -march=haswell
|
||||||
|
+
|
||||||
|
+config MBROADWELL
|
||||||
|
+ bool "Intel Broadwell"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 5th Gen Core processors in the Broadwell family.
|
||||||
|
+
|
||||||
|
+ Enables -march=broadwell
|
||||||
|
+
|
||||||
|
+config MSKYLAKE
|
||||||
|
+ bool "Intel Skylake"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 6th Gen Core processors in the Skylake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=skylake
|
||||||
|
+
|
||||||
|
+config MSKYLAKEX
|
||||||
|
+ bool "Intel Skylake X"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 6th Gen Core processors in the Skylake X family.
|
||||||
|
+
|
||||||
|
+ Enables -march=skylake-avx512
|
||||||
|
+
|
||||||
|
+config MCANNONLAKE
|
||||||
|
+ bool "Intel Cannon Lake"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 8th Gen Core processors
|
||||||
|
+
|
||||||
|
+ Enables -march=cannonlake
|
||||||
|
+
|
||||||
|
+config MICELAKE
|
||||||
|
+ bool "Intel Ice Lake"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for 10th Gen Core processors in the Ice Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=icelake-client
|
||||||
|
+
|
||||||
|
+config MCASCADELAKE
|
||||||
|
+ bool "Intel Cascade Lake"
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for Xeon processors in the Cascade Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=cascadelake
|
||||||
|
+
|
||||||
|
+config MCOOPERLAKE
|
||||||
|
+ bool "Intel Cooper Lake"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for Xeon processors in the Cooper Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=cooperlake
|
||||||
|
+
|
||||||
|
+config MTIGERLAKE
|
||||||
|
+ bool "Intel Tiger Lake"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for third-generation 10 nm process processors in the Tiger Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=tigerlake
|
||||||
|
+
|
||||||
|
+config MSAPPHIRERAPIDS
|
||||||
|
+ bool "Intel Sapphire Rapids"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for fourth-generation 10 nm process processors in the Sapphire Rapids family.
|
||||||
|
+
|
||||||
|
+ Enables -march=sapphirerapids
|
||||||
|
+
|
||||||
|
+config MROCKETLAKE
|
||||||
|
+ bool "Intel Rocket Lake"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for eleventh-generation processors in the Rocket Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=rocketlake
|
||||||
|
+
|
||||||
|
+config MALDERLAKE
|
||||||
|
+ bool "Intel Alder Lake"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for twelfth-generation processors in the Alder Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=alderlake
|
||||||
|
+
|
||||||
|
+config MRAPTORLAKE
|
||||||
|
+ bool "Intel Raptor Lake"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for thirteenth-generation processors in the Raptor Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=raptorlake
|
||||||
|
+
|
||||||
|
+config MMETEORLAKE
|
||||||
|
+ bool "Intel Meteor Lake"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for fourteenth-generation processors in the Meteor Lake family.
|
||||||
|
+
|
||||||
|
+ Enables -march=meteorlake
|
||||||
|
+
|
||||||
|
+config MEMERALDRAPIDS
|
||||||
|
+ bool "Intel Emerald Rapids"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
|
||||||
|
+ select X86_P6_NOP
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Select this for fifth-generation 10 nm process processors in the Emerald Rapids family.
|
||||||
|
+
|
||||||
|
+ Enables -march=emeraldrapids
|
||||||
|
+
|
||||||
|
config GENERIC_CPU
|
||||||
|
bool "Generic-x86-64"
|
||||||
|
depends on X86_64
|
||||||
|
@@ -294,6 +596,50 @@ config GENERIC_CPU
|
||||||
|
Generic x86-64 CPU.
|
||||||
|
Run equally well on all x86-64 CPUs.
|
||||||
|
|
||||||
|
+config GENERIC_CPU2
|
||||||
|
+ bool "Generic-x86-64-v2"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ depends on X86_64
|
||||||
|
+ help
|
||||||
|
+ Generic x86-64 CPU.
|
||||||
|
+ Run equally well on all x86-64 CPUs with min support of x86-64-v2.
|
||||||
|
+
|
||||||
|
+config GENERIC_CPU3
|
||||||
|
+ bool "Generic-x86-64-v3"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ depends on X86_64
|
||||||
|
+ help
|
||||||
|
+ Generic x86-64-v3 CPU with v3 instructions.
|
||||||
|
+ Run equally well on all x86-64 CPUs with min support of x86-64-v3.
|
||||||
|
+
|
||||||
|
+config GENERIC_CPU4
|
||||||
|
+ bool "Generic-x86-64-v4"
|
||||||
|
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||||
|
+ depends on X86_64
|
||||||
|
+ help
|
||||||
|
+ Generic x86-64 CPU with v4 instructions.
|
||||||
|
+ Run equally well on all x86-64 CPUs with min support of x86-64-v4.
|
||||||
|
+
|
||||||
|
+config MNATIVE_INTEL
|
||||||
|
+ bool "Intel-Native optimizations autodetected by the compiler"
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Clang 3.8, GCC 4.2 and above support -march=native, which automatically detects
|
||||||
|
+ the optimum settings to use based on your processor. Do NOT use this
|
||||||
|
+ for AMD CPUs. Intel Only!
|
||||||
|
+
|
||||||
|
+ Enables -march=native
|
||||||
|
+
|
||||||
|
+config MNATIVE_AMD
|
||||||
|
+ bool "AMD-Native optimizations autodetected by the compiler"
|
||||||
|
+ help
|
||||||
|
+
|
||||||
|
+ Clang 3.8, GCC 4.2 and above support -march=native, which automatically detects
|
||||||
|
+ the optimum settings to use based on your processor. Do NOT use this
|
||||||
|
+ for Intel CPUs. AMD Only!
|
||||||
|
+
|
||||||
|
+ Enables -march=native
|
||||||
|
+
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
config X86_GENERIC
|
||||||
|
@@ -318,9 +664,17 @@ config X86_INTERNODE_CACHE_SHIFT
|
||||||
|
config X86_L1_CACHE_SHIFT
|
||||||
|
int
|
||||||
|
default "7" if MPENTIUM4 || MPSC
|
||||||
|
- default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
|
||||||
|
+ default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || MK8SSE3 || MK10 \
|
||||||
|
+ || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER \
|
||||||
|
+ || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT \
|
||||||
|
+ || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL \
|
||||||
|
+ || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE \
|
||||||
|
+ || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE \
|
||||||
|
+ || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD || X86_GENERIC || GENERIC_CPU || GENERIC_CPU2 \
|
||||||
|
+ || GENERIC_CPU3 || GENERIC_CPU4
|
||||||
|
default "4" if MELAN || M486SX || M486 || MGEODEGX1
|
||||||
|
- default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
|
||||||
|
+ default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII \
|
||||||
|
+ || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
|
||||||
|
|
||||||
|
config X86_F00F_BUG
|
||||||
|
def_bool y
|
||||||
|
@@ -332,15 +686,27 @@ config X86_INVD_BUG
|
||||||
|
|
||||||
|
config X86_ALIGNMENT_16
|
||||||
|
def_bool y
|
||||||
|
- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486SX || M486 || MVIAC3_2 || MGEODEGX1
|
||||||
|
+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC \
|
||||||
|
+ || M586 || M486SX || M486 || MVIAC3_2 || MGEODEGX1
|
||||||
|
|
||||||
|
config X86_INTEL_USERCOPY
|
||||||
|
def_bool y
|
||||||
|
- depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
|
||||||
|
+ depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC \
|
||||||
|
+ || MK8 || MK7 || MEFFICEON || MCORE2 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT \
|
||||||
|
+ || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX \
|
||||||
|
+ || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS \
|
||||||
|
+ || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL
|
||||||
|
|
||||||
|
config X86_USE_PPRO_CHECKSUM
|
||||||
|
def_bool y
|
||||||
|
- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
|
||||||
|
+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM \
|
||||||
|
+ || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX \
|
||||||
|
+ || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER \
|
||||||
|
+ || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM \
|
||||||
|
+ || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE \
|
||||||
|
+ || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE \
|
||||||
|
+ || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE \
|
||||||
|
+ || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
|
||||||
|
|
||||||
|
#
|
||||||
|
# P6_NOPs are a relatively minor optimization that require a family >=
|
||||||
|
@@ -356,32 +722,63 @@ config X86_USE_PPRO_CHECKSUM
|
||||||
|
config X86_P6_NOP
|
||||||
|
def_bool y
|
||||||
|
depends on X86_64
|
||||||
|
- depends on (MCORE2 || MPENTIUM4 || MPSC)
|
||||||
|
+ depends on (MCORE2 || MPENTIUM4 || MPSC || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT \
|
||||||
|
+ || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE \
|
||||||
|
+ || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE \
|
||||||
|
+ || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS \
|
||||||
|
+ || MNATIVE_INTEL)
|
||||||
|
|
||||||
|
config X86_TSC
|
||||||
|
def_bool y
|
||||||
|
- depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
|
||||||
|
+ depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM \
|
||||||
|
+ || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 \
|
||||||
|
+ || MGEODE_LX || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER \
|
||||||
|
+ || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM \
|
||||||
|
+ || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL \
|
||||||
|
+ || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE \
|
||||||
|
+ || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS \
|
||||||
|
+ || MNATIVE_INTEL || MNATIVE_AMD) || X86_64
|
||||||
|
|
||||||
|
config X86_CMPXCHG64
|
||||||
|
def_bool y
|
||||||
|
- depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8
|
||||||
|
+ depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 \
|
||||||
|
+ || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8 || MK8SSE3 || MK10 \
|
||||||
|
+ || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN \
|
||||||
|
+ || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS \
|
||||||
|
+ || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE \
|
||||||
|
+ || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE \
|
||||||
|
+ || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
|
||||||
|
|
||||||
|
# this should be set for all -march=.. options where the compiler
|
||||||
|
# generates cmov.
|
||||||
|
config X86_CMOV
|
||||||
|
def_bool y
|
||||||
|
- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
|
||||||
|
+ depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 \
|
||||||
|
+ || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX || MK8SSE3 || MK10 \
|
||||||
|
+ || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR \
|
||||||
|
+ || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT \
|
||||||
|
+ || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX \
|
||||||
|
+ || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS \
|
||||||
|
+ || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD)
|
||||||
|
|
||||||
|
config X86_MINIMUM_CPU_FAMILY
|
||||||
|
int
|
||||||
|
default "64" if X86_64
|
||||||
|
- default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8)
|
||||||
|
+ default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 \
|
||||||
|
+ || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8 || MK8SSE3 \
|
||||||
|
+ || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER \
|
||||||
|
+ || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT \
|
||||||
|
+ || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL \
|
||||||
|
+ || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE \
|
||||||
|
+ || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MRAPTORLAKE \
|
||||||
|
+ || MNATIVE_INTEL || MNATIVE_AMD)
|
||||||
|
default "5" if X86_32 && X86_CMPXCHG64
|
||||||
|
default "4"
|
||||||
|
|
||||||
|
config X86_DEBUGCTLMSR
|
||||||
|
def_bool y
|
||||||
|
- depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486SX || M486) && !UML
|
||||||
|
+ depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 \
|
||||||
|
+ || M486SX || M486) && !UML
|
||||||
|
|
||||||
|
config IA32_FEAT_CTL
|
||||||
|
def_bool y
|
||||||
|
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
|
||||||
|
index 415a5d138de4..17b1e039d955 100644
|
||||||
|
--- a/arch/x86/Makefile
|
||||||
|
+++ b/arch/x86/Makefile
|
||||||
|
@@ -151,8 +151,48 @@ else
|
||||||
|
# FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
|
||||||
|
cflags-$(CONFIG_MK8) += -march=k8
|
||||||
|
cflags-$(CONFIG_MPSC) += -march=nocona
|
||||||
|
- cflags-$(CONFIG_MCORE2) += -march=core2
|
||||||
|
- cflags-$(CONFIG_MATOM) += -march=atom
|
||||||
|
+ cflags-$(CONFIG_MK8SSE3) += -march=k8-sse3
|
||||||
|
+ cflags-$(CONFIG_MK10) += -march=amdfam10
|
||||||
|
+ cflags-$(CONFIG_MBARCELONA) += -march=barcelona
|
||||||
|
+ cflags-$(CONFIG_MBOBCAT) += -march=btver1
|
||||||
|
+ cflags-$(CONFIG_MJAGUAR) += -march=btver2
|
||||||
|
+ cflags-$(CONFIG_MBULLDOZER) += -march=bdver1
|
||||||
|
+ cflags-$(CONFIG_MPILEDRIVER) += -march=bdver2 -mno-tbm
|
||||||
|
+ cflags-$(CONFIG_MSTEAMROLLER) += -march=bdver3 -mno-tbm
|
||||||
|
+ cflags-$(CONFIG_MEXCAVATOR) += -march=bdver4 -mno-tbm
|
||||||
|
+ cflags-$(CONFIG_MZEN) += -march=znver1
|
||||||
|
+ cflags-$(CONFIG_MZEN2) += -march=znver2
|
||||||
|
+ cflags-$(CONFIG_MZEN3) += -march=znver3
|
||||||
|
+ cflags-$(CONFIG_MZEN4) += -march=znver4
|
||||||
|
+ cflags-$(CONFIG_MNATIVE_INTEL) += -march=native
|
||||||
|
+ cflags-$(CONFIG_MNATIVE_AMD) += -march=native
|
||||||
|
+ cflags-$(CONFIG_MATOM) += -march=bonnell
|
||||||
|
+ cflags-$(CONFIG_MCORE2) += -march=core2
|
||||||
|
+ cflags-$(CONFIG_MNEHALEM) += -march=nehalem
|
||||||
|
+ cflags-$(CONFIG_MWESTMERE) += -march=westmere
|
||||||
|
+ cflags-$(CONFIG_MSILVERMONT) += -march=silvermont
|
||||||
|
+ cflags-$(CONFIG_MGOLDMONT) += -march=goldmont
|
||||||
|
+ cflags-$(CONFIG_MGOLDMONTPLUS) += -march=goldmont-plus
|
||||||
|
+ cflags-$(CONFIG_MSANDYBRIDGE) += -march=sandybridge
|
||||||
|
+ cflags-$(CONFIG_MIVYBRIDGE) += -march=ivybridge
|
||||||
|
+ cflags-$(CONFIG_MHASWELL) += -march=haswell
|
||||||
|
+ cflags-$(CONFIG_MBROADWELL) += -march=broadwell
|
||||||
|
+ cflags-$(CONFIG_MSKYLAKE) += -march=skylake
|
||||||
|
+ cflags-$(CONFIG_MSKYLAKEX) += -march=skylake-avx512
|
||||||
|
+ cflags-$(CONFIG_MCANNONLAKE) += -march=cannonlake
|
||||||
|
+ cflags-$(CONFIG_MICELAKE) += -march=icelake-client
|
||||||
|
+ cflags-$(CONFIG_MCASCADELAKE) += -march=cascadelake
|
||||||
|
+ cflags-$(CONFIG_MCOOPERLAKE) += -march=cooperlake
|
||||||
|
+ cflags-$(CONFIG_MTIGERLAKE) += -march=tigerlake
|
||||||
|
+ cflags-$(CONFIG_MSAPPHIRERAPIDS) += -march=sapphirerapids
|
||||||
|
+ cflags-$(CONFIG_MROCKETLAKE) += -march=rocketlake
|
||||||
|
+ cflags-$(CONFIG_MALDERLAKE) += -march=alderlake
|
||||||
|
+ cflags-$(CONFIG_MRAPTORLAKE) += -march=raptorlake
|
||||||
|
+ cflags-$(CONFIG_MMETEORLAKE) += -march=meteorlake
|
||||||
|
+ cflags-$(CONFIG_MEMERALDRAPIDS) += -march=emeraldrapids
|
||||||
|
+ cflags-$(CONFIG_GENERIC_CPU2) += -march=x86-64-v2
|
||||||
|
+ cflags-$(CONFIG_GENERIC_CPU3) += -march=x86-64-v3
|
||||||
|
+ cflags-$(CONFIG_GENERIC_CPU4) += -march=x86-64-v4
|
||||||
|
cflags-$(CONFIG_GENERIC_CPU) += -mtune=generic
|
||||||
|
KBUILD_CFLAGS += $(cflags-y)
|
||||||
|
|
||||||
|
diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagic.h
|
||||||
|
index 75884d2cdec3..02c1386eb653 100644
|
||||||
|
--- a/arch/x86/include/asm/vermagic.h
|
||||||
|
+++ b/arch/x86/include/asm/vermagic.h
|
||||||
|
@@ -17,6 +17,54 @@
|
||||||
|
#define MODULE_PROC_FAMILY "586MMX "
|
||||||
|
#elif defined CONFIG_MCORE2
|
||||||
|
#define MODULE_PROC_FAMILY "CORE2 "
|
||||||
|
+#elif defined CONFIG_MNATIVE_INTEL
|
||||||
|
+#define MODULE_PROC_FAMILY "NATIVE_INTEL "
|
||||||
|
+#elif defined CONFIG_MNATIVE_AMD
|
||||||
|
+#define MODULE_PROC_FAMILY "NATIVE_AMD "
|
||||||
|
+#elif defined CONFIG_MNEHALEM
|
||||||
|
+#define MODULE_PROC_FAMILY "NEHALEM "
|
||||||
|
+#elif defined CONFIG_MWESTMERE
|
||||||
|
+#define MODULE_PROC_FAMILY "WESTMERE "
|
||||||
|
+#elif defined CONFIG_MSILVERMONT
|
||||||
|
+#define MODULE_PROC_FAMILY "SILVERMONT "
|
||||||
|
+#elif defined CONFIG_MGOLDMONT
|
||||||
|
+#define MODULE_PROC_FAMILY "GOLDMONT "
|
||||||
|
+#elif defined CONFIG_MGOLDMONTPLUS
|
||||||
|
+#define MODULE_PROC_FAMILY "GOLDMONTPLUS "
|
||||||
|
+#elif defined CONFIG_MSANDYBRIDGE
|
||||||
|
+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
|
||||||
|
+#elif defined CONFIG_MIVYBRIDGE
|
||||||
|
+#define MODULE_PROC_FAMILY "IVYBRIDGE "
|
||||||
|
+#elif defined CONFIG_MHASWELL
|
||||||
|
+#define MODULE_PROC_FAMILY "HASWELL "
|
||||||
|
+#elif defined CONFIG_MBROADWELL
|
||||||
|
+#define MODULE_PROC_FAMILY "BROADWELL "
|
||||||
|
+#elif defined CONFIG_MSKYLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "SKYLAKE "
|
||||||
|
+#elif defined CONFIG_MSKYLAKEX
|
||||||
|
+#define MODULE_PROC_FAMILY "SKYLAKEX "
|
||||||
|
+#elif defined CONFIG_MCANNONLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "CANNONLAKE "
|
||||||
|
+#elif defined CONFIG_MICELAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "ICELAKE "
|
||||||
|
+#elif defined CONFIG_MCASCADELAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "CASCADELAKE "
|
||||||
|
+#elif defined CONFIG_MCOOPERLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "COOPERLAKE "
|
||||||
|
+#elif defined CONFIG_MTIGERLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "TIGERLAKE "
|
||||||
|
+#elif defined CONFIG_MSAPPHIRERAPIDS
|
||||||
|
+#define MODULE_PROC_FAMILY "SAPPHIRERAPIDS "
|
||||||
|
+#elif defined CONFIG_ROCKETLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "ROCKETLAKE "
|
||||||
|
+#elif defined CONFIG_MALDERLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "ALDERLAKE "
|
||||||
|
+#elif defined CONFIG_MRAPTORLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "RAPTORLAKE "
|
||||||
|
+#elif defined CONFIG_MMETEORLAKE
|
||||||
|
+#define MODULE_PROC_FAMILY "METEORLAKE "
|
||||||
|
+#elif defined CONFIG_MEMERALDRAPIDS
|
||||||
|
+#define MODULE_PROC_FAMILY "EMERALDRAPIDS "
|
||||||
|
#elif defined CONFIG_MATOM
|
||||||
|
#define MODULE_PROC_FAMILY "ATOM "
|
||||||
|
#elif defined CONFIG_M686
|
||||||
|
@@ -35,6 +83,32 @@
|
||||||
|
#define MODULE_PROC_FAMILY "K7 "
|
||||||
|
#elif defined CONFIG_MK8
|
||||||
|
#define MODULE_PROC_FAMILY "K8 "
|
||||||
|
+#elif defined CONFIG_MK8SSE3
|
||||||
|
+#define MODULE_PROC_FAMILY "K8SSE3 "
|
||||||
|
+#elif defined CONFIG_MK10
|
||||||
|
+#define MODULE_PROC_FAMILY "K10 "
|
||||||
|
+#elif defined CONFIG_MBARCELONA
|
||||||
|
+#define MODULE_PROC_FAMILY "BARCELONA "
|
||||||
|
+#elif defined CONFIG_MBOBCAT
|
||||||
|
+#define MODULE_PROC_FAMILY "BOBCAT "
|
||||||
|
+#elif defined CONFIG_MBULLDOZER
|
||||||
|
+#define MODULE_PROC_FAMILY "BULLDOZER "
|
||||||
|
+#elif defined CONFIG_MPILEDRIVER
|
||||||
|
+#define MODULE_PROC_FAMILY "PILEDRIVER "
|
||||||
|
+#elif defined CONFIG_MSTEAMROLLER
|
||||||
|
+#define MODULE_PROC_FAMILY "STEAMROLLER "
|
||||||
|
+#elif defined CONFIG_MJAGUAR
|
||||||
|
+#define MODULE_PROC_FAMILY "JAGUAR "
|
||||||
|
+#elif defined CONFIG_MEXCAVATOR
|
||||||
|
+#define MODULE_PROC_FAMILY "EXCAVATOR "
|
||||||
|
+#elif defined CONFIG_MZEN
|
||||||
|
+#define MODULE_PROC_FAMILY "ZEN "
|
||||||
|
+#elif defined CONFIG_MZEN2
|
||||||
|
+#define MODULE_PROC_FAMILY "ZEN2 "
|
||||||
|
+#elif defined CONFIG_MZEN3
|
||||||
|
+#define MODULE_PROC_FAMILY "ZEN3 "
|
||||||
|
+#elif defined CONFIG_MZEN4
|
||||||
|
+#define MODULE_PROC_FAMILY "ZEN4 "
|
||||||
|
#elif defined CONFIG_MELAN
|
||||||
|
#define MODULE_PROC_FAMILY "ELAN "
|
||||||
|
#elif defined CONFIG_MCRUSOE
|
||||||
|
--
|
||||||
|
2.39.0
|
||||||
|
|
||||||
Loading…
Reference in a new issue