Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

update cpu march selection

Peter Jung78c444c0fa3f
diff --git a/linux-bore/.SRCINFO b/linux-bore/.SRCINFO
index ac4faf5c..e1d64252 100755
--- a/linux-bore/.SRCINFO
+++ b/linux-bore/.SRCINFO
@@ -65,7 +65,7 @@ pkgbase = linux-bore
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-bore
pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index 5ebabe9d..e22ba880 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -823,4 +832,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-bore/auto-cpu-optimization.sh b/linux-bore/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-bore/auto-cpu-optimization.sh
+++ b/linux-bore/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-bmq/.SRCINFO b/linux-cachyos-bmq/.SRCINFO
index d3f44681..0a3a849e 100755
--- a/linux-cachyos-bmq/.SRCINFO
+++ b/linux-cachyos-bmq/.SRCINFO
@@ -63,7 +63,7 @@ pkgbase = linux-cachyos-bmq
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-bmq
pkgdesc = The Linux BMQ scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index e0f0b34d..cecfe073 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +831,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-bmq/auto-cpu-optimization.sh b/linux-cachyos-bmq/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-bmq/auto-cpu-optimization.sh
+++ b/linux-cachyos-bmq/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
index 2d1e7b79..8993787b 100755
--- a/linux-cachyos-bore/.SRCINFO
+++ b/linux-cachyos-bore/.SRCINFO
@@ -65,7 +65,7 @@ pkgbase = linux-cachyos-bore
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-bore
pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 7748768b..135d74c3 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -823,4 +832,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-bore/auto-cpu-optimization.sh b/linux-cachyos-bore/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-bore/auto-cpu-optimization.sh
+++ b/linux-cachyos-bore/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-cacule/.SRCINFO b/linux-cachyos-cacule/.SRCINFO
index efb2b55a..ba83bc48 100755
--- a/linux-cachyos-cacule/.SRCINFO
+++ b/linux-cachyos-cacule/.SRCINFO
@@ -63,7 +63,7 @@ pkgbase = linux-cachyos-cacule
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-cacule
pkgdesc = The Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-cacule/PKGBUILD b/linux-cachyos-cacule/PKGBUILD
index c8692710..ee2783c7 100644
--- a/linux-cachyos-cacule/PKGBUILD
+++ b/linux-cachyos-cacule/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +831,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-cacule/auto-cpu-optimization.sh b/linux-cachyos-cacule/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-cacule/auto-cpu-optimization.sh
+++ b/linux-cachyos-cacule/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-cfs/.SRCINFO b/linux-cachyos-cfs/.SRCINFO
index 4a8e99a9..085632a7 100755
--- a/linux-cachyos-cfs/.SRCINFO
+++ b/linux-cachyos-cfs/.SRCINFO
@@ -63,7 +63,7 @@ pkgbase = linux-cachyos-cfs
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-cfs
pkgdesc = The Linux CFS scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-cfs/PKGBUILD b/linux-cachyos-cfs/PKGBUILD
index ec7012a6..e5c3c3c3 100644
--- a/linux-cachyos-cfs/PKGBUILD
+++ b/linux-cachyos-cfs/PKGBUILD
@@ -82,10 +82,10 @@ _spf_enable=y
_lrng_enable=y
## Apply Kernel automatic Optimization
-_use_auto_optimization=
+_use_auto_optimization=y
## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_optimization_select=
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +244,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +824,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-cfs/auto-cpu-optimization.sh b/linux-cachyos-cfs/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-cfs/auto-cpu-optimization.sh
+++ b/linux-cachyos-cfs/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO
index 23f1985d..d730dee5 100755
--- a/linux-cachyos-hardened/.SRCINFO
+++ b/linux-cachyos-hardened/.SRCINFO
@@ -51,8 +51,8 @@ pkgbase = linux-cachyos-hardened
sha256sums = 67d3496c8c737618f2ef5e0b03fd7767153fd2a2e967c818727f2fb7670a9966
sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
- sha256sums = 65b5a8d23387a4a9831505777f25614e345e26671fc8a237f8ac4521f0713c52
- sha256sums = 81673b0f46bee5bffa8807e5f87208457a43cc46668738e80d7ea1f8ee8d071e
+ sha256sums = d00f5a8cf77ddec750e267f793c5c66c7f3a5199e40014b00fc580d5a53ccb07
+ sha256sums = 4feadc76643df988fd2ca0b1934bd7bd9e3a2b08d6e5c0db6ad27350d086542e
sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
@@ -69,7 +69,7 @@ pkgbase = linux-cachyos-hardened
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-hardened
pkgdesc = The Linux hardened kernel with the BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 06db19a5..43bd897f 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -807,8 +816,8 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'67d3496c8c737618f2ef5e0b03fd7767153fd2a2e967c818727f2fb7670a9966'
'7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
- '65b5a8d23387a4a9831505777f25614e345e26671fc8a237f8ac4521f0713c52'
- '81673b0f46bee5bffa8807e5f87208457a43cc46668738e80d7ea1f8ee8d071e'
+ 'd00f5a8cf77ddec750e267f793c5c66c7f3a5199e40014b00fc580d5a53ccb07'
+ '4feadc76643df988fd2ca0b1934bd7bd9e3a2b08d6e5c0db6ad27350d086542e'
'326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
'2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
@@ -825,4 +834,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-hardened/auto-cpu-optimization.sh b/linux-cachyos-hardened/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-hardened/auto-cpu-optimization.sh
+++ b/linux-cachyos-hardened/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-pds/.SRCINFO b/linux-cachyos-pds/.SRCINFO
index a8b7760f..54d21638 100755
--- a/linux-cachyos-pds/.SRCINFO
+++ b/linux-cachyos-pds/.SRCINFO
@@ -63,7 +63,7 @@ pkgbase = linux-cachyos-pds
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = 1da5c9b19d3efef726fd9154154f2a9e68d88763587d1f8529da2b0f480492c2
pkgname = linux-cachyos-pds
pkgdesc = The Linux PDS scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-pds/PKGBUILD b/linux-cachyos-pds/PKGBUILD
index b06709ea..a16eb36d 100644
--- a/linux-cachyos-pds/PKGBUILD
+++ b/linux-cachyos-pds/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +831,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ '1da5c9b19d3efef726fd9154154f2a9e68d88763587d1f8529da2b0f480492c2')
diff --git a/linux-cachyos-pds/auto-cpu-optimization.sh b/linux-cachyos-pds/auto-cpu-optimization.sh
index c0f9036e..117514bd 100755
--- a/linux-cachyos-pds/auto-cpu-optimization.sh
+++ b/linux-cachyos-pds/auto-cpu-optimization.sh
@@ -1,36 +1,10 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
-if [[ ${MARCH} == "ZNVER" ]]
-then
- MARCH="ZEN"
-
-elif [[ ${MARCH} == "ZNVER2" ]]
-then
- MARCH="ZEN2"
-
-elif [[ ${MARCH} == "ZNVER3" ]]
-then
- MARCH="ZEN3"
-
-elif [[ ${MARCH} == "BDVER2" ]]
-then
- MARCH="MPILEDRIVER"
-fi
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : $MARCH"
+sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M$MARCH is not set/CONFIG_M$MARCH=y/g" .config
+sleep 3&&echo
diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO
index 61e5e502..3299649a 100755
--- a/linux-cachyos-rc/.SRCINFO
+++ b/linux-cachyos-rc/.SRCINFO
@@ -45,7 +45,7 @@ pkgbase = linux-cachyos-rc
sha256sums = 7cf2e27ae7ca49c8d20a6c10b0a34187f8c63f2dab3063b3649a692d65065fad
sha256sums = f94ee42a540d935c3fa05d27485b7f6b66d6220ea2e603db8a3d9ca55e19f7ef
sha256sums = f31972b5cdb0a9ffebe63070ce5706b9d28e47c96f5979820b3fb57f236a93bf
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-rc
pkgdesc = The Linux CFS scheduler Kernel by CachyOS and with some other patches and other improvements kernel and modules
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index f290abc9..a2cf2665 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -83,11 +83,8 @@ _lrng_enable=y
## Apply Kernel automatic Optimization
_use_auto_optimization=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
-
## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_optimization_select=
_nf_cone=y
@@ -209,13 +206,15 @@ prepare() {
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -709,4 +708,4 @@ sha256sums=('c2d2400bbf52688a1d2d1e45171331ddbc69ba1c3864e922c1c3f5b546b4d21b'
'7cf2e27ae7ca49c8d20a6c10b0a34187f8c63f2dab3063b3649a692d65065fad'
'f94ee42a540d935c3fa05d27485b7f6b66d6220ea2e603db8a3d9ca55e19f7ef'
'f31972b5cdb0a9ffebe63070ce5706b9d28e47c96f5979820b3fb57f236a93bf'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-rc/auto-cpu-optimization.sh b/linux-cachyos-rc/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-rc/auto-cpu-optimization.sh
+++ b/linux-cachyos-rc/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos-tt/.SRCINFO b/linux-cachyos-tt/.SRCINFO
index 40783b7c..219a5463 100755
--- a/linux-cachyos-tt/.SRCINFO
+++ b/linux-cachyos-tt/.SRCINFO
@@ -63,7 +63,7 @@ pkgbase = linux-cachyos-tt
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos-tt
pkgdesc = The Linux TT scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-tt/PKGBUILD b/linux-cachyos-tt/PKGBUILD
index b4dddf10..7d3d97b3 100644
--- a/linux-cachyos-tt/PKGBUILD
+++ b/linux-cachyos-tt/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +831,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos-tt/auto-cpu-optimization.sh b/linux-cachyos-tt/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos-tt/auto-cpu-optimization.sh
+++ b/linux-cachyos-tt/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
index 84621ec3..bf1dde87 100755
--- a/linux-cachyos/.SRCINFO
+++ b/linux-cachyos/.SRCINFO
@@ -65,7 +65,7 @@ pkgbase = linux-cachyos
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cachyos
pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 8805cf8a..57dfdf9a 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,17 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+
+
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -823,4 +834,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cachyos/auto-cpu-optimization.sh b/linux-cachyos/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cachyos/auto-cpu-optimization.sh
+++ b/linux-cachyos/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cacule-rdb/.SRCINFO b/linux-cacule-rdb/.SRCINFO
index 50c5655a..ebf23362 100755
--- a/linux-cacule-rdb/.SRCINFO
+++ b/linux-cacule-rdb/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-cacule-rdb
pkgdesc = Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements
- pkgver = 5.18.2
+ pkgver = 5.18.3
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
@@ -24,8 +24,9 @@ pkgbase = linux-cacule-rdb
makedepends = make
makedepends = patch
options = !strip
- source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz
+ source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
+ source = git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-cacULE-5.18.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-arch.patch
@@ -38,34 +39,33 @@ pkgbase = linux-cacule-rdb
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
- sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2
- sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90
+ sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
+ sha256sums = 83425e8b1553f4ad0d8fdadbad3980b71f7a36742b3238813ff4d00cd3bf08f8
+ sha256sums = SKIP
sha256sums = 616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e
- sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae
+ sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d
sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521
sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c
sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7
- sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117
- sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232
+ sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
+ sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
- sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2
- sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
+ sha256sums = 344806f8ea9f0f7da883e2c27835153944df7a4b15bb3f97ec6b7b7709682f5d
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-cacule-rdb
pkgdesc = The Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements kernel and modules
@@ -84,3 +84,9 @@ pkgname = linux-cacule-rdb
pkgname = linux-cacule-rdb-headers
pkgdesc = Headers and scripts for building modules for the Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
+ depends = linux-cacule-rdb
+
+pkgname = linux-cacule-rdb-zfs
+ pkgdesc = zfs module for the Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements kernel
+ depends = pahole
+ depends = linux-cacule-rdb=5.18.3-1
diff --git a/linux-cacule-rdb/PKGBUILD b/linux-cacule-rdb/PKGBUILD
index b6fae37a..7f61ebb8 100644
--- a/linux-cacule-rdb/PKGBUILD
+++ b/linux-cacule-rdb/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -803,12 +812,10 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'e37566b5e26c139629c14fbcae237d1ff15caa592fc10593f1fd15698e5afb71'
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '83425e8b1553f4ad0d8fdadbad3980b71f7a36742b3238813ff4d00cd3bf08f8'
'SKIP'
- '51bcca36288e44282017ed35b41855d22d108508c1a2501b71e5f4ccce885da2'
- 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
- '6705db6d11e22ed9bb56a0ac3f22918667d52a835bb2ab678ac2c93d2902045d'
+ '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
'326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
'2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
@@ -819,12 +826,10 @@ sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
'4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
'1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
+ '344806f8ea9f0f7da883e2c27835153944df7a4b15bb3f97ec6b7b7709682f5d'
'99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22'
- 'SKIP')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cacule-rdb/auto-cpu-optimization.sh b/linux-cacule-rdb/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cacule-rdb/auto-cpu-optimization.sh
+++ b/linux-cacule-rdb/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-cacule-rdb/configure b/linux-cacule-rdb/configure
index 2f1411cc..a54e08dc 100644
--- a/linux-cacule-rdb/configure
+++ b/linux-cacule-rdb/configure
@@ -1,263 +1,114 @@
-#!/usr/bin/bash
+#!/bin/bash
+_undefine() {
+ for _config_name in "$@"; do
+ scripts/config -k --undefine "${_config_name}"
+ done
+}
-cpu_arch() {
- plain ""
- plain "#########################################"
- plain "Set cpu microarchitecture optimization in GCC"
- read -rp "`echo $' > 1) M486SX : Select this for an 486-class CPU without an FPU such as AMD/Cyrix/IBM/Intel SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5S.\n \
- > 2) M486 : Select this for an 486-class CPU such as AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 and UMC U5D.\n \
- > 3) M586 : Select this for an 586 or 686 series processor such as the AMD K5,the Cyrix 5x86, 6x86 and 6x86MX. This choice does not assume the RDTSC (Read Time Stamp Counter) instruction.\n \
- > 4) M586TSC : Select this for a Pentium Classic processor with the RDTSC (Read Time Stamp Counter) instruction for benchmarking.\n \
- > 5) M586MMX : Select this for a Pentium with the MMX graphics/multimedia extended instructions.\n \
- > 6) M686 : Select this for Intel Pentium Pro chips.\n \
- > 7) MPENTIUMII : Select this for Intel chips based on the Pentium-II and pre-Coppermine Celeron core.\n \
- > 8) MPENTIUMIII : Select this for Intel chips based on the Pentium-III and Celeron-Coppermine core.\n \
- > 9) MPENTIUMM : Select this for Intel Pentium M (not Pentium-4 M) notebook chips.\n \
- > 10) MPENTIUM4 : Select this for Intel Pentium 4 chips.\n \
- > 11) MK6 : Select this for an AMD K6-family processor.\n \
- > 12) MK7 : Select this for an AMD Athlon K7-family processor.\n \
- > 13) MK8 : Select this for an AMD Opteron or Athlon64 Hammer-family processor.\n \
- > 14) MK8SSE3 : Select this for improved AMD Opteron or Athlon64 Hammer-family processors.\n \
- > 15) MK10 : 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.\n \
- > 16) MBARCELONA : Select this for AMD Family 10h Barcelona processors.\n \
- > 17) MBOBCAT : Select this for AMD Family 14h Bobcat processors.\n \
- > 18) MJAGUAR : Select this for AMD Family 16h Jaguar processors.\n \
- > 19) MBULLDOZER : Select this for AMD Family 15h Bulldozer processors.\n \
- > 20) MPILEDRIVER : Select this for AMD Family 15h Piledriver processors.\n \
- > 21) MSTEAMROLLER : Select this for AMD Family 15h Steamroller processors.\n \
- > 22) MEXCAVATOR : Select this for AMD Family 15h Excavator processors.\n \
- > 23) MZEN : Select this for AMD Family 17h Zen processors.\n \
- > 24) MZEN2 : Select this for AMD Family 17h Zen 2 processors.\n \
- > 25) MZEN3 : Select this for AMD Family 19h Zen 3 processors. - GCC 10.3 required\n \
- > 26) MCRUSOE : Select this for a Transmeta Crusoe processor.\n \
- > 27) MEFFICEON : Select this for a Transmeta Efficeon processor.\n \
- > 28) MWINCHIPC6 : Select this for an IDT Winchip C6 chip.\n \
- > 29) MWINCHIP3D : Select this for an IDT Winchip-2, 2A or 3.\n \
- > 30) MELAN : Select this for an AMD Elan processor.\n \
- > 31) MGEODEGX1 : Select this for a Geode GX1 (Cyrix MediaGX) chip.\n \
- > 32) MGEODE_LX Select this for AMD Geode GX and LX processors.\n \
- > 33) MCYRIXIII : Select this for a Cyrix III or C3 chip.\n \
- > 34) MVIAC3_2 : Select this for a VIA C3 "Nehemiah".\n \
- > 35) MVIAC7 : Select this for a VIA C7.\n \
- > 36) MPSC : Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey Xeon CPUs with Intel 64bit which is compatible with x86-64.\n \
- > 37) MATOM : Select this for the Intel Atom platform.\n \
- > 38) MCORE2 : Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) CPUs.\n \
- > 39) MNEHALEM : Select this for 1st Gen Core processors in the Nehalem family.\n \
- > 40) MWESTMERE : Select this for the Intel Westmere formerly Nehalem-C family.\n \
- > 41) MSILVERMONT Select this for the Intel Silvermont platform.\n \
- > 42) MGOLDMONT : Select this for the Intel Goldmont platform including Apollo Lake and Denverton.\n \
- > 43) MGOLDMONTPLUS : Select this for the Intel Goldmont Plus platform including Gemini Lake.\n \
- > 44) MSANDYBRIDGE : Select this for 2nd Gen Core processors in the Sandy Bridge family.\n \
- > 45) MIVYBRIDGE : Select this for 3rd Gen Core processors in the Ivy Bridge family.\n \
- > 46) MHASWELL : Select this for 4th Gen Core processors in the Haswell family.\n \
- > 47) MBROADWELL : Select this for 5th Gen Core processors in the Broadwell family.\n \
- > 48) MSKYLAKE : Select this for 6th Gen Core processors in the Skylake family.\n \
- > 49) MSKYLAKEX : Select this for 6th Gen Core processors in the Skylake X family.\n \
- > 50) MCANNONLAKE : Select this for 8th Gen Core processors.\n \
- > 51) MICELAKE : Select this for 10th Gen Core processors in the Ice Lake family.\n \
- > 52) MCASCADELAKE : Select this for Xeon processors in the Cascade Lake family.\n \
- > 53) MCOOPERLAKE : Select this for Xeon processors in the Cooper Lake family. - GCC 10.1 required\n \
- > 54) MTIGERLAKE : Select this for third-generation 10 nm process processors in the Tiger Lake family. - GCC 10.1 required\n \
- > 55) MSAPPHIRERAPIDS : Select this for third-generation 10 nm process processors in the Sapphire Rapids family. - GCC 11 required\n \
- > 56) MALDERLAKE : Select this for twelfth-generation processors in the Alder Lake family.- GCC 11 required\n \
- > 57) GENERIC_CPU : Generic x86-64 CPU. Run equally well on all x86-64 CPUs.\n \
- > 58) GENERIC_CPU2 : Run equally well on all x86-64 CPUs with min support of x86-64-v2. - GCC 11 required\n \
- > 59) GENERIC_CPU3 : Generic x86-64-v3 CPU with v3 instructions. Run equally well on all x86-64 CPUs with min support of x86-64-v3. - GCC 11 required\n \
- > 60) GENERIC_CPU4 : Generic x86-64 CPU with v4 instructions. Run equally well on all x86-64 CPUs with min support of x86-64-v4. - GCC 11 required\n \
- > 61) MNATIVE_INTEL : Intel-Native optimizations autodetected by GCC.\n \
- > 62) MNATIVE_AMD : AMD-Native optimizations autodetected by GCC.\n \
- > Default (57 : Gneric CPU)\nchoice[0-62]: '`" _microarchitecture
+_enable() {
+ for _config_name in "$@"; do
+ scripts/config -k --enable "${_config_name}"
+ done
+}
- if [[ "$_microarchitecture" = "1" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_M486
- elif [[ "$_microarchitecture" = "2" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_M486
- elif [[ "$_microarchitecture" = "3" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_M586
- elif [[ "$_microarchitecture" = "4" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_M586TSC
- elif [[ "$_microarchitecture" = "5" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_M586MMX
- elif [[ "$_microarchitecture" = "6" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_M686
- elif [[ "$_microarchitecture" = "7" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MPENTIUMII
- elif [[ "$_microarchitecture" = "8" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MPENTIUMIII
- elif [[ "$_microarchitecture" = "9" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MPENTIUMM
- elif [[ "$_microarchitecture" = "10" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MPENTIUM4
- elif [[ "$_microarchitecture" = "11" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MK6
- elif [[ "$_microarchitecture" = "12" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MK7
- elif [[ "$_microarchitecture" = "13" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MK8
- elif [[ "$_microarchitecture" = "14" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MK8SSE3
- elif [[ "$_microarchitecture" = "15" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MK10
- elif [[ "$_microarchitecture" = "16" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MBARCELONA
- elif [[ "$_microarchitecture" = "17" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MBOBCAT
- elif [[ "$_microarchitecture" = "18" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MJAGUAR
- elif [[ "$_microarchitecture" = "19" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MBULLDOZER
- elif [[ "$_microarchitecture" = "20" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MPILEDRIVER
- elif [[ "$_microarchitecture" = "21" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MSTEAMROLLER
- elif [[ "$_microarchitecture" = "22" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MEXCAVATOR
- elif [[ "$_microarchitecture" = "23" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MZEN
- elif [[ "$_microarchitecture" = "24" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MZEN2
- elif [[ "$_microarchitecture" = "25" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MZEN3
- elif [[ "$_microarchitecture" = "26" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MCRUSOE
- elif [[ "$_microarchitecture" = "27" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MEFFICEON
- elif [[ "$_microarchitecture" = "28" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MWINCHIPC6
- elif [[ "$_microarchitecture" = "29" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MWINCHIP3D
- elif [[ "$_microarchitecture" = "30" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MELAN
- elif [[ "$_microarchitecture" = "31" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MGEODEGX1
- elif [[ "$_microarchitecture" = "32" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MGEODE_LX
- elif [[ "$_microarchitecture" = "33" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MCYRIXIII
- elif [[ "$_microarchitecture" = "34" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MVIAC3_2
- elif [[ "$_microarchitecture" = "35" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MVIAC7
- elif [[ "$_microarchitecture" = "36" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MPSC
- elif [[ "$_microarchitecture" = "37" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MATOM
- elif [[ "$_microarchitecture" = "38" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MCORE2
- elif [[ "$_microarchitecture" = "39" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MNEHALEM
- elif [[ "$_microarchitecture" = "40" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MWESTMERE
- elif [[ "$_microarchitecture" = "41" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MSILVERMONT
- elif [[ "$_microarchitecture" = "42" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MGOLDMONT
- elif [[ "$_microarchitecture" = "43" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MGOLDMONTPLUS
- elif [[ "$_microarchitecture" = "44" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MSANDYBRIDGE
- elif [[ "$_microarchitecture" = "45" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MIVYBRIDGE
- elif [[ "$_microarchitecture" = "46" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MHASWELL
- elif [[ "$_microarchitecture" = "47" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MBROADWELL
- elif [[ "$_microarchitecture" = "48" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MSKYLAKE
- elif [[ "$_microarchitecture" = "49" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MSKYLAKEX
- elif [[ "$_microarchitecture" = "50" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MCANNONLAKE
- elif [[ "$_microarchitecture" = "51" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MICELAKE
- elif [[ "$_microarchitecture" = "52" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MCASCADELAKE
- elif [[ "$_microarchitecture" = "53" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MCOOPERLAKE
- elif [[ "$_microarchitecture" = "54" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MTIGERLAKE
- elif [[ "$_microarchitecture" = "55" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MSAPPHIRERAPIDS
- elif [[ "$_microarchitecture" = "56" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MALDERLAKE
- elif [[ "$_microarchitecture" = "57" ]]; then
- scripts/config --enable CONFIG_GENERIC_CPU
- elif [[ "$_microarchitecture" = "58" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_GENERIC_CPU2
- elif [[ "$_microarchitecture" = "59" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_GENERIC_CPU3
- elif [[ "$_microarchitecture" = "60" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_GENERIC_CPU4
- elif [[ "$_microarchitecture" = "61" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MNATIVE_INTEL
- elif [[ "$_microarchitecture" = "62" ]]; then
- scripts/config --disable CONFIG_GENERIC_CPU
- scripts/config --enable CONFIG_MNATIVE_AMD
- else
- scripts/config --enable CONFIG_GENERIC_CPU
+_disable() {
+ for _config_name in "$@"; do
+ scripts/config -k --disable "${_config_name}"
+ done
+}
+
+_module() {
+ for _config_name in "$@"; do
+ scripts/config -k --module "${_config_name}"
+ done
+}
+
+_prompt_from_array() {
+ # Prompts from array, selects default index on empty user input
+ # Set the _default_index variable to enable default index selection
+
+ if [ $# = "0" ]; then
+ warning "Prompting on an empty array, please report this issue."
+ exit 1
fi
- plain ""
+ _N=$(($#-1))
+ _index=0
+ for _value in "$@"; do
+ if [ "$_index" = "$_default_index" ]; then
+ plain " > ${_index}) ${_value}"
+ else
+ plain " ${_index}) ${_value}"
+ fi
+ _index=$(($_index + 1))
+ done
+ while true; do
+ read -rp "[0-${_N}]: ";
+ if [[ -z "$REPLY" && -n "$_default_index" ]]; then
+ _selected_index="$_default_index"
+ break
+ elif [[ "$REPLY" =~ ^[0-9]+$ && 0 -le "$REPLY" && "$REPLY" -le $_N ]]; then
+ _selected_index="$REPLY"
+ break
+ else
+ echo "Wrong selection: select any number in 0-$_N"
+ fi
+ done
- sleep 2
+ _natural_index=$(($_selected_index + 1))
+ _selected_value="${!_natural_index}"
+ plain "Selected: ${_selected_value}"
+
+ unset _natural_index
+ unset _default_index
}
+# cpu opt
+_cpu_marchs=("native_amd" "native_intel" "generic_cpu" "generic_cpu2" "generic_cpu3" "generic_cpu4")
+_cpu_marchs+=("k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver")
+_cpu_marchs+=("steamroller" "excavator" "zen" "zen2" "zen3" "mpsc" "atom" "core2" "nehalem" "westmere")
+_cpu_marchs+=("bonnell" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake")
+_cpu_marchs+=("skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake")
+_cpu_marchs+=("cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake")
+
+typeset -A _generic_march_map
+_generic_march_map=(
+ ["generic"]="generic_cpu"
+ ["generic_v2"]="generic_cpu2"
+ ["generic_v3"]="generic_cpu3"
+ ["generic_v4"]="generic_cpu4"
+)
+if [ -n "$_processor_opt" ]; then
+ # Replace customization.cfg convention with .config convention for generic
+ if [[ "${!_generic_march_map[@]}" =~ "$_processor_opt" ]]; then
+ _processor_opt="${_generic_march_map[$_processor_opt]}"
+ fi
+ if ! [[ "${_cpu_marchs[@]}" =~ "$_processor_opt" ]]; then
+ warning "the setup _processor_opt=\"${_processor_opt}\" not recognized. Prompting..."
+ _processor_opt=""
+ fi
+fi
+
+if [ -z "$_processor_opt" ]; then
+ msg2 "Please select the desired CPU micro-architecture"
+ _default_index="2"
+ _prompt_from_array "${_cpu_marchs[@]}"
+ _processor_opt="${_selected_value}"
+fi
+
+for _march in "${_cpu_marchs[@]}"
+do
+ _march_upper=`echo "$_march" | tr '[a-z]' '[A-Z]'`
+ if [ "$_processor_opt" = "$_march" ]; then
+ if [[ "$_march" = "generic"* ]]; then
+ _enable "${_march_upper}"
+ else
+ _enable "M${_march_upper}"
+ fi
+ else
+ if [[ "$_march" = "generic"* ]]; then
+ _disable "${_march_upper}"
+ else
+ _disable "M${_march_upper}"
+ fi
+ fi
+done
diff --git a/linux-cacule/.SRCINFO b/linux-cacule/.SRCINFO
index efb2b55a..654786d7 100755
--- a/linux-cacule/.SRCINFO
+++ b/linux-cacule/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = linux-cachyos-cacule
+pkgbase = linux-cacule
pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 5.18.3
pkgrel = 1
@@ -63,9 +63,9 @@ pkgbase = linux-cachyos-cacule
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
-pkgname = linux-cachyos-cacule
+pkgname = linux-cacule
pkgdesc = The Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
depends = coreutils
depends = kmod
@@ -79,7 +79,7 @@ pkgname = linux-cachyos-cacule
provides = KSMBD-MODULE
provides = UKSMD-BUILTIN
-pkgname = linux-cachyos-cacule-headers
+pkgname = linux-cacule-headers
pkgdesc = Headers and scripts for building modules for the Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
- depends = linux-cachyos-cacule
+ depends = linux-cacule
diff --git a/linux-cacule/PKGBUILD b/linux-cacule/PKGBUILD
index c8692710..b30c8a12 100644
--- a/linux-cacule/PKGBUILD
+++ b/linux-cacule/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -117,11 +124,11 @@ _use_kcfi=
_build_zfs=
if [ -n "$_use_llvm_lto" ]; then
- pkgsuffix=cachyos-${_cpusched}-lto
+ pkgsuffix=${_cpusched}-lto
pkgbase=linux-$pkgsuffix
else
- pkgsuffix=cachyos-${_cpusched}
+ pkgsuffix=${_cpusched}
pkgbase=linux-$pkgsuffix
fi
_major=5.18
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +831,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-cacule/auto-cpu-optimization.sh b/linux-cacule/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-cacule/auto-cpu-optimization.sh
+++ b/linux-cacule/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/linux-tt/.SRCINFO b/linux-tt/.SRCINFO
index 4cdf1420..47f8417d 100755
--- a/linux-tt/.SRCINFO
+++ b/linux-tt/.SRCINFO
@@ -63,7 +63,7 @@ pkgbase = linux-tt
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
pkgname = linux-tt
pkgdesc = The Linux TT scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-tt/PKGBUILD b/linux-tt/PKGBUILD
index eb5150ef..9ab0a765 100644
--- a/linux-tt/PKGBUILD
+++ b/linux-tt/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -244,13 +251,15 @@ cd ${srcdir}/$_srcname
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -822,4 +831,4 @@ sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
'8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
- 'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6')
diff --git a/linux-tt/auto-cpu-optimization.sh b/linux-tt/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/linux-tt/auto-cpu-optimization.sh
+++ b/linux-tt/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo
diff --git a/script.sh b/script.sh
index 6eb39bc2..2286a457 100755
--- a/script.sh
+++ b/script.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_optimization_select=y/_use_optimization_select=/" {}
+find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_auto_optimization=y/_use_auto_optimization=/" {}
find . -name "PKGBUILD" | xargs -I {} sed -i "s/_build_zfs=/_build_zfs=y/" {}
files=$(find . -name "PKGBUILD")
diff --git a/zfs-builtin/.SRCINFO b/zfs-builtin/.SRCINFO
index 2f0f4126..80f726e2 100755
--- a/zfs-builtin/.SRCINFO
+++ b/zfs-builtin/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = linux-cachyos-cacule
- pkgdesc = Linux cacULE scheduler Kernel by CachyOS with other patches and improvements
+pkgbase = linux-bore
+ pkgdesc = Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements
pkgver = 5.18.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -26,7 +26,8 @@ pkgbase = linux-cachyos-cacule
options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
source = config
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-cacULE-5.18.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch
+ source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-arch.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch
@@ -38,16 +39,17 @@ pkgbase = linux-cachyos-cacule
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch
- source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch
source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-PCI-Allow-BAR-movement-during-boot-and-hotplug.patch
source = auto-cpu-optimization.sh
+ source = git+https://github.com/ptr1337/zfs.git#commit=8941b63a931ca6fdc6d0ab46c037540569ba04a4
sha256sums = c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea
- sha256sums = 0e19b226d8234bbe4d6b05a850488695dadffcd00fe8f0265b8779beaff7e03c
- sha256sums = 616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e
+ sha256sums = 83425e8b1553f4ad0d8fdadbad3980b71f7a36742b3238813ff4d00cd3bf08f8
+ sha256sums = 7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271
+ sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65
sha256sums = 326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6
sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2
sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232
@@ -58,17 +60,17 @@ pkgbase = linux-cachyos-cacule
sha256sums = 4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a
sha256sums = f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e
sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00
- sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd
- sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425
+ sha256sums = 344806f8ea9f0f7da883e2c27835153944df7a4b15bb3f97ec6b7b7709682f5d
sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79
sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e
sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19
sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb
sha256sums = cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7
- sha256sums = be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22
+ sha256sums = c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6
+ sha256sums = SKIP
-pkgname = linux-cachyos-cacule
- pkgdesc = The Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
+pkgname = linux-bore
+ pkgdesc = The Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements kernel and modules
depends = coreutils
depends = kmod
depends = initramfs
@@ -76,12 +78,15 @@ pkgname = linux-cachyos-cacule
optdepends = linux-firmware: firmware images needed for some devices
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
optdepends = uksmd: Userspace KSM helper daemon
+ optdepends = zfs-utils
provides = VIRTUALBOX-GUEST-MODULES
provides = WIREGUARD-MODULE
provides = KSMBD-MODULE
provides = UKSMD-BUILTIN
+ provides = linux-bore-zfs
-pkgname = linux-cachyos-cacule-headers
- pkgdesc = Headers and scripts for building modules for the Linux cacULE scheduler Kernel by CachyOS with other patches and improvements kernel
+pkgname = linux-bore-headers
+ pkgdesc = Headers and scripts for building modules for the Linux cacULE-RDB scheduler Kernel by CachyOS with other patches and improvements kernel
depends = pahole
- depends = linux-cachyos-cacule
+ provides = zfs-headers
+ provides = spl-headers
diff --git a/zfs-builtin/PKGBUILD b/zfs-builtin/PKGBUILD
index 77e60378..ebf28ace 100644
--- a/zfs-builtin/PKGBUILD
+++ b/zfs-builtin/PKGBUILD
@@ -81,11 +81,18 @@ _spf_enable=y
## Enable Linux Random Number Generator
_lrng_enable=y
-## Apply Kernel automatic Optimization
-_use_auto_optimization=
+# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
+# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3"
+# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
+# Other options :
+# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
+# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
+# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
+#
+# Or use the _use_auto_optimization with _use_auto_optimization=y
+_processor_opt=
-## Apply Kernel Optimization selecting
-_use_optimization_select=y
+_use_auto_optimization=y
# disable debug to lower the size of the kernel
_disable_debug=y
@@ -248,13 +255,15 @@ prepare() {
echo "Setting config..."
cp ../config .config
- if [ -n "$_use_auto_optimization" ]; then
- "${srcdir}"/auto-cpu-optimization.sh
+ if [ -n "$_processor_opt" ]; then
+ MARCH=$(echo $_processor_opt|tr '[:lower:]' '[:upper:]'&&echo)
+ MARCH2=M${MARCH}
+ scripts/config -k --disable CONFIG_GENERIC_CPU
+ scripts/config -k --enable CONFIG_${MARCH2}
fi
- if [ -n "$_use_optimization_select" ]; then
- source "${startdir}"/configure
- cpu_arch
+ if [ -n "$_use_auto_optimization" ]; then
+ "${srcdir}"/auto-cpu-optimization.sh
fi
### Selecting the CPU scheduler
@@ -794,24 +803,25 @@ for _p in "${pkgname[@]}"; do
}"
done
-sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2'
- 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90'
- '616390dc143695ac216696e86f58beee5df420fb3af22a6a098f7a14aaf5251e'
- '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae'
- '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
- 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
- '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
- 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
- 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
- '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
- '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117'
- '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232'
- '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
- 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd'
- 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2'
- '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425'
- '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
- 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
- '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
- 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
-'be21f15aeb22b2ca1e35e4975590d30736af0483ea7464e3464a60d993e37e22')
+sha256sums=('c70cb405076c3cfd73e4de729430b0342ea21b92a04d8284a03fac664ef1cfea'
+ '83425e8b1553f4ad0d8fdadbad3980b71f7a36742b3238813ff4d00cd3bf08f8'
+ '7a36fe0a53a644ade0ce85f08f9ca2ebaddd47876966b7cc9d4cae8844649271'
+ 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65'
+ '326d129f9435145add756dc967accd56ffe1d8ff1b6650f84d2578c41bd6dfd6'
+ '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2'
+ 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232'
+ '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d'
+ 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521'
+ 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c'
+ '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7'
+ '4b18c6a82b62c50b45568526eeb16ae877c8f52c407a4bb9c6144c07a0d1233a'
+ 'f4ed599589fdd44270229492505f5f88e20d79e93b8044f8041a2fc90486bb4e'
+ '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00'
+ '344806f8ea9f0f7da883e2c27835153944df7a4b15bb3f97ec6b7b7709682f5d'
+ '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79'
+ 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e'
+ '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19'
+ 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb'
+ 'cb2494f5ad43fd260e26d771305dade3f9499fa1ffaf53cb9ef8c19b66dab7d7'
+ 'c89ea5d5791b1cf5227917627a383439b0d8e459f6320372b4758e6f0814ecc6'
+ 'SKIP')
diff --git a/zfs-builtin/auto-cpu-optimization.sh b/zfs-builtin/auto-cpu-optimization.sh
index c0f9036e..4cc1dc47 100755
--- a/zfs-builtin/auto-cpu-optimization.sh
+++ b/zfs-builtin/auto-cpu-optimization.sh
@@ -1,16 +1,6 @@
#!/bin/bash
-
-#######################################
-# AUTO-CPU-OPTIMIZATION #
-#######################################
-# CREATOR : BL4CKH47H4CK3R #
-#######################################
-# HTTPS://GITHUB.COM/BL4CKH47H4CK3R #
-#######################################
-
-CPU=`gcc -Q -march=native --help=target | grep march | awk '{print $2}' | head -1`
-MARCH=`echo ${CPU} | tr '[:lower:]' '[:upper:]'`&& echo
-
+CPU=$(gcc -Q -march=native --help=target|grep mtune=|awk '{print $2}'|head -1)
+MARCH=$(echo $CPU|tr '[:lower:]' '[:upper:]'&&echo)
if [[ ${MARCH} == "ZNVER" ]]
then
MARCH="ZEN"
@@ -27,10 +17,12 @@ elif [[ ${MARCH} == "BDVER2" ]]
then
MARCH="MPILEDRIVER"
fi
-
+MARCH2=M${MARCH}
+echo
echo "----------------------------------"
echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
-sed -i "/CONFIG_GENERIC_CPU=y/d;s/\# CONFIG_M${MARCH} is not set/CONFIG_M${MARCH}=y/g" .config
-sleep 3 && echo
+echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+scripts/config -k --disable CONFIG_GENERIC_CPU
+scripts/config -k --enable CONFIG_${MARCH2}
+sleep 3&&echo