Skip to content

config: Sync CPU related options with 6.15 PKGBUILD #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vnepogodin merged 2 commits into from
May 26, 2025
Merged

config: Sync CPU related options with 6.15 PKGBUILD #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df9de2
ConfigOptions: Remove auto_optim
1Naim May 25, 2025
0867225
cpu_opt_mode: Sync values with PKGBUILD
1Naim May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config-option-lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ mod ffi {
pub hardly_check: bool,
pub per_gov_check: bool,
pub tcp_bbr3_check: bool,
pub auto_optim_check: bool,

pub cachy_config_check: bool,
pub nconfig_check: bool,
Expand Down
1 change: 0 additions & 1 deletion src/compile_options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"hugepage": "_hugepage",
"damon": "_damon",
"cpu_opt": "_processor_opt",
"auto_optim": "_use_auto_optimization",
"lto": "_use_llvm_lto",
"builtin_zfs": "_build_zfs",
"builtin_nvidia": "_build_nvidia",
Expand Down
29 changes: 0 additions & 29 deletions src/conf-options-page.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,35 +521,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="autooptim_widget" native="true">
<layout class="QHBoxLayout" name="autooptim_horizontal_layout">
<item>
<widget class="QLabel" name="autooptim_label">
<property name="text">
<string>Apply automatic CPU Optimization</string>
</property>
</widget>
</item>
<item>
<spacer name="autooptim_horizontal_spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="autooptim_check"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="lto_widget" native="true">
<layout class="QHBoxLayout" name="lto_horizontal_layout">
Expand Down
17 changes: 5 additions & 12 deletions src/conf-window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ GENERATE_CONST_LOOKUP_OPTION_VALUES(tickless_mode, "full", "idle", "perodic")
GENERATE_CONST_LOOKUP_OPTION_VALUES(preempt_mode, "full", "lazy", "voluntary", "none")
GENERATE_CONST_LOOKUP_OPTION_VALUES(lto_mode, "none", "full", "thin")
GENERATE_CONST_LOOKUP_OPTION_VALUES(hugepage_mode, "always", "madvise")
GENERATE_CONST_LOOKUP_OPTION_VALUES(cpu_opt_mode, "manual", "generic", "native_amd", "native_intel", "zen", "zen2", "zen3", "sandybridge", "ivybridge", "haswell", "icelake", "tigerlake", "alderlake")
GENERATE_CONST_LOOKUP_OPTION_VALUES(cpu_opt_mode, "manual", "native", "generic", "generic_v2", "generic_v3", "generic_v4", "zen4")

// NOLINTEND(cppcoreguidelines-macro-usage)

Expand Down Expand Up @@ -409,7 +409,6 @@ std::string ConfWindow::get_all_set_values() const noexcept {
result += convert_to_var_assign_empty_wrapped("hardly", checkstate_checked(options_page_ui_obj->hardly_check));
result += convert_to_var_assign_empty_wrapped("per_gov", checkstate_checked(options_page_ui_obj->perfgovern_check));
result += convert_to_var_assign_empty_wrapped("tcp_bbr3", checkstate_checked(options_page_ui_obj->tcpbbr_check));
result += convert_to_var_assign_empty_wrapped("auto_optim", checkstate_checked(options_page_ui_obj->autooptim_check));

result += convert_to_var_assign_empty_wrapped("cachy_config", checkstate_checked(options_page_ui_obj->cachyconfig_check));
result += convert_to_var_assign_empty_wrapped("nconfig", checkstate_checked(options_page_ui_obj->nconfig_check));
Expand Down Expand Up @@ -519,17 +518,13 @@ ConfWindow::ConfWindow(QWidget* parent)
/* clang-format off */
QStringList cpu_optims;
cpu_optims << "Disabled"
Comment thread
1Naim marked this conversation as resolved.
<< "Generic"
<< "Native AMD"
<< "Native Intel"
<< "Zen" << "Zen2" << "Zen3"
<< "Sandy Bridge" << "Ivy Bridge" << "Haswell"
<< "Icelake" << "Tiger Lake" << "Alder Lake";
<< "Native CPU"
Comment thread
1Naim marked this conversation as resolved.
<< "Generic / x86_64"
<< "x86_64_v2" << "x86_64_v3" << "x86_64_v4"
<< "Zen4";
options_page_ui_obj->processor_opt_combo_box->addItems(cpu_optims);
/* clang-format on */

options_page_ui_obj->autooptim_check->setCheckState(Qt::Checked);

QStringList lto_modes;
lto_modes << "No"
<< "Full"
Expand Down Expand Up @@ -680,7 +675,6 @@ void ConfWindow::on_save() noexcept {
config_options.hardly_check = checkstate_checked(options_page_ui_obj->hardly_check);
config_options.per_gov_check = checkstate_checked(options_page_ui_obj->perfgovern_check);
config_options.tcp_bbr3_check = checkstate_checked(options_page_ui_obj->tcpbbr_check);
config_options.auto_optim_check = checkstate_checked(options_page_ui_obj->autooptim_check);

config_options.cachy_config_check = checkstate_checked(options_page_ui_obj->cachyconfig_check);
config_options.nconfig_check = checkstate_checked(options_page_ui_obj->nconfig_check);
Expand Down Expand Up @@ -744,7 +738,6 @@ void ConfWindow::on_load() noexcept {
set_checkstate(options_page_ui_obj->hardly_check, config_options->hardly_check);
set_checkstate(options_page_ui_obj->perfgovern_check, config_options->per_gov_check);
set_checkstate(options_page_ui_obj->tcpbbr_check, config_options->tcp_bbr3_check);
set_checkstate(options_page_ui_obj->autooptim_check, config_options->auto_optim_check);

set_checkstate(options_page_ui_obj->cachyconfig_check, config_options->cachy_config_check);
set_checkstate(options_page_ui_obj->nconfig_check, config_options->nconfig_check);
Expand Down
2 changes: 0 additions & 2 deletions src/config-options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ auto ConfigOptions::parse_from_file(std::string_view filepath) noexcept -> std::
.hardly_check = rust_config_options.hardly_check,
.per_gov_check = rust_config_options.per_gov_check,
.tcp_bbr3_check = rust_config_options.tcp_bbr3_check,
.auto_optim_check = rust_config_options.auto_optim_check,

.cachy_config_check = rust_config_options.cachy_config_check,
.nconfig_check = rust_config_options.nconfig_check,
Expand Down Expand Up @@ -86,7 +85,6 @@ auto ConfigOptions::write_config_file(const ConfigOptions& config_options, std::
.hardly_check = config_options.hardly_check,
.per_gov_check = config_options.per_gov_check,
.tcp_bbr3_check = config_options.tcp_bbr3_check,
.auto_optim_check = config_options.auto_optim_check,

.cachy_config_check = config_options.cachy_config_check,
.nconfig_check = config_options.nconfig_check,
Expand Down
1 change: 0 additions & 1 deletion src/config-options.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ struct ConfigOptions {
bool hardly_check{};
bool per_gov_check{};
bool tcp_bbr3_check{};
bool auto_optim_check{};

bool cachy_config_check{};
bool nconfig_check{};
Expand Down
Loading