diff --git a/xla/backends/cpu/codegen/ir_compiler.cc b/xla/backends/cpu/codegen/ir_compiler.cc index f8cc6cf307250..e776a2dfbecdc 100644 --- a/xla/backends/cpu/codegen/ir_compiler.cc +++ b/xla/backends/cpu/codegen/ir_compiler.cc @@ -109,7 +109,7 @@ llvm::Expected> IrCompiler::operator()( pto.LoopVectorization = !options_.optimize_for_size; pto.SLPVectorization = !options_.optimize_for_size && !options_.disable_slp_vectorizer; - pto.LoopUnrolling = !options_.disable_loop_unrolling; + pto.LoopUnrolling = options_.enable_loop_unrolling; llvm::LoopAnalysisManager lam; llvm::FunctionAnalysisManager fam; diff --git a/xla/backends/cpu/codegen/ir_compiler.h b/xla/backends/cpu/codegen/ir_compiler.h index 2430de1fcef83..2436e76c5ffa4 100644 --- a/xla/backends/cpu/codegen/ir_compiler.h +++ b/xla/backends/cpu/codegen/ir_compiler.h @@ -61,7 +61,7 @@ class IrCompiler : public llvm::orc::IRCompileLayer::IRCompiler { bool disable_expensive_passes = false; bool disable_slp_vectorizer = false; - bool disable_loop_unrolling = false; + bool enable_loop_unrolling = false; bool dfsan_enabled = false; std::vector dfsan_abi_list_files; diff --git a/xla/backends/cpu/testlib/kernel_runner.cc b/xla/backends/cpu/testlib/kernel_runner.cc index 94465c0f0cb4d..00653c3637aa7 100644 --- a/xla/backends/cpu/testlib/kernel_runner.cc +++ b/xla/backends/cpu/testlib/kernel_runner.cc @@ -104,7 +104,7 @@ absl::StatusOr KernelRunner::CreateJitCompiler( /*disable_expensive_passes=*/ debug_options.xla_llvm_disable_expensive_passes(), /*slp_vectorizer_disabled=*/options::SlpVectorizerDisabled(config), - /*disable_loop_unrolling=*/options::DisableLoopUnrolling(config), + /*enable_loop_unrolling=*/options::EnableLoopUnrolling(config), }; IrCompiler::CompilationHooks ir_compiler_hooks; diff --git a/xla/service/cpu/cpu_compiler.cc b/xla/service/cpu/cpu_compiler.cc index 9e74c529a3c9a..e9155390c4df2 100644 --- a/xla/service/cpu/cpu_compiler.cc +++ b/xla/service/cpu/cpu_compiler.cc @@ -1354,7 +1354,7 @@ CpuCompiler::CompileCpuExecutable(std::unique_ptr module) { /*disable_expensive_passes=*/ debug_options.xla_llvm_disable_expensive_passes(), /*slp_vectorizer_disabled=*/options::SlpVectorizerDisabled(config), - /*disable_loop_unrolling=*/options::DisableLoopUnrolling(config), + /*enable_loop_unrolling=*/options::EnableLoopUnrolling(config), }; // Compiler hooks to intercept compiled LLVM IR modules. @@ -1956,8 +1956,8 @@ CpuCompiler::CompileAheadOfTime(std::unique_ptr module_group, module->config().debug_options().xla_llvm_disable_expensive_passes(), /*disable_slp_vectorizer=*/ options::SlpVectorizerDisabled(module->config()), - /*disable_loop_unrolling=*/ - options::DisableLoopUnrolling(module->config()), + /*enable_loop_unrolling=*/ + options::EnableLoopUnrolling(module->config()), /*dfsan_enabled=*/aot_options.sanitize_dataflow(), /*dfsan_abilists_enabled=*/aot_options.sanitize_abilists_dataflow()}; diff --git a/xla/service/cpu/cpu_options.cc b/xla/service/cpu/cpu_options.cc index 41c9886aad10c..6d953a9292312 100644 --- a/xla/service/cpu/cpu_options.cc +++ b/xla/service/cpu/cpu_options.cc @@ -35,7 +35,7 @@ const char* const kXlaForceEnableExperimentalLlvmIrGemm = "xla_force_enable_experimental_llvm_ir_gemm"; const char* const kLlvmIrGemmTileSize = "xla_llvm_ir_gemm_tile_size"; const char* const kDisableSlpVectorizer = "xla_cpu_disable_slp_vectorizer"; -const char* const kDisableLoopUnrolling = "xla_cpu_disable_loop_unrolling"; +const char* const kEnableLoopUnrolling = "xla_cpu_enable_loop_unrolling"; } // namespace @@ -61,10 +61,10 @@ bool SlpVectorizerDisabled(const HloModuleConfig& config) { return extra_options_map.count(kDisableSlpVectorizer) > 0; } -bool DisableLoopUnrolling(const HloModuleConfig& config) { +bool EnableLoopUnrolling(const HloModuleConfig& config) { const auto& extra_options_map = config.debug_options().xla_backend_extra_options(); - return extra_options_map.count(kDisableLoopUnrolling) > 0; + return extra_options_map.count(kEnableLoopUnrolling) > 0; } std::optional LlvmIrGemvTilingFactor(const HloModuleConfig& config) { diff --git a/xla/service/cpu/cpu_options.h b/xla/service/cpu/cpu_options.h index 4cb1d369fab4d..1ab7d082b17dc 100644 --- a/xla/service/cpu/cpu_options.h +++ b/xla/service/cpu/cpu_options.h @@ -32,7 +32,7 @@ namespace options { bool OptimizeForSizeRequested(const HloModuleConfig& config); bool VectorizedReduceDisabled(const HloModuleConfig& config); bool SlpVectorizerDisabled(const HloModuleConfig& config); -bool DisableLoopUnrolling(const HloModuleConfig& config); +bool EnableLoopUnrolling(const HloModuleConfig& config); bool ForceEnableExperimentalLlvmIrGemm(const HloModuleConfig& config); std::optional LlvmIrGemvTilingFactor(const HloModuleConfig& config); std::optional> LlvmIrGemmTileSize(