From 4d424fd431bbf5f1decf516cadf606fda971e099 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 10 Oct 2024 10:47:15 -0700 Subject: [PATCH] Use same parameter name in declaration and implementation. clang-tidy finding [readability-inconsistent-declaration-parameter-name] #xls-build-gardener PiperOrigin-RevId: 684499536 --- xls/contrib/integrator/ir_integrator.h | 1 + xls/contrib/mlir/IR/xls_ops.cc | 8 ++++---- xls/dslx/ir_convert/ir_converter.h | 2 +- xls/ir/block.cc | 6 +++--- xls/jit/function_jit.cc | 6 +++--- xls/jit/ir_builder_visitor.cc | 2 +- xls/public/c_api.cc | 6 +++--- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/xls/contrib/integrator/ir_integrator.h b/xls/contrib/integrator/ir_integrator.h index 6c16153cce..fb546ad05b 100644 --- a/xls/contrib/integrator/ir_integrator.h +++ b/xls/contrib/integrator/ir_integrator.h @@ -245,6 +245,7 @@ class IntegrationFunction { // Helper function for UnifyIntegrationNodesWithGlobalMuxSelect that handles // the cases that one of the input nodes is a pre-existing mux. The other // input is a node that will be added as a case(s) to the mux. + // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) absl::StatusOr UnifyIntegrationNodesWithGlobalMuxSelectNoMuxArg( Node* mux, Node* case_node); diff --git a/xls/contrib/mlir/IR/xls_ops.cc b/xls/contrib/mlir/IR/xls_ops.cc index fd43b9a331..939c8355d1 100644 --- a/xls/contrib/mlir/IR/xls_ops.cc +++ b/xls/contrib/mlir/IR/xls_ops.cc @@ -316,7 +316,7 @@ LogicalResult TupleOp::inferReturnTypes( } void ForOp::getAsmBlockArgumentNames(Region& region, - OpAsmSetValueNameFn setFn) { + OpAsmSetValueNameFn setNameFn) { for (auto& block : region.getBlocks()) { if (block.getArguments().size() != getInits().size() + getInvariants().size() + 1) { @@ -324,12 +324,12 @@ void ForOp::getAsmBlockArgumentNames(Region& region, return; } int argNum = 0; - setFn(block.getArgument(argNum++), "indvar"); + setNameFn(block.getArgument(argNum++), "indvar"); for (auto _ : getInits()) { - setFn(block.getArgument(argNum++), "carry"); + setNameFn(block.getArgument(argNum++), "carry"); } for (auto _ : getInvariants()) { - setFn(block.getArgument(argNum++), "invariant"); + setNameFn(block.getArgument(argNum++), "invariant"); } } } diff --git a/xls/dslx/ir_convert/ir_converter.h b/xls/dslx/ir_convert/ir_converter.h index 7c7dbb53d8..9349a6231f 100644 --- a/xls/dslx/ir_convert/ir_converter.h +++ b/xls/dslx/ir_convert/ir_converter.h @@ -48,7 +48,7 @@ absl::StatusOr ConvertModuleToPackage( // inside of it, it may not be nullptr. absl::Status ConvertModuleIntoPackage(Module* module, ImportData* import_data, const ConvertOptions& options, - PackageConversionData* conv); + PackageConversionData* package); // Wrapper around ConvertModuleToPackage that converts to IR text. absl::StatusOr ConvertModule(Module* module, diff --git a/xls/ir/block.cc b/xls/ir/block.cc index 91f594261f..406d94c1f1 100644 --- a/xls/ir/block.cc +++ b/xls/ir/block.cc @@ -713,7 +713,7 @@ absl::Span Block::GetInstantiationOutputs( absl::StatusOr Block::Clone( std::string_view new_name, Package* target_package, const absl::flat_hash_map& reg_name_map, - const absl::flat_hash_map& block_instantation_map) + const absl::flat_hash_map& block_instantiation_map) const { absl::flat_hash_map original_to_clone; absl::flat_hash_map register_map; @@ -757,13 +757,13 @@ absl::StatusOr Block::Clone( XLS_ASSIGN_OR_RETURN(BlockInstantiation * block_inst, inst->AsBlockInstantiation()); Block* new_inst; - if (!block_instantation_map.contains(block_inst->instantiated_block())) { + if (!block_instantiation_map.contains(block_inst->instantiated_block())) { XLS_RET_CHECK_EQ(target_package, package()) << "No definition of block " << block_inst->name() << "(" << block_inst->instantiated_block()->name() << ") provided."; new_inst = block_inst->instantiated_block(); } else { - new_inst = block_instantation_map.at(block_inst->instantiated_block()); + new_inst = block_instantiation_map.at(block_inst->instantiated_block()); } XLS_ASSIGN_OR_RETURN( instantiation_map[inst], diff --git a/xls/jit/function_jit.cc b/xls/jit/function_jit.cc index e002e51a79..2ed3b7848e 100644 --- a/xls/jit/function_jit.cc +++ b/xls/jit/function_jit.cc @@ -102,11 +102,11 @@ absl::StatusOr FunctionJit::CreateObjectCode( } absl::StatusOr> FunctionJit::CreateInternal( - Function* xls_function, int64_t opt_level, bool has_observer_callbacks, + Function* xls_function, int64_t opt_level, bool include_observer_callbacks, JitObserver* jit_observer) { XLS_ASSIGN_OR_RETURN( auto orc_jit, - OrcJit::Create(opt_level, has_observer_callbacks, jit_observer)); + OrcJit::Create(opt_level, include_observer_callbacks, jit_observer)); XLS_ASSIGN_OR_RETURN(llvm::DataLayout data_layout, orc_jit->CreateDataLayout()); XLS_ASSIGN_OR_RETURN(auto function_base, @@ -114,7 +114,7 @@ absl::StatusOr> FunctionJit::CreateInternal( return std::unique_ptr(new FunctionJit( xls_function, std::move(orc_jit), std::move(function_base), - has_observer_callbacks, std::make_unique(data_layout))); + include_observer_callbacks, std::make_unique(data_layout))); } absl::StatusOr> FunctionJit::Run( diff --git a/xls/jit/ir_builder_visitor.cc b/xls/jit/ir_builder_visitor.cc index 63ec8c2ca6..78d69ac0ee 100644 --- a/xls/jit/ir_builder_visitor.cc +++ b/xls/jit/ir_builder_visitor.cc @@ -727,7 +727,7 @@ class NodeIrContext { void FinalizeWithValue(llvm::Value* result, std::optional*> exit_builder, std::optional return_value, - std::optional result_type = std::nullopt); + std::optional return_type = std::nullopt); void FinalizeWithPointerToValue( llvm::Value* result_buffer, std::optional*> exit_builder, diff --git a/xls/public/c_api.cc b/xls/public/c_api.cc index e9c52721d7..88c7d90382 100644 --- a/xls/public/c_api.cc +++ b/xls/public/c_api.cc @@ -324,15 +324,15 @@ bool xls_function_get_name(struct xls_function* function, char** error_out, } bool xls_function_get_type(struct xls_function* function, char** error_out, - xls_function_type** result_out) { + xls_function_type** xls_fn_type_out) { CHECK(function != nullptr); CHECK(error_out != nullptr); - CHECK(result_out != nullptr); + CHECK(xls_fn_type_out != nullptr); xls::Function* xls_function = reinterpret_cast(function); xls::FunctionType* type = xls_function->GetType(); *error_out = nullptr; - *result_out = reinterpret_cast(type); + *xls_fn_type_out = reinterpret_cast(type); return true; }