Skip to content

Commit

Permalink
layers: Use LogMessage with std::string where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
@spencer-lunarg
spencer-lunarg committed Feb 24, 2025
1 parent 3f82546 commit 6f19fda
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion layers/gpuav/debug_printf/debug_printf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void AnalyzeAndGenerateMessage(Validator &gpuav, VkCommandBuffer command_buffer,
} else {
// LogInfo will print out a lot of extra information (Object handles, VUID, hash, etc)
// If the user doesn't set "verbose", but wants to use the debug callback, we should limit it to the bare minimum
gpuav.debug_report->LogMessage(kInformationBit, "VVL-DEBUG-PRINTF", {}, loc, shader_message.str().c_str());
gpuav.debug_report->LogMessage(kInformationBit, "VVL-DEBUG-PRINTF", {}, loc, shader_message.str());
}
}
output_record_i += debug_record->size;
Expand Down
30 changes: 15 additions & 15 deletions layers/gpuav/spirv/debug_printf_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
if (modifier == ' ') {
std::string err_msg =
"OpString \"" + print_op_string() + "\" contains a isolated % which is missing the modifier (to escape use %%)";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
valid = false;
break;
}
Expand Down Expand Up @@ -677,7 +677,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
if (i + 1 >= op_string_len) {
std::string err_msg = "OpString \"" + print_op_string() +
"\" contains a %v at the end, but vectors require a width and type after it";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
valid = false;
} else {
i++;
Expand All @@ -691,7 +691,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
} else {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a %v" + vec_size +
" needs to be valid vector width (v2, v3, or v4)";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
valid = false;
}
}
Expand All @@ -700,7 +700,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
default:
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a \"" + modifier +
"\" modifier which is an unknown modifier.";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
valid = false;
break; // unknown
};
Expand All @@ -717,7 +717,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
if (!found_specifier) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains \"" + std::string(param_info.modifier) +
"\" which is missing a valid specifier (d, i, o, u, x, X, a, A, e, E, f, F, g, or G).";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
valid = false;
}
}
Expand All @@ -732,13 +732,13 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains only " + std::to_string(param_infos.size()) +
" modifiers, but " + std::to_string(argument_count) +
" arguments were passed in and some will be ignored";
module_.InternalWarning(tag, err_msg.c_str());
module_.InternalWarning(tag, err_msg);

} else if (argument_count < param_infos.size()) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains " + std::to_string(param_infos.size()) +
" modifiers, but only " + std::to_string(argument_count) +
" arguments were passed in and garbage data might start to occur";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
return false;
}

Expand Down Expand Up @@ -768,7 +768,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
if (argument_type->spv_type_ != SpvType::kVector) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a vector modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) + ") is not a vector";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
return false;
}
const uint32_t vector_size = argument_type->inst_.Word(3);
Expand All @@ -777,7 +777,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
"-wide vector modifier \"" + param.modifier + "\", but the argument (SPIR-V Id " +
std::to_string(argument_id) + ") is a " + std::to_string(vector_size) +
"-wide vector (values might be truncated or padded)";
module_.InternalWarning(tag, err_msg.c_str());
module_.InternalWarning(tag, err_msg);
}

// Get the underlying type (float or int)
Expand All @@ -787,7 +787,7 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
if (argument_type->spv_type_ == SpvType::kVector) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a non-vector modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) + ") is a vector";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
return false;
}
}
Expand All @@ -798,27 +798,27 @@ bool DebugPrintfPass::Validate(const Function& current_function) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) +
") is not a float, int, or bool";
module_.InternalError(tag, err_msg.c_str());
module_.InternalError(tag, err_msg);
return false;
}

const bool type_is_64 = argument_type->spv_type_ != SpvType::kBool && argument_type->inst_.Word(2) == 64;
if (!param.is_64_bit && type_is_64) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a non-64-bit modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) + ") a 64-bit";
module_.InternalWarning(tag, err_msg.c_str());
module_.InternalWarning(tag, err_msg);
} else if (param.is_64_bit && !type_is_64) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a 64-bit modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) + ") is not 64-bit";
module_.InternalWarning(tag, err_msg.c_str());
module_.InternalWarning(tag, err_msg);
} else if (!param.is_float && argument_type->spv_type_ == SpvType::kFloat) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a non-float modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) + ") is a float";
module_.InternalWarning(tag, err_msg.c_str());
module_.InternalWarning(tag, err_msg);
} else if (param.is_float && argument_type->spv_type_ != SpvType::kFloat) {
std::string err_msg = "OpString \"" + print_op_string() + "\" contains a float modifier \"" + param.modifier +
"\", but the argument (SPIR-V Id " + std::to_string(argument_id) + ") is not a float";
module_.InternalWarning(tag, err_msg.c_str());
module_.InternalWarning(tag, err_msg);
}
}

Expand Down
4 changes: 2 additions & 2 deletions layers/gpuav/spirv/module.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ void Module::PostProcess() {
}
}

void Module::InternalWarning(const char* tag, const char* message) {
void Module::InternalWarning(const char* tag, const std::string& message) {
if (debug_report_) {
Location loc(vvl::Func::Empty);
debug_report_->LogMessage(kWarningBit, tag, {}, loc, message);
Expand All @@ -688,7 +688,7 @@ void Module::InternalWarning(const char* tag, const char* message) {
}
}

void Module::InternalError(const char* tag, const char* message) {
void Module::InternalError(const char* tag, const std::string& message) {
if (debug_report_) {
Location loc(vvl::Func::Empty);
debug_report_->LogMessage(kErrorBit, tag, {}, loc, message);
Expand Down
4 changes: 2 additions & 2 deletions layers/gpuav/spirv/module.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ class Module {
// To keep the GPU Shader Instrumentation a standalone sub-project, the runtime version needs to pass in info to allow for
// warnings/errors to be piped into the normal callback (otherwise will be sent to stdout)
DebugReport* debug_report_ = nullptr;
void InternalWarning(const char* tag, const char* message);
void InternalError(const char* tag, const char* message);
void InternalWarning(const char* tag, const std::string& message);
void InternalError(const char* tag, const std::string& message);

// < set, [ bindings ] >
const std::vector<std::vector<BindingLayout>>& set_index_to_bindings_layout_lut_;
Expand Down
2 changes: 1 addition & 1 deletion layers/layer_options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ void ProcessConfigAndEnvSettings(ConfigAndEnvSettings *settings_data) {

for (const auto &warning : setting_warnings) {
Location loc(vvl::Func::vkCreateInstance);
settings_data->debug_report->LogMessage(kWarningBit, "VALIDATION-SETTINGS", {}, loc, warning.c_str());
settings_data->debug_report->LogMessage(kWarningBit, "VALIDATION-SETTINGS", {}, loc, warning);
}

vkuDestroyLayerSettingSet(layer_setting_set, nullptr);
Expand Down

0 comments on commit 6f19fda

Please sign in to comment.