diff --git a/config-option-lib/src/lib.rs b/config-option-lib/src/lib.rs index a272f2f..d903cea 100644 --- a/config-option-lib/src/lib.rs +++ b/config-option-lib/src/lib.rs @@ -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, diff --git a/src/compile_options.json b/src/compile_options.json index baa5037..57bae9a 100644 --- a/src/compile_options.json +++ b/src/compile_options.json @@ -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", diff --git a/src/conf-options-page.ui b/src/conf-options-page.ui index c7e6209..3f116a7 100644 --- a/src/conf-options-page.ui +++ b/src/conf-options-page.ui @@ -521,35 +521,6 @@ - - - - - - - Apply automatic CPU Optimization - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - diff --git a/src/conf-window.cpp b/src/conf-window.cpp index 05c0ad9..618d188 100644 --- a/src/conf-window.cpp +++ b/src/conf-window.cpp @@ -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) @@ -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)); @@ -519,17 +518,13 @@ ConfWindow::ConfWindow(QWidget* parent) /* clang-format off */ QStringList cpu_optims; cpu_optims << "Disabled" - << "Generic" - << "Native AMD" - << "Native Intel" - << "Zen" << "Zen2" << "Zen3" - << "Sandy Bridge" << "Ivy Bridge" << "Haswell" - << "Icelake" << "Tiger Lake" << "Alder Lake"; + << "Native CPU" + << "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" @@ -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); @@ -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); diff --git a/src/config-options.cpp b/src/config-options.cpp index 263925f..2e754dd 100644 --- a/src/config-options.cpp +++ b/src/config-options.cpp @@ -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, @@ -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, diff --git a/src/config-options.hpp b/src/config-options.hpp index 7a31483..3f2990f 100644 --- a/src/config-options.hpp +++ b/src/config-options.hpp @@ -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{};