Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
las3_pub
/
predictable_parallel_patterns
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
54dae64f
authored
May 27, 2020
by
FritzFlorian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add proper build flavour system and fix some worker-sleep issues.
parent
a26720bd
Pipeline
#1491
passed with stages
in 3 minutes 48 seconds
Changes
13
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
129 additions
and
38 deletions
+129
-38
README.md
+9
-0
app/benchmark_fft/main.cpp
+7
-5
app/benchmark_fib/main.cpp
+3
-3
app/benchmark_matrix/main.cpp
+3
-3
app/benchmark_unbalanced/main.cpp
+5
-2
lib/pls/CMakeLists.txt
+38
-2
lib/pls/include/pls/internal/build_flavour.h.in
+3
-1
lib/pls/include/pls/internal/helpers/easy_profiler.h
+2
-1
lib/pls/include/pls/internal/profiling/profiler.h
+8
-4
lib/pls/include/pls/internal/profiling/thread_stats.h
+4
-0
lib/pls/include/pls/internal/scheduling/scheduler.h
+5
-5
lib/pls/src/internal/profiling/profiler.cpp
+32
-3
lib/pls/src/internal/scheduling/scheduler.cpp
+10
-9
No files found.
README.md
View file @
54dae64f
...
@@ -102,6 +102,15 @@ After this is done you can use normal `make` commands like
...
@@ -102,6 +102,15 @@ After this is done you can use normal `make` commands like
or
`make install`
to install the library globally.
or
`make install`
to install the library globally.
Available Settings:
Available Settings:
-
`-DPLS_PROFILER=ON/OFF`
-
default OFF
-
Enabling it will record execution DAGs with memory and runtime stats
-
Enabling has a BIG performance hit (use only for development)
-
`-DSLEEP_WORKERS=ON/OFF`
-
default OFF
-
Enabling it will make workers keep a central 'all workers empty flag'
-
Workers try to sleep if there is no work in the system
-
Has performance impact on isolated runs, but can benefit multiprogrammed systems
-
`-DEASY_PROFILER=ON/OFF`
-
`-DEASY_PROFILER=ON/OFF`
-
default OFF
-
default OFF
-
Enabling will link the easy profiler library and enable its macros
-
Enabling will link the easy profiler library and enable its macros
...
...
app/benchmark_fft/main.cpp
View file @
54dae64f
...
@@ -14,9 +14,6 @@ void pls_conquer(fft::complex_vector::iterator data, fft::complex_vector::iterat
...
@@ -14,9 +14,6 @@ void pls_conquer(fft::complex_vector::iterator data, fft::complex_vector::iterat
fft
::
divide
(
data
,
swap_array
,
n
);
fft
::
divide
(
data
,
swap_array
,
n
);
if
(
n
<=
fft
::
RECURSIVE_CUTOFF
)
{
if
(
n
<=
fft
::
RECURSIVE_CUTOFF
)
{
FILE
*
file
=
fopen
(
"test.text"
,
"w"
);
fprintf
(
file
,
"test %d"
,
n
);
fclose
(
file
);
fft
::
conquer
(
data
,
swap_array
,
n
/
2
);
fft
::
conquer
(
data
,
swap_array
,
n
/
2
);
fft
::
conquer
(
data
+
n
/
2
,
swap_array
+
n
/
2
,
n
/
2
);
fft
::
conquer
(
data
+
n
/
2
,
swap_array
+
n
/
2
,
n
/
2
);
}
else
{
}
else
{
...
@@ -50,13 +47,18 @@ int main(int argc, char **argv) {
...
@@ -50,13 +47,18 @@ int main(int argc, char **argv) {
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
runner
.
run_iterations
(
fft
::
NUM_ITERATIONS
,
[
&
]()
{
// scheduler.get_profiler().disable_memory_measure();
runner
.
run_iterations
(
10
,
[
&
]()
{
scheduler
.
perform_work
([
&
]()
{
scheduler
.
perform_work
([
&
]()
{
pls_conquer
(
data
.
begin
(),
swap_array
.
begin
(),
fft
::
SIZE
);;
pls_conquer
(
data
.
begin
(),
swap_array
.
begin
(),
fft
::
SIZE
);;
});
});
},
fft
::
NUM_WARMUP_ITERATIONS
,
[
&
]()
{
// scheduler.get_profiler().current_run().print_stats();
},
1
,
[
&
]()
{
fft
::
fill_input
(
data
);
// Reset data before each run
fft
::
fill_input
(
data
);
// Reset data before each run
});
});
// scheduler.get_profiler().current_run().print_dag(std::cout);
// scheduler.get_profiler().current_run().print_stats();
runner
.
commit_results
(
true
);
runner
.
commit_results
(
true
);
return
0
;
return
0
;
...
...
app/benchmark_fib/main.cpp
View file @
54dae64f
...
@@ -44,14 +44,14 @@ int main(int argc, char **argv) {
...
@@ -44,14 +44,14 @@ int main(int argc, char **argv) {
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
volatile
int
res
;
volatile
int
res
;
scheduler
.
get_profiler
().
disable_memory_measure
();
//
scheduler.get_profiler().disable_memory_measure();
runner
.
run_iterations
(
fib
::
NUM_ITERATIONS
,
[
&
]()
{
runner
.
run_iterations
(
fib
::
NUM_ITERATIONS
,
[
&
]()
{
scheduler
.
perform_work
([
&
]()
{
scheduler
.
perform_work
([
&
]()
{
res
=
pls_fib
(
fib
::
INPUT_N
);
res
=
pls_fib
(
fib
::
INPUT_N
);
});
});
},
fib
::
NUM_WARMUP_ITERATIONS
);
},
fib
::
NUM_WARMUP_ITERATIONS
);
scheduler
.
get_profiler
().
current_run
().
print_dag
(
std
::
cout
);
//
scheduler.get_profiler().current_run().print_dag(std::cout);
scheduler
.
get_profiler
().
current_run
().
print_stats
();
//
scheduler.get_profiler().current_run().print_stats();
runner
.
commit_results
(
true
);
runner
.
commit_results
(
true
);
...
...
app/benchmark_matrix/main.cpp
View file @
54dae64f
...
@@ -38,14 +38,14 @@ int main(int argc, char **argv) {
...
@@ -38,14 +38,14 @@ int main(int argc, char **argv) {
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
scheduler
.
get_profiler
().
disable_memory_measure
();
//
scheduler.get_profiler().disable_memory_measure();
runner
.
run_iterations
(
matrix
::
NUM_ITERATIONS
,
[
&
]()
{
runner
.
run_iterations
(
matrix
::
NUM_ITERATIONS
,
[
&
]()
{
scheduler
.
perform_work
([
&
]()
{
scheduler
.
perform_work
([
&
]()
{
result
.
multiply
(
a
,
b
);
result
.
multiply
(
a
,
b
);
});
});
},
matrix
::
WARMUP_ITERATIONS
);
},
matrix
::
WARMUP_ITERATIONS
);
scheduler
.
get_profiler
().
current_run
().
print_dag
(
std
::
cout
);
//
scheduler.get_profiler().current_run().print_dag(std::cout);
scheduler
.
get_profiler
().
current_run
().
print_stats
();
//
scheduler.get_profiler().current_run().print_stats();
runner
.
commit_results
(
true
);
runner
.
commit_results
(
true
);
}
}
app/benchmark_unbalanced/main.cpp
View file @
54dae64f
...
@@ -45,14 +45,17 @@ int main(int argc, char **argv) {
...
@@ -45,14 +45,17 @@ int main(int argc, char **argv) {
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
scheduler
scheduler
{(
unsigned
)
num_threads
,
MAX_NUM_TASKS
,
MAX_STACK_SIZE
};
runner
.
run_iterations
(
unbalanced
::
NUM_ITERATIONS
,
[
&
]()
{
// scheduler.get_profiler().disable_memory_measure();
runner
.
run_iterations
(
1
,
[
&
]()
{
scheduler
.
perform_work
([
&
]()
{
scheduler
.
perform_work
([
&
]()
{
unbalanced_tree_search
(
unbalanced
::
SEED
,
unbalanced_tree_search
(
unbalanced
::
SEED
,
unbalanced
::
ROOT_CHILDREN
,
unbalanced
::
ROOT_CHILDREN
,
unbalanced
::
Q
,
unbalanced
::
Q
,
unbalanced
::
NORMAL_CHILDREN
);
unbalanced
::
NORMAL_CHILDREN
);
});
});
},
unbalanced
::
WARMUP_ITERATIONS
);
},
0
);
// scheduler.get_profiler().current_run().print_dag(std::cout);
// scheduler.get_profiler().current_run().print_stats();
runner
.
commit_results
(
true
);
runner
.
commit_results
(
true
);
}
}
...
...
lib/pls/CMakeLists.txt
View file @
54dae64f
# List all required files here (cmake best practice to NOT automate this step!)
# List all required files here (cmake best practice to NOT automate this step!)
add_library
(
pls STATIC
add_library
(
pls STATIC
include/pls/pls.h
include/pls/internal/build_flavour.h
include/pls/algorithms/loop_partition_strategy.h
include/pls/algorithms/loop_partition_strategy.h
include/pls/algorithms/for_each.h include/pls/algorithms/for_each_impl.h
include/pls/algorithms/for_each.h include/pls/algorithms/for_each_impl.h
include/pls/algorithms/invoke.h include/pls/algorithms/invoke_impl.h
include/pls/algorithms/invoke.h include/pls/algorithms/invoke_impl.h
...
@@ -15,6 +18,7 @@ add_library(pls STATIC
...
@@ -15,6 +18,7 @@ add_library(pls STATIC
include/pls/internal/base/error_handling.h src/internal/base/error_handling.cpp
include/pls/internal/base/error_handling.h src/internal/base/error_handling.cpp
include/pls/internal/base/alignment.h src/internal/base/alignment.cpp
include/pls/internal/base/alignment.h src/internal/base/alignment.cpp
include/pls/internal/base/stack_allocator.h src/internal/base/stack_allocator.cpp
include/pls/internal/base/stack_allocator.h src/internal/base/stack_allocator.cpp
include/pls/internal/base/futex_wrapper.h
include/pls/internal/data_structures/aligned_stack.h src/internal/data_structures/aligned_stack.cpp
include/pls/internal/data_structures/aligned_stack.h src/internal/data_structures/aligned_stack.cpp
include/pls/internal/data_structures/aligned_stack_impl.h
include/pls/internal/data_structures/aligned_stack_impl.h
...
@@ -43,7 +47,7 @@ add_library(pls STATIC
...
@@ -43,7 +47,7 @@ add_library(pls STATIC
include/pls/internal/profiling/dag_node.h src/internal/profiling/dag_node.cpp
include/pls/internal/profiling/dag_node.h src/internal/profiling/dag_node.cpp
include/pls/internal/profiling/profiler.h
include/pls/internal/profiling/profiler.h
include/pls/internal/profiling/thread_stats.h src/internal/profiling/thread_stats.cpp src/internal/profiling/profiler.cpp
include/pls/internal/build_flavour.h include/pls/internal/base/futex_wrapper.h
)
include/pls/internal/profiling/thread_stats.h src/internal/profiling/thread_stats.cpp src/internal/profiling/profiler.cpp
)
# Dependencies for pls
# Dependencies for pls
target_link_libraries
(
pls Threads::Threads
)
target_link_libraries
(
pls Threads::Threads
)
...
@@ -52,13 +56,39 @@ if (EASY_PROFILER)
...
@@ -52,13 +56,39 @@ if (EASY_PROFILER)
target_link_libraries
(
pls easy_profiler
)
target_link_libraries
(
pls easy_profiler
)
endif
()
endif
()
# Generate defines needed
if
(
EASY_PROFILER
)
set
(
PLS_EASY_PROFILER_ENABLED true
)
else
()
set
(
PLS_EASY_PROFILER_ENABLED false
)
endif
()
option
(
PLS_PROFILER
"Enable the internal DAG profiler"
OFF
)
if
(
PLS_PROFILER
)
set
(
PLS_PROFILING_ENABLED true
)
else
()
set
(
PLS_PROFILING_ENABLED false
)
endif
()
option
(
SLEEP_WORKERS
"Enable sleeping workers if queues are empty"
OFF
)
if
(
SLEEP_WORKERS
)
set
(
PLS_SLEEP_WORKERS_ON_EMPTY true
)
else
()
set
(
PLS_SLEEP_WORKERS_ON_EMPTY false
)
endif
()
configure_file
(
include/pls/internal/build_flavour.h.in include/pls/internal/build_flavour.h
)
# Add everything in `./include` to be in the include path of this project
# Add everything in `./include` to be in the include path of this project
target_include_directories
(
pls
target_include_directories
(
pls
PUBLIC
PUBLIC
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
PRIVATE
PRIVATE
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
# TODO: Set this up when we require private headers
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
)
target_include_directories
(
pls
PUBLIC
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_BINARY_DIR
}
/include>
)
)
# Rules for installing the library on a system
# Rules for installing the library on a system
...
@@ -74,6 +104,12 @@ INSTALL(
...
@@ -74,6 +104,12 @@ INSTALL(
DESTINATION include
DESTINATION include
FILES_MATCHING PATTERN
"*.h*"
FILES_MATCHING PATTERN
"*.h*"
)
)
INSTALL
(
DIRECTORY
${
PROJECT_BINARY_DIR
}
/lib/pls/include/pls
DESTINATION include
FILES_MATCHING PATTERN
"*.h*"
)
# ...allow our project to be a cmake dependency
# ...allow our project to be a cmake dependency
install
(
install
(
EXPORT pls-targets
EXPORT pls-targets
...
...
lib/pls/include/pls/internal/build_flavour.h
→
lib/pls/include/pls/internal/build_flavour.h
.in
View file @
54dae64f
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
#ifndef PLS_INTERNAL_BUILD_FLAVOUR_H_
#ifndef PLS_INTERNAL_BUILD_FLAVOUR_H_
#define PLS_INTERNAL_BUILD_FLAVOUR_H_
#define PLS_INTERNAL_BUILD_FLAVOUR_H_
#define PLS_SLEEP_WORKERS_ON_EMPTY true
#define PLS_PROFILING_ENABLED @PLS_PROFILING_ENABLED@
#define PLS_SLEEP_WORKERS_ON_EMPTY @PLS_SLEEP_WORKERS_ON_EMPTY@
#define PLS_EASY_PROFILER_ENABLED @PLS_EASY_PROFILER_ENABLED@
#endif //PLS_INTERNAL_BUILD_FLAVOUR_H_
#endif //PLS_INTERNAL_BUILD_FLAVOUR_H_
lib/pls/include/pls/internal/helpers/easy_profiler.h
View file @
54dae64f
#include "pls/internal/build_flavour.h"
#ifndef PLS_PROFILER_H
#ifndef PLS_PROFILER_H
#define PLS_PROFILER_H
#define PLS_PROFILER_H
#if
def ENABLE_EASY_PROFILER
#if
PLS_EASY_PROFILER_ENABLED
#include <easy/profiler.h>
#include <easy/profiler.h>
#include <easy/arbitrary_value.h>
#include <easy/arbitrary_value.h>
...
...
lib/pls/include/pls/internal/profiling/profiler.h
View file @
54dae64f
...
@@ -2,16 +2,14 @@
...
@@ -2,16 +2,14 @@
#ifndef PLS_INTERNAL_PROFILING_PROFILER_H_
#ifndef PLS_INTERNAL_PROFILING_PROFILER_H_
#define PLS_INTERNAL_PROFILING_PROFILER_H_
#define PLS_INTERNAL_PROFILING_PROFILER_H_
#ifndef PLS_PROFILING_ENABLED
#define PLS_PROFILING_ENABLED true
#endif
#include <memory>
#include <memory>
#include <chrono>
#include <chrono>
#include <vector>
#include <vector>
#include <iostream>
#include <iostream>
#include "pls/internal/build_flavour.h"
#include "dag_node.h"
#include "dag_node.h"
#include "thread_stats.h"
#include "thread_stats.h"
...
@@ -51,6 +49,9 @@ class profiler {
...
@@ -51,6 +49,9 @@ class profiler {
unsigned
long
steals_cas_ops_
;
unsigned
long
steals_cas_ops_
;
unsigned
long
steals_time_
;
unsigned
long
steals_time_
;
unsigned
long
sleeps_
;
unsigned
long
sleeps_time_
;
unsigned
long
max_memory_per_stack_
;
unsigned
long
max_memory_per_stack_
;
unsigned
long
spawn_depth_
;
unsigned
long
spawn_depth_
;
...
@@ -82,6 +83,9 @@ class profiler {
...
@@ -82,6 +83,9 @@ class profiler {
void
stealing_end
(
unsigned
thread_id
,
bool
success
);
void
stealing_end
(
unsigned
thread_id
,
bool
success
);
void
stealing_cas_op
(
unsigned
thread_id
);
void
stealing_cas_op
(
unsigned
thread_id
);
void
sleep_start
(
unsigned
thread_id
);
void
sleep_stop
(
unsigned
thread_id
);
dag_node
*
task_spawn_child
(
unsigned
thread_id
,
dag_node
*
parent
);
dag_node
*
task_spawn_child
(
unsigned
thread_id
,
dag_node
*
parent
);
dag_node
*
task_sync
(
unsigned
thread_id
,
dag_node
*
synced
);
dag_node
*
task_sync
(
unsigned
thread_id
,
dag_node
*
synced
);
void
task_start_running
(
unsigned
thread_id
,
dag_node
*
in_node
);
void
task_start_running
(
unsigned
thread_id
,
dag_node
*
in_node
);
...
...
lib/pls/include/pls/internal/profiling/thread_stats.h
View file @
54dae64f
...
@@ -24,7 +24,11 @@ struct PLS_CACHE_ALIGN thread_stats {
...
@@ -24,7 +24,11 @@ struct PLS_CACHE_ALIGN thread_stats {
unsigned
long
total_time_stealing_
{
0
};
unsigned
long
total_time_stealing_
{
0
};
unsigned
long
total_sleeps_
{
0
};
unsigned
long
total_time_sleeping_
{
0
};
clock
::
time_point
stealing_start_time_
;
clock
::
time_point
stealing_start_time_
;
clock
::
time_point
sleeping_start_time_
;
clock
::
time_point
task_run_start_time_
;
clock
::
time_point
task_run_start_time_
;
};
};
...
...
lib/pls/include/pls/internal/scheduling/scheduler.h
View file @
54dae64f
...
@@ -132,18 +132,18 @@ class scheduler {
...
@@ -132,18 +132,18 @@ class scheduler {
std
::
shared_ptr
<
base
::
stack_allocator
>
stack_allocator_
;
std
::
shared_ptr
<
base
::
stack_allocator
>
stack_allocator_
;
#if PLS_PROFILING_ENABLED
profiling
::
profiler
profiler_
;
#endif
#if PLS_SLEEP_WORKERS_ON_EMPTY
#if PLS_SLEEP_WORKERS_ON_EMPTY
PLS_CACHE_ALIGN
std
::
atomic
<
int32_t
>
empty_queue_counter_
{
0
};
PLS_CACHE_ALIGN
std
::
atomic
<
int32_t
>
empty_queue_counter_
{
0
};
PLS_CACHE_ALIGN
std
::
atomic
<
int32_t
>
threads_sleeping_
{
0
};
std
::
atomic
<
int32_t
>
threads_sleeping_
{
0
};
void
empty_queue_try_sleep_worker
();
void
empty_queue_try_sleep_worker
();
void
empty_queue_increase_counter
();
void
empty_queue_increase_counter
();
void
empty_queue_decrease_counter_and_wake
();
void
empty_queue_decrease_counter_and_wake
();
#endif
#endif
#if PLS_PROFILING_ENABLED
profiling
::
profiler
profiler_
;
#endif
};
};
}
}
...
...
lib/pls/src/internal/profiling/profiler.cpp
View file @
54dae64f
...
@@ -14,11 +14,17 @@ void profiler::profiler_run::calculate_stats() {
...
@@ -14,11 +14,17 @@ void profiler::profiler_run::calculate_stats() {
steals_successful_
=
0
;
steals_successful_
=
0
;
steals_cas_ops_
=
0
;
steals_cas_ops_
=
0
;
steals_time_
=
0
;
steals_time_
=
0
;
sleeps_
=
0
;
sleeps_time_
=
0
;
for
(
auto
&
thread_stats
:
per_thread_stats_
)
{
for
(
auto
&
thread_stats
:
per_thread_stats_
)
{
steals_failed_
+=
thread_stats
.
failed_steals_
;
steals_failed_
+=
thread_stats
.
failed_steals_
;
steals_successful_
+=
thread_stats
.
successful_steals_
;
steals_successful_
+=
thread_stats
.
successful_steals_
;
steals_cas_ops_
+=
thread_stats
.
steal_cas_ops_
;
steals_cas_ops_
+=
thread_stats
.
steal_cas_ops_
;
steals_time_
+=
thread_stats
.
total_time_stealing_
;
steals_time_
+=
thread_stats
.
total_time_stealing_
;
sleeps_
+=
thread_stats
.
total_sleeps_
;
sleeps_time_
+=
thread_stats
.
total_time_sleeping_
;
}
}
max_memory_per_stack_
=
root_node_
->
dag_max_memory
();
max_memory_per_stack_
=
root_node_
->
dag_max_memory
();
...
@@ -39,7 +45,10 @@ void profiler::profiler_run::print_stats() const {
...
@@ -39,7 +45,10 @@ void profiler::profiler_run::print_stats() const {
<<
", Failed: "
<<
steals_failed_
<<
", Failed: "
<<
steals_failed_
<<
", CAS: "
<<
steals_cas_ops_
<<
")"
<<
std
::
endl
;
<<
", CAS: "
<<
steals_cas_ops_
<<
")"
<<
std
::
endl
;
unsigned
long
total_measured
=
steals_time_
+
t_1_
;
std
::
cout
<<
"SLEEPS: (Time "
<<
m_to_d
(
sleeps_time_
)
<<
", Total: "
<<
sleeps_
<<
")"
<<
std
::
endl
;
unsigned
long
total_measured
=
steals_time_
+
t_1_
+
sleeps_time_
;
unsigned
long
total_wall
=
wall_time_
*
num_threads_
;
unsigned
long
total_wall
=
wall_time_
*
num_threads_
;
std
::
cout
<<
"Wall Time vs. Measured: "
<<
100.0
*
total_measured
/
total_wall
<<
std
::
endl
;
std
::
cout
<<
"Wall Time vs. Measured: "
<<
100.0
*
total_measured
/
total_wall
<<
std
::
endl
;
...
@@ -82,8 +91,7 @@ void profiler::stealing_end(unsigned thread_id, bool success) {
...
@@ -82,8 +91,7 @@ void profiler::stealing_end(unsigned thread_id, bool success) {
if
(
capture_time_
)
{
if
(
capture_time_
)
{
auto
end_time
=
clock
::
now
();
auto
end_time
=
clock
::
now
();
auto
auto
steal_duration
=
steal_duration
=
std
::
chrono
::
duration_cast
<
measurement_resolution
>
(
end_time
-
thread_stats
.
stealing_start_time_
).
count
();
std
::
chrono
::
duration_cast
<
measurement_resolution
>
(
end_time
-
thread_stats
.
stealing_start_time_
).
count
();
thread_stats
.
total_time_stealing_
+=
steal_duration
;
thread_stats
.
total_time_stealing_
+=
steal_duration
;
}
}
...
@@ -96,6 +104,27 @@ void profiler::stealing_cas_op(unsigned thread_id) {
...
@@ -96,6 +104,27 @@ void profiler::stealing_cas_op(unsigned thread_id) {
});
});
}
}
void
profiler
::
sleep_start
(
unsigned
thread_id
)
{
run_on_stack
(
thread_id
,
[
&
](
thread_stats
&
thread_stats
)
{
thread_stats
.
total_sleeps_
++
;
if
(
capture_time_
)
{
thread_stats
.
sleeping_start_time_
=
clock
::
now
();
}
});
}
void
profiler
::
sleep_stop
(
unsigned
thread_id
)
{
run_on_stack
(
thread_id
,
[
&
](
thread_stats
&
thread_stats
)
{
if
(
capture_time_
)
{
auto
end_time
=
clock
::
now
();
auto
sleep_duration
=
std
::
chrono
::
duration_cast
<
measurement_resolution
>
(
end_time
-
thread_stats
.
sleeping_start_time_
).
count
();
thread_stats
.
total_time_sleeping_
+=
sleep_duration
;
}
});
}
dag_node
*
profiler
::
task_spawn_child
(
unsigned
thread_id
,
dag_node
*
parent
)
{
dag_node
*
profiler
::
task_spawn_child
(
unsigned
thread_id
,
dag_node
*
parent
)
{
dag_node
*
result
;
dag_node
*
result
;
run_on_stack
(
thread_id
,
[
&
](
thread_stats
&
)
{
run_on_stack
(
thread_id
,
[
&
](
thread_stats
&
)
{
...
...
lib/pls/src/internal/scheduling/scheduler.cpp
View file @
54dae64f
...
@@ -301,26 +301,27 @@ bool scheduler::check_task_chain(base_task &start_task) {
...
@@ -301,26 +301,27 @@ bool scheduler::check_task_chain(base_task &start_task) {
void
scheduler
::
empty_queue_try_sleep_worker
()
{
void
scheduler
::
empty_queue_try_sleep_worker
()
{
int32_t
counter_value
=
empty_queue_counter_
.
load
();
int32_t
counter_value
=
empty_queue_counter_
.
load
();
// printf("try sleep thread %d...\n", counter_value);
if
(
counter_value
==
num_threads
())
{
if
(
counter_value
==
num_threads
()
-
1
)
{
#if PLS_PROFILING_ENABLED
// printf("sleeping thread...\n");
get_profiler
().
sleep_start
(
thread_state
::
get
().
get_thread_id
());
#endif
threads_sleeping_
++
;
threads_sleeping_
++
;
base
::
futex_wait
((
int32_t
*
)
&
empty_queue_counter_
,
num_threads
()
-
1
);
base
::
futex_wait
((
int32_t
*
)
&
empty_queue_counter_
,
num_threads
());
base
::
futex_wakeup
((
int32_t
*
)
&
empty_queue_counter_
,
1
);
threads_sleeping_
--
;
threads_sleeping_
--
;
// printf("waked thread...\n");
base
::
futex_wakeup
((
int32_t
*
)
&
empty_queue_counter_
,
1
);
#if PLS_PROFILING_ENABLED
get_profiler
().
sleep_stop
(
thread_state
::
get
().
get_thread_id
());
#endif
}
}
}
}
void
scheduler
::
empty_queue_increase_counter
()
{
void
scheduler
::
empty_queue_increase_counter
()
{
int32_t
old_value
=
empty_queue_counter_
.
fetch_add
(
1
);
empty_queue_counter_
.
fetch_add
(
1
);
// printf("increase counter from %d", old_value);
}
}
void
scheduler
::
empty_queue_decrease_counter_and_wake
()
{
void
scheduler
::
empty_queue_decrease_counter_and_wake
()
{
empty_queue_counter_
.
fetch_sub
(
1
);
empty_queue_counter_
.
fetch_sub
(
1
);
if
(
threads_sleeping_
.
load
()
>
0
)
{
if
(
threads_sleeping_
.
load
()
>
0
)
{
// Threads could be sleeping, we MUST wake them up
base
::
futex_wakeup
((
int32_t
*
)
&
empty_queue_counter_
,
1
);
base
::
futex_wakeup
((
int32_t
*
)
&
empty_queue_counter_
,
1
);
}
}
}
}
...
...
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