Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
simgrid
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
10
Issues
10
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
simgrid
simgrid
Commits
1e4aad72
Commit
1e4aad72
authored
Nov 29, 2019
by
Fabien Chaix
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid allocation inside lmm_solve
parent
ee57575e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
11 deletions
+40
-11
src/kernel/lmm/maxmin.cpp
src/kernel/lmm/maxmin.cpp
+32
-11
src/kernel/lmm/maxmin.hpp
src/kernel/lmm/maxmin.hpp
+8
-0
No files found.
src/kernel/lmm/maxmin.cpp
View file @
1e4aad72
...
...
@@ -137,7 +137,8 @@ void System::var_free(Variable* var)
XBT_OUT
();
}
System
::
System
(
bool
selective_update
)
:
selective_update_active
(
selective_update
)
System
::
System
(
bool
selective_update
)
:
cnst_light_tab
(
NULL
),
cnst_light_max_size
(
0
),
selective_update_active
(
selective_update
)
{
XBT_DEBUG
(
"Setting selective_update_active flag to %d"
,
selective_update_active
);
...
...
@@ -159,6 +160,9 @@ System::~System()
while
((
cnst
=
extract_constraint
()))
cnst_free
(
cnst
);
if
(
cnst_light_tab
)
delete
[]
cnst_light_tab
;
xbt_mallocator_free
(
variable_mallocator_
);
delete
modified_set_
;
}
...
...
@@ -504,18 +508,14 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
double
min_usage
=
-
1
;
double
min_bound
=
-
1
;
XBT_DEBUG
(
"Active constraints : %zu"
,
cnst_list
.
size
());
/* Init: Only modified code portions: reset the value of active variables */
for
(
Constraint
const
&
cnst
:
cnst_list
)
{
for
(
Element
const
&
elem
:
cnst
.
enabled_element_set_
)
{
xbt_assert
(
elem
.
variable
->
sharing_penalty_
>
0.0
);
elem
.
variable
->
value_
=
0.0
;
}
if
(
cnst_list
.
size
()
>
cnst_light_max_size
){
cnst_light_max_size
=
cnst_list
.
size
()
*
2
;
if
(
cnst_light_tab
)
delete
[]
cnst_light_tab
;
cnst_light_tab
=
new
ConstraintLight
[
cnst_light_max_size
]();
}
ConstraintLight
*
cnst_light_tab
=
new
ConstraintLight
[
cnst_list
.
size
()]();
int
cnst_light_num
=
0
;
dyn_light_t
saturated_constraints
;
for
(
Constraint
&
cnst
:
cnst_list
)
{
/* INIT: Collect constraints that actually need to be saturated (i.e remaining and usage are strictly positive)
...
...
@@ -526,6 +526,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
cnst
.
usage_
=
0
;
for
(
Element
&
elem
:
cnst
.
enabled_element_set_
)
{
xbt_assert
(
elem
.
variable
->
sharing_penalty_
>
0
);
elem
.
variable
->
value_
=
0.0
;
if
(
elem
.
consumption_weight
>
0
)
{
if
(
cnst
.
sharing_policy_
!=
s4u
::
Link
::
SharingPolicy
::
FATPIPE
)
cnst
.
usage_
+=
elem
.
consumption_weight
/
elem
.
variable
->
sharing_penalty_
;
...
...
@@ -554,10 +555,31 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
}
}
#if MAXMIN_PROF==CSV_PROF
start_init2
=
high_resolution_clock
::
now
();
//FABIENDBG
#endif
saturated_variable_set_update
(
cnst_light_tab
,
saturated_constraints
,
this
);
#if MAXMIN_PROF==CSV_PROF
high_resolution_clock
::
time_point
start_main
=
high_resolution_clock
::
now
();
//FABIENDBG
int
NVars
=
saturated_variable_set
.
size
();
//FABIENDBG
float
init_duration1
=
duration_cast
<
duration
<
float
>
>
(
start_init2
-
start_init
).
count
();
//FABIENDBG
float
init_duration2
=
duration_cast
<
duration
<
float
>
>
(
start_main
-
start_init2
).
count
();
//FABIENDBG
float
loop_duration
;
//FABIENDBG
float
loop_max
=
0
;
//FABIENDBG
float
loop_min
=
1E9
;
//FABIENDBG
float
loop_avg
=
0
;
//FABIENDBG
float
loop_std
=
0
;
//FABIENDBG
int
loop_count
=
0
;
//FABIENDBG
high_resolution_clock
::
time_point
start_loop
,
end_loop
;
//FABIENDBG
#endif
/* Saturated variables update */
do
{
high_resolution_clock
::
time_point
start_loop
=
high_resolution_clock
::
now
();
//FABIENDBG
/* Fix the variables that have to be */
auto
&
var_list
=
saturated_variable_set
;
for
(
Variable
const
&
var
:
var_list
)
{
...
...
@@ -689,7 +711,6 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
check_concurrency
();
delete
[]
cnst_light_tab
;
}
/** @brief Attribute the value bound to var->bound.
...
...
src/kernel/lmm/maxmin.hpp
View file @
1e4aad72
...
...
@@ -531,6 +531,14 @@ public:
resource
::
Action
::
ModifiedSet
*
modified_set_
=
nullptr
;
private:
typedef
std
::
vector
<
int
>
dyn_light_t
;
//Data used in lmm::solve
ConstraintLight
*
cnst_light_tab
;
unsigned
int
cnst_light_max_size
;
dyn_light_t
saturated_constraints
;
bool
selective_update_active
;
/* flag to update partially the system only selecting changed portions */
unsigned
visited_counter_
=
1
;
/* used by System::update_modified_set() and System::remove_all_modified_set() to
* cleverly (un-)flag the constraints (more details in these functions) */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment