Skip to content

Commit 35165a2

Browse files
authored
Merge pull request #8210 from The-OpenROAD-Project-staging/grt-cugr-refactor
Grt cugr refactor further
2 parents 2ad7816 + 14141dd commit 35165a2

File tree

19 files changed

+229
-410
lines changed

19 files changed

+229
-410
lines changed

src/grt/src/GlobalRouter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ void GlobalRouter::clear()
141141
GlobalRouter::~GlobalRouter()
142142
{
143143
delete fastroute_;
144+
delete cugr_;
144145
delete grid_;
145146
for (auto [ignored, net] : db_net_map_) {
146147
delete net;

src/grt/src/cugr/include/CUGR.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <csignal>
55
#include <fstream>
66
#include <iostream>
7+
#include <memory>
78
#include <mutex>
89
#include <set>
910
#include <sstream>
@@ -67,20 +68,21 @@ class CUGR
6768
CUGR(odb::dbDatabase* db,
6869
utl::Logger* log,
6970
stt::SteinerTreeBuilder* stt_builder);
71+
~CUGR();
7072
void init(int min_routing_layer, int max_routing_layer);
7173
void route();
72-
void write(const std::string& guide_file = "");
74+
void write(const std::string& guide_file);
7375
NetRouteMap getRoutes();
7476

7577
private:
7678
void sortNetIndices(std::vector<int>& netIndices) const;
7779
void getGuides(const GRNet* net,
78-
std::vector<std::pair<int, grt::BoxT<int>>>& guides);
80+
std::vector<std::pair<int, grt::BoxT>>& guides);
7981
void printStatistics() const;
8082

81-
Design* design_ = nullptr;
82-
GridGraph* grid_graph_ = nullptr;
83-
std::vector<GRNet*> gr_nets_;
83+
std::unique_ptr<Design> design_;
84+
std::unique_ptr<GridGraph> grid_graph_;
85+
std::vector<std::unique_ptr<GRNet>> gr_nets_;
8486

8587
odb::dbDatabase* db_;
8688
utl::Logger* logger_;

0 commit comments

Comments
 (0)