diff --git a/openfpga/src/annotation/device_rr_gsb.cpp b/openfpga/src/annotation/device_rr_gsb.cpp index fdf7b9a74..d2eb8da29 100644 --- a/openfpga/src/annotation/device_rr_gsb.cpp +++ b/openfpga/src/annotation/device_rr_gsb.cpp @@ -175,9 +175,9 @@ void DeviceRRGSB::reserve(const vtr::Point& coordinate) { void DeviceRRGSB::reserve_unique_modules() { /* As rr_gsb_ has been built, it has valid size. Will reserve space for unique * blocks according to rr_gsb_'s size*/ - sb_unique_module_id_.resize(rr_gsb_.x()); - cbx_unique_module_id_.resize(rr_gsb_.x()); - cby_unique_module_id_.resize(rr_gsb_.x()); + sb_unique_module_id_.resize(rr_gsb_.size()); + cbx_unique_module_id_.resize(rr_gsb_.size()); + cby_unique_module_id_.resize(rr_gsb_.size()); for (std::size_t i = 0; i < rr_gsb_.size(); ++i) { sb_unique_module_id_[i].resize(rr_gsb_[i].size()); diff --git a/openfpga/src/annotation/device_rr_gsb.h b/openfpga/src/annotation/device_rr_gsb.h index ff3a604b1..03c99e6af 100644 --- a/openfpga/src/annotation/device_rr_gsb.h +++ b/openfpga/src/annotation/device_rr_gsb.h @@ -76,9 +76,7 @@ class DeviceRRGSB { void reserve( const vtr::Point& coordinate); /* Pre-allocate the rr_switch_block array that the device requires */ - void reserve_unique_modules( - const vtr::Point& - coordinate); /* Pre-allocate the rr_sb_unique_module_id matrix that the + void reserve_unique_modules(); /* Pre-allocate the rr_sb_unique_module_id matrix that the device requires */ void resize_upon_need( const vtr::Point& diff --git a/openfpga/src/annotation/read_xml_unique_blocks.cpp b/openfpga/src/annotation/read_xml_unique_blocks.cpp index 88a30280c..8abcaf3cd 100644 --- a/openfpga/src/annotation/read_xml_unique_blocks.cpp +++ b/openfpga/src/annotation/read_xml_unique_blocks.cpp @@ -118,7 +118,7 @@ int read_xml_unique_blocks(DeviceRRGSB& device_rr_gsb, const char* file_name, /* clear unique modules & reserve memory to relavant vectors */ device_rr_gsb.clear_unique_modules(); // vtr::Point grid_coord(rr_gsb_.size()); - device_rr_gsb.reserve_unique_modules(grid_coord); + device_rr_gsb.reserve_unique_modules(); /* load unique blocks xml file and set up device_rr_gdb */ for (pugi::xml_node xml_block_info : xml_root.children()) { diff --git a/openfpga/src/annotation/write_xml_unique_blocks.cpp b/openfpga/src/annotation/write_xml_unique_blocks.cpp index c664d6760..65c69e355 100644 --- a/openfpga/src/annotation/write_xml_unique_blocks.cpp +++ b/openfpga/src/annotation/write_xml_unique_blocks.cpp @@ -123,7 +123,7 @@ void report_unique_module_status_write(const DeviceRRGSB& device_rr_gsb, int write_xml_unique_blocks(const DeviceRRGSB& device_rr_gsb, const char* fname, bool verbose_output) { vtr::ScopedStartFinishTimer timer("Write unique blocks..."); - if (device_rr_gsb.get_is_dirty_flag() == false) { + if (device_rr_gsb.is_compressed() == false) { VTR_LOG_ERROR("unique_blocks are empty!"); return CMD_EXEC_FATAL_ERROR; }