From 8ffaffb481028f397d6ed43c35294c0fe458c8e7 Mon Sep 17 00:00:00 2001 From: Zihao Yu Date: Thu, 8 Feb 2024 10:11:55 +0800 Subject: [PATCH] merge pr pulls/3 --- src/database/data/design/db_design/IdbPins.cpp | 2 +- src/database/data/design/db_layout/IdbViaMaster.cpp | 4 ++-- src/database/manager/builder/def_builder/def_read.cpp | 6 +++--- .../source/module/congestion/CongestionEval.cpp | 8 ++++---- src/interface/tcl/tcl_feature/tcl_feature.cpp | 2 +- .../iPL/source/module/grid_manager/GridManager.hh | 2 +- src/platform/data_manager/idm_design_inst_replace.cpp | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/database/data/design/db_design/IdbPins.cpp b/src/database/data/design/db_design/IdbPins.cpp index 3555606ae..0787dcfa9 100644 --- a/src/database/data/design/db_design/IdbPins.cpp +++ b/src/database/data/design/db_design/IdbPins.cpp @@ -679,7 +679,7 @@ void IdbPins::checkPins() { std::set pin_name_set; for (auto it = _pin_list.begin(); it != _pin_list.end();) { - int pin_num = pin_name_set.size(); + size_t pin_num = pin_name_set.size(); auto pin = *it; std::string name = pin->get_pin_name(); if (pin->get_instance() != nullptr) { diff --git a/src/database/data/design/db_layout/IdbViaMaster.cpp b/src/database/data/design/db_layout/IdbViaMaster.cpp index 4c5b5cd0c..e3480d9fd 100644 --- a/src/database/data/design/db_layout/IdbViaMaster.cpp +++ b/src/database/data/design/db_layout/IdbViaMaster.cpp @@ -98,7 +98,7 @@ void IdbViaMasterRulePattern::parse_pattern_row_value(size_t row_index, string v } int col_index = 0; - int str_index = 0; + size_t str_index = 0; bool b_result = true; while (b_result && str_index < value.length()) { char char_value = value.at(str_index); @@ -123,7 +123,7 @@ void IdbViaMasterRulePattern::parse_pattern_row_value(size_t row_index, string v } } - int a = 0; + //int a = 0; } bool IdbViaMasterRulePattern::save_pattern_value(char value, int row_index, int& col_index) diff --git a/src/database/manager/builder/def_builder/def_read.cpp b/src/database/manager/builder/def_builder/def_read.cpp index be74edbc7..fdc06c9f7 100644 --- a/src/database/manager/builder/def_builder/def_read.cpp +++ b/src/database/manager/builder/def_builder/def_read.cpp @@ -1266,8 +1266,8 @@ int32_t DefRead::parse_special_net(defiNet* def_net) } IdbDesign* design = _def_service->get_design(); // Def - IdbLayout* layout = _def_service->get_layout(); // Lef - IdbLayers* layer_list = layout->get_layers(); + //IdbLayout* layout = _def_service->get_layout(); // Lef + //IdbLayers* layer_list = layout->get_layers(); IdbPins* io_pin_list = design->get_io_pin_list(); IdbInstanceList* instance_list = design->get_instance_list(); @@ -1439,7 +1439,7 @@ int32_t DefRead::parse_special_net_wire(defiNet* def_net, IdbSpecialWireList* wi int32_t DefRead::parse_special_net_rects(defiNet* def_net, IdbSpecialWireList* wire_list) { - IdbDesign* design = _def_service->get_design(); // Def + //IdbDesign* design = _def_service->get_design(); // Def IdbLayout* layout = _def_service->get_layout(); // Lef IdbLayers* layer_list = layout->get_layers(); diff --git a/src/evaluation/source/module/congestion/CongestionEval.cpp b/src/evaluation/source/module/congestion/CongestionEval.cpp index ab67113a4..965a8d7cc 100644 --- a/src/evaluation/source/module/congestion/CongestionEval.cpp +++ b/src/evaluation/source/module/congestion/CongestionEval.cpp @@ -148,7 +148,7 @@ void CongestionEval::initCongNetList() auto* idb_builder = dmInst->get_idb_builder(); idb::IdbDesign* idb_design = idb_builder->get_def_service()->get_design(); - for (int i = 0; i < idb_design->get_net_list()->get_net_list().size(); i++) { + for (size_t i = 0; i < idb_design->get_net_list()->get_net_list().size(); i++) { auto* idb_net = idb_design->get_net_list()->get_net_list()[i]; std::string net_name = fixSlash(idb_net->get_net_name()); CongNet* net_ptr = new CongNet(); @@ -231,7 +231,7 @@ void CongestionEval::mapNetCoord2Grid() bin->clear_net_list(); } - for (int k = 0; k < _cong_net_list.size(); k++) { + for (size_t k = 0; k < _cong_net_list.size(); k++) { auto& net = _cong_net_list[k]; if (net->get_pin_list().size() == 1) { continue; @@ -620,14 +620,14 @@ vector>> CongestionEval::evalNetSize() void CongestionEval::evalNetCong(RUDY_TYPE rudy_type, DIRECTION direction) { - for (int i = 0; i < _cong_grid->get_bin_list().size(); i++) { + for (size_t i = 0; i < _cong_grid->get_bin_list().size(); i++) { auto& bin = _cong_grid->get_bin_list()[i]; bin->set_net_cong(0.0); bin->set_h_net_cong(0.0); bin->set_v_net_cong(0.0); } - for (int i = 0; i < _cong_grid->get_bin_list().size(); i++) { + for (size_t i = 0; i < _cong_grid->get_bin_list().size(); i++) { auto& bin = _cong_grid->get_bin_list()[i]; int32_t overlap_area = 0; double congestion = 0.0; diff --git a/src/interface/tcl/tcl_feature/tcl_feature.cpp b/src/interface/tcl/tcl_feature/tcl_feature.cpp index 31496fd5f..15bc585d0 100644 --- a/src/interface/tcl/tcl_feature/tcl_feature.cpp +++ b/src/interface/tcl/tcl_feature/tcl_feature.cpp @@ -47,7 +47,7 @@ CmdFeatureSummary::CmdFeatureSummary(const char* cmd_name) : TclCmd(cmd_name) unsigned CmdFeatureSummary::check() { TclOption* path_option = getOptionOrArg(TCL_PATH); - TclOption* step_option = getOptionOrArg(TCL_STEP); + //TclOption* step_option = getOptionOrArg(TCL_STEP); LOG_FATAL_IF(!path_option); // LOG_FATAL_IF(!step_option); return 1; diff --git a/src/operation/iPL/source/module/grid_manager/GridManager.hh b/src/operation/iPL/source/module/grid_manager/GridManager.hh index d892810b5..c73618db2 100644 --- a/src/operation/iPL/source/module/grid_manager/GridManager.hh +++ b/src/operation/iPL/source/module/grid_manager/GridManager.hh @@ -159,9 +159,9 @@ class GridManager Rectangle _shape; int32_t _grid_cnt_x = -1; int32_t _grid_cnt_y = -1; - float _available_ratio; int32_t _grid_size_x = -1; int32_t _grid_size_y = -1; + float _available_ratio = 0.f; float _h_util_max = 0.f; float _v_util_max = 0.f; float _h_util_sum = 0.f; diff --git a/src/platform/data_manager/idm_design_inst_replace.cpp b/src/platform/data_manager/idm_design_inst_replace.cpp index 0c9edee2e..13d4f4fdb 100644 --- a/src/platform/data_manager/idm_design_inst_replace.cpp +++ b/src/platform/data_manager/idm_design_inst_replace.cpp @@ -95,7 +95,7 @@ bool DataManager::place_macro_loc_rand(std::string tcl_path) int lly = _layout->get_die()->get_bounding_box()->get_low_y(); int urx = _layout->get_die()->get_bounding_box()->get_high_x(); int ury = _layout->get_die()->get_bounding_box()->get_high_y(); - double Avaliable_area = (double) (urx - llx) * (double) (ury - lly); + //double Avaliable_area = (double) (urx - llx) * (double) (ury - lly); // std::cout << " grid_width = " << grid_width << " grid_height = " << grid_height << std::endl; // std::cout << " llx = " << llx << " lly = " << lly << " urx = " << urx << " ury = " << ury << std::endl; @@ -164,7 +164,7 @@ bool DataManager::place_macro_loc_rand(std::string tcl_path) } // 跟已有单元计算重叠 - for (int j = 0; j < i; j++) { + for (size_t j = 0; j < i; j++) { int left_bound = static_cast(std::ceil( ((Avaliable_macro[j].center_x - Avaliable_macro[j].width / 2 - Avaliable_macro[i].width / 2) - grid_width / 2) / grid_width)); int right_bound = static_cast(std::floor( -- Gitee