Fix set_tests_properties on some unittests (#90)

* Fix set_tests_properties on some unittests

- misspelled variable in two places

* Update samples/api_buffered_tracing/client.cpp

- output to file by default

* Update samples/api_callback_tracing/client.cpp

- output to file by default

* Update lib/rocprofiler/registration.cpp

- improve guards around initialize and finalize

* Update lib/rocprofiler/tests/registration.cpp

- test rocprofiler_iterate_callback_tracing_kind_names
- validate number of kind names and number of HSA operation names

* Update CI workflow and run-ci.py

- change --coverage flag to support all/unittests/samples
  - samples mode excludes lib/common
  - samples mode appends -L samples
  - unittests mode appends -L unittests

* Update samples/api_buffered_tracing/client.cpp

- header include location fix
This commit is contained in:
Jonathan R. Madsen
2023-09-27 15:44:46 -05:00
committed by GitHub
parent a646c1546c
commit 2d533ad91e
8 changed files with 133 additions and 44 deletions
@@ -18,7 +18,7 @@ target_link_libraries(
gtest_add_tests(
TARGET counter-test
SOURCES ${ROCPROFILER_LIB_COUNTER_TEST_SOURCES}
TEST_LIST counter-test_TESTS
TEST_LIST counter-tests_TESTS
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set_tests_properties(${counter-tests_TESTS} PROPERTIES TIMEOUT 45 LABELS "unittests")
+4 -9
View File
@@ -437,9 +437,9 @@ set_fini_status(int v)
void
initialize()
{
static auto _once = std::once_flag{};
static auto _ready = std::atomic<bool>{false};
if(get_init_status() != 0) return;
static auto _once = std::once_flag{};
std::call_once(_once, []() {
// initialization is in process
set_init_status(-1);
@@ -450,19 +450,14 @@ initialize()
internal_threading::initialize();
// initialization is no longer available
set_init_status(1);
_ready.store(true, std::memory_order_release);
});
if(!_ready.load(std::memory_order_acquire))
{
while(!_ready.load(std::memory_order_acquire))
std::this_thread::yield();
}
}
void
finalize()
{
if(get_fini_status() != 0) return;
static auto _once = std::once_flag{};
std::call_once(_once, []() {
set_fini_status(-1);
+30 -12
View File
@@ -76,20 +76,33 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, void* client
auto* cb_data = static_cast<callback_data*>(client_data);
static auto name_map = [&record]() {
rocprofiler_callback_tracing_operation_name_cb_t cb =
[](rocprofiler_service_callback_tracing_kind_t kind,
uint32_t operation,
const char* operation_name,
void* data) {
auto mdata = *static_cast<name_map_t*>(data);
(*static_cast<name_map_t*>(data))[kind][operation] = operation_name;
static auto name_map = []() {
auto outer_cb = [](rocprofiler_service_callback_tracing_kind_t kind_v,
const char* /*kind_name*/,
void* data_v) {
auto inner_cb = [](rocprofiler_service_callback_tracing_kind_t kind,
uint32_t operation,
const char* operation_name,
void* data) {
auto& mdata = *static_cast<name_map_t*>(data);
mdata[kind][operation] = operation_name;
return 0;
};
auto& mdata_v = *static_cast<name_map_t*>(data_v);
mdata_v.emplace(kind_v, std::unordered_map<uint32_t, const char*>{});
rocprofiler_iterate_callback_tracing_kind_operation_names(kind_v, inner_cb, data_v);
return 0;
};
auto tmp = name_map_t{};
rocprofiler_iterate_callback_tracing_kind_operation_names(
record.kind, cb, static_cast<void*>(&tmp));
rocprofiler_iterate_callback_tracing_kind_names(outer_cb, static_cast<void*>(&tmp));
EXPECT_EQ(tmp.size(), ROCPROFILER_SERVICE_CALLBACK_TRACING_LAST - 1);
EXPECT_EQ(tmp.at(ROCPROFILER_SERVICE_CALLBACK_TRACING_HSA_API).size(),
ROCPROFILER_HSA_API_ID_LAST);
return tmp;
}();
@@ -139,8 +152,13 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, void* client
ROCPROFILER_CALL(rocprofiler_iterate_callback_tracing_operation_args(
record, info_data_cb, static_cast<void*>(&info_data_v)),
"Failure iterating trace operation args");
EXPECT_GT(info_data_v.num_args, 0)
<< name_map[record.kind][record.operation] << info_data_v.arg_ss.str();
if(record.kind == ROCPROFILER_SERVICE_CALLBACK_TRACING_HSA_API &&
!(record.operation == ROCPROFILER_HSA_API_ID_hsa_init ||
record.operation == ROCPROFILER_HSA_API_ID_hsa_shut_down))
{
EXPECT_GT(info_data_v.num_args, 0)
<< name_map[record.kind][record.operation] << info_data_v.arg_ss.str();
}
}
void
+1 -1
View File
@@ -17,7 +17,7 @@ target_link_libraries(
gtest_add_tests(
TARGET buffering-test
SOURCES ${buffering_sources}
TEST_LIST buffering-test_TESTS
TEST_LIST buffering-tests_TESTS
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set_tests_properties(${buffering-tests_TESTS} PROPERTIES TIMEOUT 45 LABELS "unittests")