Skip to content

Commit 512a737

Browse files
authored
Add loop-report config (LLNL#283)
* Start loop-report controller * loop-report: Fix timeseries blocksize calculation * Fix tests * Add mem.bandwidth metric for loop-report * Update loop-report * Use libcaliper in tests * Add loop report test * Fix tests * Add timeseries.rows option
1 parent f6a48f8 commit 512a737

17 files changed

+563
-22
lines changed

src/caliper/controllers/HatchetRegionProfileController.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ const char* controller_spec =
132132
" },"
133133
" { "
134134
" \"name\": \"use.mpi\","
135-
" \"services\": [ \"mpi\", \"mpireport\" ],"
136135
" \"type\": \"bool\","
137136
" \"description\": \"Merge results into a single output stream in MPI programs\""
138137
" }"

src/caliper/controllers/HatchetSampleProfileController.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ const char* controller_spec =
180180
" { "
181181
" \"name\": \"use.mpi\","
182182
" \"type\": \"bool\","
183-
" \"services\": [ \"mpi\", \"mpireport\" ],"
184183
" \"description\": \"Merge results into a single output stream in MPI programs\""
185184
" }"
186185
" ]"

src/caliper/controllers/controllers.cpp

+30
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,36 @@ const char* builtin_option_specs =
267267
" ]"
268268
"},"
269269
"{"
270+
" \"name\" : \"mem.bandwidth\","
271+
" \"description\" : \"Record memory bandwidth using the Performance Co-pilot API\","
272+
" \"type\" : \"bool\","
273+
" \"category\" : \"metric\","
274+
" \"services\" : [ \"pcp.memory\" ],"
275+
" \"query args\" : "
276+
" ["
277+
" { \"level\": \"serial\", \"select\": "
278+
" ["
279+
" { \"expr\": \"ratio(mem.bytes.read,pcp.time.duration,1e-6)\", \"as\": \"MB/s (r)\" },"
280+
" { \"expr\": \"ratio(mem.bytes.written,pcp.time.duration,1e-6)\", \"as\": \"MB/s (w)\" }"
281+
" ] "
282+
" },"
283+
" { \"level\": \"local\", \"select\": "
284+
" ["
285+
" { \"expr\": \"ratio(mem.bytes.read,pcp.time.duration,1e-6)\" },"
286+
" { \"expr\": \"ratio(mem.bytes.written,pcp.time.duration,1e-6)\" }"
287+
" ] "
288+
" },"
289+
" { \"level\": \"cross\", \"select\": "
290+
" ["
291+
" { \"expr\": \"avg(mem.bytes.read/pcp.time.duration)\", \"as\": \"Avg MB/s (r)\" },"
292+
" { \"expr\": \"max(mem.bytes.read/pcp.time.duration)\", \"as\": \"Max MB/s (r)\" },"
293+
" { \"expr\": \"avg(mem.bytes.written/pcp.time.duration)\", \"as\": \"Avg MB/s (w)\" },"
294+
" { \"expr\": \"max(mem.bytes.written/pcp.time.duration)\", \"as\": \"Max MB/s (w)\" }"
295+
" ] "
296+
" }"
297+
" ]"
298+
"},"
299+
"{"
270300
" \"name\" : \"topdown.toplevel\","
271301
" \"description\" : \"Top-down analysis for Intel CPUs (top level)\","
272302
" \"type\" : \"bool\","

src/mpi/controllers/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(CALIPER_MPI_CONTROLLER_SOURCES
2+
controllers/LoopReportController.cpp
23
controllers/SpotController.cpp
34
controllers/SpotV1Controller.cpp)
45

0 commit comments

Comments
 (0)