Skip to content

Manual Moves Timing #1795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Sep 2, 2021
Merged

Manual Moves Timing #1795

Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
69d8729
Made a Manual moves check button on the GU and currently making a win…
May 16, 2021
96f214d
Implemented the user input window, the toggle button in the UI and ev…
May 21, 2021
9f43410
Merge branch 'master' of https://github.com/verilog-to-routing/vtr-ve…
May 21, 2021
3a78b83
Adding the manual moves functions
Jun 4, 2021
accf0e1
Fixed segmentation faults and added new gtk features
Jun 22, 2021
3bbbfe3
Changes to manual moves feature
Jun 22, 2021
591c477
Checking if the move genrator handles DSP and RAM block movements
Jun 23, 2021
86cc753
Changed the manual move toggle button in layout
Jun 23, 2021
5dc28a8
Fixed gtk errors and changed the size of the button
Jun 23, 2021
15174ed
Fixed git conflicts after merge
Jun 23, 2021
19be5b3
Reduced number of calls to manual move toggle button, to reduce runtime.
Jun 28, 2021
2c6f1a6
Reverting to commit 15174ed55 (version without segmentation faults)
Jun 29, 2021
f9f51e6
Reduced the amount of manual move enable in try_swap function. No seg…
Jun 30, 2021
ee75455
Added timer class to analyze code for manual moves. Will delete later
Jul 7, 2021
c930caf
Reduced the timing in manual moves in place.cpp by changing the manua…
Jul 13, 2021
38e1371
Used make format to format code
Jul 13, 2021
02f9975
Solved warnings for ManualMoveGenerator class and added code guards t…
Jul 13, 2021
ca0a766
Fixed gtk warnings
Jul 13, 2021
8561ffc
Implemented separate function to check legality. Now included in manu…
Jul 14, 2021
59fa37d
Added NO_GRAPHICS guards in place.cpp for manual moves
Jul 15, 2021
f90bee8
Moved manual move generator to a new file and added NO_GRAPHICS on dr…
Jul 15, 2021
37eacf6
Added no graphics guards to manual move generator files.
Jul 15, 2021
6f42dfa
Changed guards in place.cpp
Jul 15, 2021
1ab758b
Added manual move generator code to RL_agent_util.cpp
Jul 16, 2021
db883b5
Deleted timer class used for testing and disbaled NO_GRAPHICS code fo…
Jul 16, 2021
d19dede
Changed position of NO_GRAPHICS in place.cpp
Jul 16, 2021
fe60cb0
Changed NO_GRAPHICS in manual move. Should be able to compile now
Jul 16, 2021
11fd6ae
Removed NO_GRAPHICS from the manual move generator.h
Jul 16, 2021
0f8a85e
Changes for Basic with nO_GRAPHICS test
Jul 16, 2021
e5266ef
Put guards around include libraries in manul move.h
Jul 16, 2021
0ad8714
Moved move_utils.h header file in manual move.h
Jul 16, 2021
8fcac35
Commented all the files with manual move code
Jul 19, 2021
1adeccd
Moved the manual moves global variable to draw state struct
Jul 20, 2021
03a1d14
Testing our graphics compilation guards
Jul 20, 2021
2892dc4
Moving the NO_GRAPHICS guards in place.cpp
Jul 20, 2021
94808cb
Moved the graphics guard in manual_move_generator.cpp
Jul 20, 2021
1284d5d
Reverting to commit 8fcac3554
Jul 20, 2021
1ea9fb2
Changed function declaration order in manual moves
Jul 20, 2021
d27116f
Fixed gtk warnings when --disp off
Jul 21, 2021
e09142c
Pulled from master
Jul 26, 2021
7a2f521
Adding global variables from manualmoves to draw_state struct
Jul 27, 2021
f213797
Changed position of NO_GRAPHICS to accomodate t_draw_state struct
Jul 27, 2021
fc2f482
Changed the manual move flag in place.cpp
Jul 28, 2021
0f24f1c
Fixed typo in compilation guards
Jul 28, 2021
d421ed7
Fixed segmentation fault caused by move_type data structure
Aug 13, 2021
8d7bafd
Merge branch 'master' into manual_moves
Aug 13, 2021
df73c46
Changed placement of manual move move type in place.cpp, in case the …
Aug 16, 2021
4659a04
Changed code based on the changes requested from the PR
Aug 22, 2021
59bf855
Changed move generator file definitions with manual moves.
Aug 25, 2021
464f7da
Added another helper file for place.cpp
Sep 1, 2021
16d4c5b
Formatting code
Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions vpr/main.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
<property name="height">1</property>
</packing>
</child>
<child>
<child>
<object class="GtkGrid" id="checkboxes">
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down Expand Up @@ -229,8 +229,8 @@
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
</child>
<child>
<object class="GtkCheckButton" id="clipRoutingUtil">
<property name="label" translatable="yes">Clip Routing Util</property>
<property name="visible">True</property>
Expand All @@ -247,14 +247,31 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="manualMove">
<property name="label" translatable="yes">Manual Move</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>

</object>
<packing>
<property name="left_attach">4</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</child>
<child>
<placeholder/>
</child>
Expand Down
915 changes: 624 additions & 291 deletions vpr/src/draw/draw.cpp
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions vpr/src/draw/draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# include "draw_color.h"
# include "search_bar.h"
# include "draw_debug.h"
# include "manual_moves.h"

extern ezgl::application::settings settings;
extern ezgl::application application;
Expand Down
7 changes: 6 additions & 1 deletion vpr/src/draw/draw_debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/** This file contains all functions reagrding the graphics related to the setting of place and route breakpoints **/
#ifndef DRAW_DEBUG_H
#define DRAW_DEBUG_H

#ifndef NO_GRAPHICS

# include "breakpoint.h"
Expand Down Expand Up @@ -35,4 +38,6 @@ void invalid_breakpoint_entry_window(std::string error);
bool valid_expression(std::string exp);
void breakpoint_info_window(std::string bpDescription, BreakpointState draw_breakpoint_state, bool in_placer);

#endif
#endif /*NO_GRAPHICS*/

#endif /*DRAW_DEBUG_H*/
2 changes: 2 additions & 0 deletions vpr/src/draw/draw_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
# include "vtr_color_map.h"
# include "vtr_vector.h"
# include "breakpoint.h"
# include "manual_moves.h"

# include "ezgl/point.hpp"
# include "ezgl/rectangle.hpp"
Expand Down Expand Up @@ -196,6 +197,7 @@ struct t_draw_state {
int sequence_number = 0;
float net_alpha = 0.1;
float pres_fac = 1.;
ManualMovesGlobals manual_moves_global;

std::vector<Breakpoint> list_of_breakpoints;

Expand Down
Loading