Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The VkColorCube app doesn't log failure status #77

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

The VkColorCube app doesn't log failure status #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
513ef99
The VkColorCube app doesn't log failure status
jcortell68 Mar 15, 2023
bd9f67d
Fixed some accidental changes in previous commit
jcortell68 Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions source/examples/vulkan/vk_color_cube/vk_color_cube.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,15 @@ bool AMDVulkanDemo::InitializeGpa()
gpu_perf_api_helper_.gpa_function_table_->GpaRegisterLoggingCallback(gpa_log_types, gpu_perf_api_helper_.gpaLoggingCallback);
if (status_register_callback != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to register GPA logging callback.");
LogStatus(status_register_callback, "ERROR: Failed to register GPA logging callback");
return false;
}

GpaStatus status_gpa_initialize = gpu_perf_api_helper_.gpa_function_table_->GpaInitialize(kGpaInitializeDefaultBit);

if (status_gpa_initialize != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to initialize GPA.");
LogStatus(status_gpa_initialize, "ERROR: Failed to initialize GPA");
return false;
}

Expand Down Expand Up @@ -440,7 +440,7 @@ bool AMDVulkanDemo::InitializeGpa()
status = gpu_perf_api_helper_.gpa_function_table_->GpaRegisterLoggingCallback(gpa_log_types, gpu_perf_api_helper_.gpaLoggingCallback);
if (status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to register GPA logging callback.");
LogStatus(status, "ERROR: Failed to register GPA logging callback");
return false;
}

Expand Down Expand Up @@ -864,7 +864,7 @@ bool AMDVulkanDemo::InitializeVulkan()

if (gpa_open_context_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to open GPA context.");
LogStatus(gpa_open_context_status, "ERROR: Failed to open GPA context");
return false;
}

Expand All @@ -878,7 +878,7 @@ bool AMDVulkanDemo::InitializeVulkan()
GpaStatus get_sample_types_status = gpu_perf_api_helper_.gpa_function_table_->GpaGetSupportedSampleTypes(gpa_context_id_, &sample_types);
if (get_sample_types_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to get supported GPA sample types.");
LogStatus(get_sample_types_status, "ERROR: Failed to get supported GPA sample types");
return false;
}

Expand All @@ -887,7 +887,7 @@ bool AMDVulkanDemo::InitializeVulkan()

if (gpa_create_session_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to create GPA session.");
LogStatus(gpa_create_session_status, "ERROR: Failed to create GPA session");
return false;
}

Expand All @@ -914,6 +914,7 @@ bool AMDVulkanDemo::InitializeVulkan()
if (gpa_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("Failed to enable counter: %s", it->c_str());
LogStatus(gpa_status);
}
success_enable_counter &= gpa_status == kGpaStatusOk;
}
Expand Down Expand Up @@ -941,7 +942,7 @@ bool AMDVulkanDemo::InitializeVulkan()

if (gpa_enable_all_counters_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to enable all GPA counters.");
LogStatus(gpa_enable_all_counters_status, "ERROR: Failed to enable all GPA counters");
return false;
}

Expand All @@ -950,7 +951,7 @@ bool AMDVulkanDemo::InitializeVulkan()
GpaStatus gpa_get_pass_count_status = gpu_perf_api_helper_.gpa_function_table_->GpaGetPassCount(gpa_session_id_, &required_pass_count_);
if (gpa_get_pass_count_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the number of required GPA passes.");
LogStatus(gpa_get_pass_count_status, "ERROR: Failed to get the number of required GPA passes");
return false;
}

Expand All @@ -965,7 +966,7 @@ bool AMDVulkanDemo::InitializeVulkan()

if (gpa_begin_session_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to begin GPA session.");
LogStatus(gpa_begin_session_status, "ERROR: Failed to begin GPA session");
return false;
}
}
Expand Down Expand Up @@ -1654,7 +1655,7 @@ bool AMDVulkanDemo::InitializeVulkan()

if (gpa_end_session_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to end GPA session.");
LogStatus(gpa_end_session_status, "ERROR: Failed to end GPA session");
}
}

Expand Down Expand Up @@ -1842,7 +1843,7 @@ void AMDVulkanDemo::Destroy()

if (gpa_delete_session_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to delete GPA session.");
LogStatus(gpa_delete_session_status, "ERROR: Failed to delete GPA session");
}
}

Expand All @@ -1852,7 +1853,7 @@ void AMDVulkanDemo::Destroy()

if (gpa_close_context_status != kGpaStatusOk)
{
AMDVulkanDemoVkUtils::Log("ERROR: Failed to close GPA Context.");
LogStatus(gpa_close_context_status, "ERROR: Failed to close GPA Context");
}
}
}
Expand Down Expand Up @@ -2358,6 +2359,19 @@ void AMDVulkanDemo::PreBuildCommandBuffers(PrebuiltPerFrameResources* prebuilt_r
}
}

void AMDVulkanDemo::LogStatus(GpaStatus status, const char* msg)
{
auto status_as_str = gpu_perf_api_helper_.gpa_function_table_->GpaGetStatusAsStr(status);
if (msg != nullptr)
{
AMDVulkanDemoVkUtils::Log("%s. %s", msg, status_as_str);
}
else
{
AMDVulkanDemoVkUtils::Log("%s", status_as_str);
}
}

#if defined(VK_USE_PLATFORM_WIN32_KHR)

/// Window message processing callback.
Expand Down
6 changes: 6 additions & 0 deletions source/examples/vulkan/vk_color_cube/vk_color_cube.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,12 @@ class AMDVulkanDemo : public gpa_example::GpaSampleApp
/// @param [in] gpa_pass_index If GPA is enabled for these command buffers, this indicates which profile pass is being built; ignored if enable_gpa is false.
void PreBuildCommandBuffers(PrebuiltPerFrameResources* prebuilt_resources, VkFramebuffer frame_buffer, bool enable_gpa, uint32_t gpa_pass_index);

/// @brief Log the textual representation of a failure status code
///
/// @param [in] status the failure code
/// @param [in] msg optional additional context. Should not contain trailing punctuation.
void LogStatus(GpaStatus status, const char* msg=nullptr);

/// GPA helper.
GpaHelper gpu_perf_api_helper_;

Expand Down
2 changes: 1 addition & 1 deletion source/gpu_perf_api_common/gpu_perf_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,7 +1657,7 @@ static const char* kErrorString[] = {
GPA_ENUM_STRING_VAL(kGpaStatusErrorTimeout, "GPA Error: Attempt to Retrieve Data Failed due to Timeout."),
GPA_ENUM_STRING_VAL(kGpaStatusErrorLibAlreadyLoaded, "GPA Error: Library Is Already Loaded."),
GPA_ENUM_STRING_VAL(kGpaStatusErrorOtherSessionActive, "GPA Error: Other Session Is Active."),
GPA_ENUM_STRING_VAL(kGpaStatusErrorException, "GPA Error: Exception Occurred.")};
GPA_ENUM_STRING_VAL(kGpaStatusErrorException, "GPA Error: C++ Exception Occurred.")};

/// Size of kErrorString array.
static size_t kErrorStringSize = sizeof(kErrorString) / sizeof(const char*);
Expand Down