Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B-ASIC - Better ASIC Toolbox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computer Engineering
B-ASIC - Better ASIC Toolbox
Commits
7adb32c2
Commit
7adb32c2
authored
2 years ago
by
Oscar Gustafsson
Browse files
Options
Downloads
Patches
Plain Diff
Show slack in scheduler GUI info and fix issues introduced yesterday
parent
e006be9f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!160
Show slack in scheduler GUI info and fix issues introduced yesterday
Pipeline
#88825
passed
2 years ago
Stage: test
Stage: deploy
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
b_asic/schedule.py
+27
-2
27 additions, 2 deletions
b_asic/schedule.py
b_asic/scheduler_gui/main_window.py
+19
-0
19 additions, 0 deletions
b_asic/scheduler_gui/main_window.py
b_asic/scheduler_gui/scheduler_event.py
+7
-3
7 additions, 3 deletions
b_asic/scheduler_gui/scheduler_event.py
with
53 additions
and
5 deletions
b_asic/schedule.py
+
27
−
2
View file @
7adb32c2
...
...
@@ -337,7 +337,10 @@ class Schedule:
(
backward_slack
,
forward_slack
)
=
self
.
slacks
(
graph_id
)
if
not
-
backward_slack
<=
time
<=
forward_slack
:
raise
ValueError
raise
ValueError
(
f
"
Operation
{
graph_id
}
got incorrect move:
{
time
}
. Must be
"
f
"
between
{
-
backward_slack
}
and
{
forward_slack
}
.
"
)
tmp_start
=
self
.
_start_times
[
graph_id
]
+
time
new_start
=
tmp_start
%
self
.
_schedule_time
...
...
@@ -354,9 +357,16 @@ class Schedule:
prev_available
=
tmp_prev_available
%
self
.
_schedule_time
laps
=
new_slack
//
self
.
_schedule_time
if
new_usage
<
prev_available
:
print
(
"
Incrementing input laps 1
"
)
laps
+=
1
if
prev_available
==
0
and
new_usage
==
0
:
print
(
"
Incrementing input laps 2
"
)
laps
+=
1
print
(
[
"
Input
"
,
time
,
tmp_start
,
signal_slack
,
new_slack
,
old_laps
,
...
...
@@ -381,8 +391,23 @@ class Schedule:
laps
=
new_slack
//
self
.
_schedule_time
if
next_usage
<
new_available
:
laps
+=
1
if
new_available
==
0
and
new_slack
>
0
:
print
(
"
Incrementing output laps 1
"
)
if
new_available
==
0
and
(
new_slack
>
0
or
next_usage
==
0
):
print
(
"
Incrementing output laps 2
"
)
laps
+=
1
print
(
[
"
Output
"
,
signal_slack
,
new_slack
,
old_laps
,
laps
,
new_available
,
next_usage
,
tmp_available
,
tmp_next_usage
,
]
)
self
.
_laps
[
signal
.
graph_id
]
=
laps
# Set new start time
...
...
This diff is collapsed.
Click to expand it.
b_asic/scheduler_gui/main_window.py
+
19
−
0
View file @
7adb32c2
...
...
@@ -482,6 +482,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self
.
_graph
.
_signals
.
component_selected
.
connect
(
self
.
info_table_update_component
)
self
.
_graph
.
_signals
.
component_moved
.
connect
(
self
.
info_table_update_component
)
self
.
_graph
.
_signals
.
schedule_time_changed
.
connect
(
self
.
info_table_update_schedule
)
...
...
@@ -590,6 +593,22 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self
.
info_table
.
setItem
(
si
,
1
,
QTableWidgetItem
(
str
(
value
)))
si
+=
1
self
.
info_table
.
insertRow
(
si
)
self
.
info_table
.
setItem
(
si
,
0
,
QTableWidgetItem
(
"
Forward slack
"
))
self
.
info_table
.
setItem
(
si
,
1
,
QTableWidgetItem
(
str
(
self
.
schedule
.
forward_slack
(
graph_id
)))
)
si
+=
1
self
.
info_table
.
insertRow
(
si
)
self
.
info_table
.
setItem
(
si
,
0
,
QTableWidgetItem
(
"
Backward slack
"
))
self
.
info_table
.
setItem
(
si
,
1
,
QTableWidgetItem
(
str
(
self
.
schedule
.
backward_slack
(
graph_id
))),
)
si
+=
1
def
info_table_clear
(
self
)
->
None
:
"""
Clears the info table.
"""
self
.
info_table_clear_component
()
...
...
This diff is collapsed.
Click to expand it.
b_asic/scheduler_gui/scheduler_event.py
+
7
−
3
View file @
7adb32c2
...
...
@@ -42,6 +42,7 @@ class SchedulerEvent: # PyQt5
component_selected
=
Signal
(
str
)
schedule_time_changed
=
Signal
()
component_moved
=
Signal
(
str
)
_axes
:
Optional
[
AxesItem
]
_current_pos
:
QPointF
...
...
@@ -152,8 +153,10 @@ class SchedulerEvent: # PyQt5
f
"
from an
'
{
type
(
item
).
__name__
}
'
object.
"
)
handler
(
event
)
return
True
if
handler
is
not
None
:
handler
(
event
)
return
True
return
False
#################################
# Event Handlers: OperationItem #
...
...
@@ -256,7 +259,7 @@ class SchedulerEvent: # PyQt5
"""
Change the cursor to OpenHandCursor when releasing an object.
"""
item
:
OperationItem
=
self
.
scene
().
mouseGrabberItem
()
self
.
set_item_inactive
(
item
)
self
.
set_new_starttime
(
item
)
self
.
set_new_start
_
time
(
item
)
pos_x
=
item
.
x
()
redraw
=
False
if
pos_x
<
0
:
...
...
@@ -268,6 +271,7 @@ class SchedulerEvent: # PyQt5
if
redraw
:
item
.
setX
(
pos_x
)
self
.
_redraw_lines
(
item
)
self
.
_signals
.
component_moved
.
emit
(
item
.
graph_id
)
def
operation_mouseDoubleClickEvent
(
self
,
event
:
QGraphicsSceneMouseEvent
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment